Martin Betak has uploaded a new change for review. Change subject: core: Fix naming convetions in Role class ......................................................................
core: Fix naming convetions in Role class Change-Id: Id6059e75461d8c3bb120dc1cc911fe0ec0670da3 Signed-off-by: Martin Betak <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllRolesQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RolesCommandBaseTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendRoleResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RoleMapper.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java 19 files changed, 63 insertions(+), 63 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/38548/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java index 0960cc4..d4bf645 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java @@ -56,7 +56,7 @@ List<Role> userRoles = getRoleDAO().getAnyAdminRoleForUserAndGroups(user.getId(), StringUtils.join(user.getGroupIds(), ",")); if (!userRoles.isEmpty()) { - log.debug("LoginAdminUser: User logged to admin using role '{}'", userRoles.get(0).getname()); + log.debug("LoginAdminUser: User logged to admin using role '{}'", userRoles.get(0).getName()); return true; } return false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java index b54bae4..4ffca35 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PermissionsCommandBase.java @@ -64,7 +64,7 @@ public String getRoleName() { Role role = getRoleDao().get(getParameters().getPermission().getrole_id()); - return role == null ? null : role.getname(); + return role == null ? null : role.getName(); } public String getSubjectName() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java index 40e6e2d..689c956 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RolesCommandBase.java @@ -41,12 +41,12 @@ } public String getRoleName() { - return getRole().getname(); + return getRole().getName(); } protected boolean checkIfRoleIsReadOnly(List<String> CanDoActionMessages) { boolean result = false; - if (getRole().getis_readonly()) { + if (getRole().isReadonly()) { result = true; CanDoActionMessages.add(VdcBllMessages.ACTION_TYPE_FAILED_ROLE_IS_READ_ONLY.toString()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java index 18ffcfd..ab425c1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java @@ -28,8 +28,8 @@ if (checkIfRoleIsReadOnly(getReturnValue().getCanDoActionMessages())) { returnValue = false; addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); - } else if (!StringUtils.equals(getRole().getname(), oldRole.getname()) - && getRoleDao().getByName(getRole().getname()) != null) { + } else if (!StringUtils.equals(getRole().getName(), oldRole.getName()) + && getRoleDao().getByName(getRole().getName()) != null) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); returnValue = false; } // changing role type isn't allowed diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllRolesQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllRolesQueryTest.java index 33178eb..603c7b7 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllRolesQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllRolesQueryTest.java @@ -19,7 +19,7 @@ public void testExecuteQueryCommand() { // Prepare the result Role role = new Role(); - role.setname("test role"); + role.setName("test role"); List<Role> result = Collections.singletonList(role); // Mock the DAO diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RolesCommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RolesCommandBaseTest.java index badd3eb..b453954 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RolesCommandBaseTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RolesCommandBaseTest.java @@ -30,7 +30,7 @@ @Test public void testCheckIfRoleIsReadOnlyTrue() { - getRole().setis_readonly(true); + getRole().setReadonly(true); List<String> messages = new ArrayList<String>(1); assertTrue("Role should be read only", getCommand().checkIfRoleIsReadOnly(messages)); assertEquals("Wrong canDoAction message", @@ -40,7 +40,7 @@ @Test public void testCheckIfRoleIsReadOnlyFalse() { - getRole().setis_readonly(false); + getRole().setReadonly(false); List<String> messages = new ArrayList<String>(); assertFalse("Role should be read only", getCommand().checkIfRoleIsReadOnly(messages)); assertTrue("Shouldn't be any canDoAction messages", messages.isEmpty()); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java index b116dfd..bb10bf6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java @@ -72,15 +72,15 @@ && appMode == other.appMode); } - public String getdescription() { + public String getDescription() { return this.description; } - public boolean getis_readonly() { + public boolean isReadonly() { return this.readOnly; } - public String getname() { + public String getName() { return this.name; } @@ -89,15 +89,15 @@ return getId(); } - public void setdescription(String value) { + public void setDescription(String value) { this.description = value; } - public void setis_readonly(boolean value) { + public void setReadonly(boolean value) { this.readOnly = value; } - public void setname(String value) { + public void setName(String value) { this.name = value; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java index b54d113..a016b1b 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDAODbFacadeImpl.java @@ -28,10 +28,10 @@ @Override public Role mapRow(ResultSet rs, int rowNum) throws SQLException { Role entity = new Role(); - entity.setdescription(rs.getString("description")); + entity.setDescription(rs.getString("description")); entity.setId(getGuidDefaultEmpty(rs, "id")); - entity.setname(rs.getString("name")); - entity.setis_readonly(rs.getBoolean("is_readonly")); + entity.setName(rs.getString("name")); + entity.setReadonly(rs.getBoolean("is_readonly")); entity.setType(RoleType.getById(rs.getInt("role_type"))); entity.setAllowsViewingChildren(rs.getBoolean("allows_viewing_children")); entity.setAppMode(ApplicationMode.from(rs.getInt("app_mode"))); @@ -84,9 +84,9 @@ @Override public void save(Role role) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() - .addValue("description", role.getdescription()) - .addValue("id", role.getId()).addValue("name", role.getname()) - .addValue("is_readonly", role.getis_readonly()) + .addValue("description", role.getDescription()) + .addValue("id", role.getId()).addValue("name", role.getName()) + .addValue("is_readonly", role.isReadonly()) .addValue("role_type", role.getType().getId()) .addValue("allows_viewing_children", role.allowsViewingChildren()) .addValue("app_mode", role.getAppMode().getValue()); @@ -97,9 +97,9 @@ @Override public void update(Role role) { MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource() - .addValue("description", role.getdescription()) - .addValue("id", role.getId()).addValue("name", role.getname()) - .addValue("is_readonly", role.getis_readonly()) + .addValue("description", role.getDescription()) + .addValue("id", role.getId()).addValue("name", role.getName()) + .addValue("is_readonly", role.isReadonly()) .addValue("role_type", role.getType().getId()) .addValue("allows_viewing_children", role.allowsViewingChildren()); diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java index 5058153..f721b93 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DbFacadeDAOTest.java @@ -294,7 +294,7 @@ public void testGetEntityNameByIdAndTypeForRole() { Role role = dbFacade.getRoleDao().get(ROLE_ID); assertNotNull(role); - String name = role.getname(); + String name = role.getName(); assertTrue(name.equals(dbFacade.getEntityNameByIdAndType(ROLE_ID, VdcObjectType.Role))); } diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java index 8a381ae..92d39b4 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDAOTest.java @@ -33,8 +33,8 @@ existingRole = dao.get(new Guid("f5972bfa-7102-4d33-ad22-9dd421bfba78")); newRole = new Role(); - newRole.setname("new role"); - newRole.setdescription("This is a new role."); + newRole.setName("new role"); + newRole.setDescription("This is a new role."); newRole.setType(RoleType.USER); newRole.setAllowsViewingChildren(false); newRole.setAppMode(ApplicationMode.AllModes); @@ -76,7 +76,7 @@ */ @Test public void testGetRoleByName() { - Role result = dao.getByName(existingRole.getname()); + Role result = dao.getByName(existingRole.getName()); assertNotNull(result); assertEquals(existingRole, result); @@ -131,7 +131,7 @@ public void testSaveRole() { dao.save(newRole); - Role result = dao.getByName(newRole.getname()); + Role result = dao.getByName(newRole.getName()); assertNotNull(result); assertEquals(newRole, result); @@ -142,7 +142,7 @@ */ @Test public void testUpdateRole() { - existingRole.setdescription("This is an updated description"); + existingRole.setDescription("This is an updated description"); dao.update(existingRole); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendRoleResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendRoleResourceTest.java index 496fc16..b902c66 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendRoleResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendRoleResourceTest.java @@ -65,9 +65,9 @@ protected org.ovirt.engine.core.common.businessentities.Role getEntity(int index) { org.ovirt.engine.core.common.businessentities.Role role = new org.ovirt.engine.core.common.businessentities.Role(); role.setId(GUIDS[index]); - role.setname(NAMES[index]); - role.setdescription(DESCRIPTIONS[index]); - role.setis_readonly(false); + role.setName(NAMES[index]); + role.setDescription(DESCRIPTIONS[index]); + role.setReadonly(false); role.setType(RoleType.ADMIN); return role; } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java index 16e92e1..bef236e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java @@ -101,7 +101,7 @@ setUriInfo(setUpBasicUriExpectations()); setUpCreationExpectations(VdcActionType.AddRoleWithActionGroups, RoleWithActionGroupsParameters.class, - new String[] { "Role.Id", "Role.name" }, + new String[] { "Role.Id", "Role.Name" }, new Object[] { GUIDS[0], NAMES[0] }, true, true, @@ -195,9 +195,9 @@ protected org.ovirt.engine.core.common.businessentities.Role getEntity(int index) { org.ovirt.engine.core.common.businessentities.Role role = new org.ovirt.engine.core.common.businessentities.Role(); role.setId(GUIDS[index]); - role.setname(NAMES[index]); - role.setdescription(DESCRIPTIONS[index]); - role.setis_readonly(false); + role.setName(NAMES[index]); + role.setDescription(DESCRIPTIONS[index]); + role.setReadonly(false); role.setType(RoleType.ADMIN); return role; } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RoleMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RoleMapper.java index 48034c3..9d65019 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RoleMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RoleMapper.java @@ -9,10 +9,10 @@ @Mapping(from = org.ovirt.engine.core.common.businessentities.Role.class, to = Role.class) public static Role map(org.ovirt.engine.core.common.businessentities.Role entity, Role template) { Role model = template != null ? template : new Role(); - model.setName(entity.getname()); - model.setDescription(entity.getdescription()); + model.setName(entity.getName()); + model.setDescription(entity.getDescription()); model.setId(entity.getId().toString()); - model.setMutable(!entity.getis_readonly()); + model.setMutable(!entity.isReadonly()); model.setAdministrative(RoleType.ADMIN.equals(entity.getType())); return model; } @@ -24,13 +24,13 @@ entity.setId(GuidUtils.asGuid(model.getId())); } if (model.isSetName()) { - entity.setname(model.getName()); + entity.setName(model.getName()); } if (model.isSetDescription()) { - entity.setdescription(model.getDescription()); + entity.setDescription(model.getDescription()); } if (model.isSetMutable()) { - entity.setis_readonly(!model.isMutable()); + entity.setReadonly(!model.isMutable()); } if (model.isSetAdministrative()) { entity.setType(model.isAdministrative() ? RoleType.ADMIN : RoleType.USER); diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java index 6c575cd..544aaee 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializationEntitiesTest.java @@ -155,9 +155,9 @@ private static Role randomRole() { RandomUtils random = RandomUtils.instance(); Role role = new Role(); - role.setdescription(random.nextString(10)); + role.setDescription(random.nextString(10)); role.setId(Guid.newGuid()); - role.setname(random.nextString(10)); + role.setName(random.nextString(10)); return role; } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java index a35d05b..7567d24 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java @@ -137,7 +137,7 @@ roleSelection = new ListModelListBoxEditor<Role>(new NullSafeRenderer<Role>() { @Override public String renderNullSafe(Role object) { - return object.getname(); + return object.getName(); } }); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java index a6d2ae0..c24ae2a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java @@ -1327,7 +1327,7 @@ @Override public int compare(Role left, Role right) { - return left.getname().compareTo(right.getname()); + return left.getName().compareTo(right.getName()); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java index d4a1952..9b9365d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleListModel.java @@ -254,7 +254,7 @@ ArrayList<String> list = new ArrayList<String>(); for (Role role : Linq.<Role> cast(getSelectedItems())) { - list.add(role.getname()); + list.add(role.getName()); } model.setItems(list); @@ -337,7 +337,7 @@ Role role = getSelectedItem(); RoleModel model = (RoleModel) getWindow(); ArrayList<SelectionTreeNodeModel> selectionTree = - RoleTreeView.getRoleTreeView((model.getIsNew() ? false : role.getis_readonly()), + RoleTreeView.getRoleTreeView((model.getIsNew() ? false : role.isReadonly()), model.getIsAdminRole().getEntity()); for (SelectionTreeNodeModel sm : selectionTree) { @@ -383,16 +383,16 @@ } model.getIsAdminRole().getEntityChangedEvent().addListener(this); model.getIsAdminRole().setEntity(RoleType.ADMIN.equals(role.getType())); - model.getName().setEntity(role.getname()); + model.getName().setEntity(role.getName()); if (commandType == CommandType.Clone) { - model.getName().setEntity(COPY_OF + role.getname()); + model.getName().setEntity(COPY_OF + role.getName()); } - model.getDescription().setEntity(role.getdescription()); + model.getDescription().setEntity(role.getDescription()); if (commandType == CommandType.Edit) { - model.getName().setIsChangable(!role.getis_readonly()); - model.getDescription().setIsChangable(!role.getis_readonly()); + model.getName().setIsChangable(!role.isReadonly()); + model.getDescription().setIsChangable(!role.isReadonly()); } switch (commandType) { @@ -415,7 +415,7 @@ break; } - if (!role.getis_readonly() || commandType == CommandType.Clone) + if (!role.isReadonly() || commandType == CommandType.Clone) { UICommand tempVar = UICommand.createDefaultOkUiCommand("OnSave", this); //$NON-NLS-1$ model.getCommands().add(tempVar); @@ -425,10 +425,10 @@ } UICommand tempVar3 = new UICommand("Cancel", this); //$NON-NLS-1$ - tempVar3.setTitle(!role.getis_readonly() ? ConstantsManager.getInstance().getConstants().cancel() + tempVar3.setTitle(!role.isReadonly() ? ConstantsManager.getInstance().getConstants().cancel() : ConstantsManager.getInstance().getConstants().close()); tempVar3.setIsCancel(true); - tempVar3.setIsDefault(role.getis_readonly()); + tempVar3.setIsDefault(role.isReadonly()); model.getCommands().add(tempVar3); } @@ -475,8 +475,8 @@ // return; // } - role.setname(model.getName().getEntity()); - role.setdescription(model.getDescription().getEntity()); + role.setName(model.getName().getEntity()); + role.setDescription(model.getDescription().getEntity()); ArrayList<ActionGroup> actions = new ArrayList<ActionGroup>(); HashMap<ActionGroup, ActionGroup> actionDistinctSet = @@ -614,7 +614,7 @@ for (Object item : roles) { Role r = (Role) item; - if (r.getis_readonly()) + if (r.isReadonly()) { return true; } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java index 01f8538..44326a1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RoleView.java @@ -151,7 +151,7 @@ AbstractTextColumnWithTooltip<Role> nameColumn = new AbstractTextColumnWithTooltip<Role>() { @Override public String getValue(Role object) { - return object.getname(); + return object.getName(); } }; @@ -164,7 +164,7 @@ AbstractTextColumnWithTooltip<Role> descColumn = new AbstractTextColumnWithTooltip<Role>() { @Override public String getValue(Role object) { - return object.getdescription(); + return object.getDescription(); } }; table.addColumn(descColumn, constants.descriptionRole(), "300px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java index e09b1ea..f1cdcab 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsLockedImageTypeColumn.java @@ -11,7 +11,7 @@ @Override public ImageResource getValue(Role role) { - if (role.getis_readonly()) { + if (role.isReadonly()) { return getApplicationResources().lockImage(); } return null; -- To view, visit https://gerrit.ovirt.org/38548 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6059e75461d8c3bb120dc1cc911fe0ec0670da3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
