modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java | 80 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionEditorView.java | 15 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 60 +++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java | 25 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 27 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 4 7 files changed, 111 insertions(+), 106 deletions(-)
New commits: commit 66048d45468042a5658bbfad836900e749620747 Author: Jay Shaughnessy jshaughn@redhat.com Date: Thu Nov 18 13:43:43 2010 -0500
I18N work - packages: org.rhq.enterprise.gui.coregui.client.admin.agent.install org.rhq.enterprise.gui.coregui.client.admin.roles
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java index 86e7f11..3adcf47 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java @@ -102,41 +102,41 @@ public class RemoteAgentInstallView extends LocatableVLayout { connectionForm.setMargin(20);
HeaderItem connectionHeader = new HeaderItem(); - connectionHeader.setDefaultValue("Connection Information"); + connectionHeader.setDefaultValue(MSG.view_remoteAgentInstall_connInfo());
- TextItem host = new TextItem("host", "Hostname"); + TextItem host = new TextItem("host", MSG.common_title_host()); host.setRequired(true); host.setWidth("100%"); - host.setPrompt("The host where the agent is or will be installed"); + host.setPrompt(MSG.view_remoteAgentInstall_promptHost()); host.setColSpan(2);
- TextItem port = new TextItem("port", "Port"); + TextItem port = new TextItem("port", MSG.common_title_port()); port.setRequired(false); port.setWidth("90"); - port.setPrompt("The port the SSH server is listening to. If not specified, the default is 22"); + port.setPrompt(MSG.view_remoteAgentInstall_promptPort()); port.setColSpan(1);
- TextItem username = new TextItem("username", "Username"); + TextItem username = new TextItem("username", MSG.common_title_user()); username.setRequired(true); username.setWidth("100%"); - username.setPrompt("The name of the user whose credentials are passed to the host via SSH"); + username.setPrompt(MSG.view_remoteAgentInstall_promptUser()); username.setColSpan(2);
- PasswordItem password = new PasswordItem("password", "Password"); + PasswordItem password = new PasswordItem("password", MSG.common_title_password()); password.setRequired(false); password.setWidth("100%"); - password.setPrompt("The credentials that are used to authenticate the user on the host via SSH"); + password.setPrompt(MSG.view_remoteAgentInstall_promptPassword()); password.setColSpan(2);
- TextItem agentInstallPath = new TextItem("agentInstallPath", "Agent Install Path"); + TextItem agentInstallPath = new TextItem("agentInstallPath", MSG.view_remoteAgentInstall_installPath()); agentInstallPath.setRequired(true); agentInstallPath.setWidth("100%"); - agentInstallPath - .setPrompt("Where the agent is or will be installed. If you aren't sure where an agent is installed, enter a parent directory and click the 'Find Agent' button to scan that directory and below. If you enter an empty path, common locations are searched on the host for an agent install."); + agentInstallPath.setPrompt(MSG.view_remoteAgentInstall_promptInstallPath()); agentInstallPath.setStartRow(true); agentInstallPath.setEndRow(false);
- ButtonItem findAgentInstallPathButton = new ButtonItem("findAgentInstallPathButton", "Find Agent"); + ButtonItem findAgentInstallPathButton = new ButtonItem("findAgentInstallPathButton", MSG + .view_remoteAgentInstall_buttonFindAgent()); findAgentInstallPathButton.setStartRow(false); findAgentInstallPathButton.setEndRow(true); findAgentInstallPathButton.addClickHandler(new ClickHandler() { @@ -147,15 +147,15 @@ public class RemoteAgentInstallView extends LocatableVLayout { } });
- StaticTextItem agentStatus = new StaticTextItem("agentStatus", "Agent Status"); - agentStatus.setDefaultValue("-Click Update Status Button-"); + StaticTextItem agentStatus = new StaticTextItem("agentStatus", MSG.view_remoteAgentInstall_agentStatus()); + agentStatus.setDefaultValue(MSG.view_remoteAgentInstall_agentStatusDefault()); agentStatus.setRedrawOnChange(true); agentStatus.setRedrawOnChange(true); agentStatus.setWidth("100%"); agentStatus.setStartRow(true); agentStatus.setEndRow(false);
- ButtonItem statusCheckButton = new ButtonItem("updateStatus", "Update Status"); + ButtonItem statusCheckButton = new ButtonItem("updateStatus", MSG.view_remoteAgentInstall_updateStatus()); statusCheckButton.setStartRow(false); statusCheckButton.setEndRow(true); statusCheckButton.addClickHandler(new ClickHandler() { @@ -180,13 +180,13 @@ public class RemoteAgentInstallView extends LocatableVLayout { buttonsForm.setColWidths("10%", "30%", "30%", "30%");
HeaderItem buttonsHeader = new HeaderItem(); - buttonsHeader.setDefaultValue("Operations"); + buttonsHeader.setDefaultValue(MSG.common_title_operations());
SpacerItem spacerItem = new SpacerItem(); spacerItem.setStartRow(true); spacerItem.setEndRow(false);
- installButton = new ButtonItem("install", "Install Agent"); + installButton = new ButtonItem("install", MSG.view_remoteAgentInstall_installAgent()); installButton.setStartRow(false); installButton.setEndRow(false); installButton.setRedrawOnChange(true); @@ -198,7 +198,7 @@ public class RemoteAgentInstallView extends LocatableVLayout { } });
- startButton = new ButtonItem("start", "Start Agent"); + startButton = new ButtonItem("start", MSG.view_remoteAgentInstall_startAgent()); startButton.setStartRow(false); startButton.setEndRow(false); // startButton.setShowIfCondition(new FormItemIfFunction() { @@ -214,7 +214,7 @@ public class RemoteAgentInstallView extends LocatableVLayout { } });
- stopButton = new ButtonItem("stop", "Stop Agent"); + stopButton = new ButtonItem("stop", MSG.view_remoteAgentInstall_stopAgent()); stopButton.setStartRow(false); stopButton.setEndRow(true); stopButton.addClickHandler(new ClickHandler() { @@ -237,7 +237,7 @@ public class RemoteAgentInstallView extends LocatableVLayout { remoteInstallService.findAgentInstallPath(getRemoteAccessInfo(), parentPath, new AsyncCallback<String>() { public void onFailure(Throwable caught) { disableButtons(false); - CoreGUI.getErrorHandler().handleError("Error occurred while trying to find agent install path", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_remoteAgentInstall_error_1(), caught); }
public void onSuccess(String result) { @@ -247,9 +247,9 @@ public class RemoteAgentInstallView extends LocatableVLayout { } else { String err; if (parentPath == null || parentPath.length() == 0) { - err = "Could not find an agent installed when looking in common locations"; + err = MSG.view_remoteAgentInstall_error_2(); } else { - err = "Could not find an agent installed at or under [" + parentPath + "]"; + err = MSG.view_remoteAgentInstall_error_3(parentPath); } CoreGUI.getErrorHandler().handleError(err); } @@ -293,13 +293,13 @@ public class RemoteAgentInstallView extends LocatableVLayout { new AsyncCallback<AgentInstallInfo>() { public void onFailure(Throwable caught) { disableButtons(false); - CoreGUI.getErrorHandler().handleError("Failed to install agent", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_remoteAgentInstall_error_4(), caught); }
public void onSuccess(AgentInstallInfo result) { disableButtons(false); CoreGUI.getMessageCenter().notify( - new Message("Agent installation completed", Message.Severity.Info)); + new Message(MSG.view_remoteAgentInstall_success(), Message.Severity.Info));
for (Canvas child : agentInfoLayout.getChildren()) { child.destroy(); @@ -316,12 +316,13 @@ public class RemoteAgentInstallView extends LocatableVLayout { remoteInstallService.startAgent(getRemoteAccessInfo(), getAgentInstallPath(), new AsyncCallback<String>() { public void onFailure(Throwable caught) { disableButtons(false); - CoreGUI.getErrorHandler().handleError("Failed to start agent", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_remoteAgentInstall_error_5(), caught); }
public void onSuccess(String result) { disableButtons(false); - CoreGUI.getMessageCenter().notify(new Message("Agent start results: " + result, Message.Severity.Info)); + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_remoteAgentInstall_startAgentResults(result), Message.Severity.Info)); agentStatusCheck(); } }); @@ -332,12 +333,13 @@ public class RemoteAgentInstallView extends LocatableVLayout { remoteInstallService.stopAgent(getRemoteAccessInfo(), getAgentInstallPath(), new AsyncCallback<String>() { public void onFailure(Throwable caught) { disableButtons(false); - CoreGUI.getErrorHandler().handleError("Failed to stop agent", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_remoteAgentInstall_error_6(), caught); }
public void onSuccess(String result) { disableButtons(false); - CoreGUI.getMessageCenter().notify(new Message("Agent stop results: " + result, Message.Severity.Info)); + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_remoteAgentInstall_stopAgentResults(result), Message.Severity.Info)); agentStatusCheck(); } }); @@ -350,18 +352,18 @@ public class RemoteAgentInstallView extends LocatableVLayout { infoForm.setHeight100();
HeaderItem infoHeader = new HeaderItem(); - infoHeader.setValue("Agent Installation Information"); + infoHeader.setValue(MSG.view_remoteAgentInstall_installInfo());
- StaticTextItem version = new StaticTextItem("version", "Version"); + StaticTextItem version = new StaticTextItem("version", MSG.common_title_version()); version.setValue(info.getVersion());
- StaticTextItem path = new StaticTextItem("path", "Path"); + StaticTextItem path = new StaticTextItem("path", MSG.common_title_path()); path.setValue(info.getPath());
- StaticTextItem owner = new StaticTextItem("owner", "Owner"); + StaticTextItem owner = new StaticTextItem("owner", MSG.view_remoteAgentInstall_owner()); owner.setValue(info.getOwner());
- StaticTextItem config = new StaticTextItem("config", "Configuration"); + StaticTextItem config = new StaticTextItem("config", MSG.common_title_configuration()); config.setValue(info.getConfigurationStartString());
CanvasItem listCanvas = new CanvasItem(); @@ -385,10 +387,10 @@ public class RemoteAgentInstallView extends LocatableVLayout { listGrid.setCanExpandRecords(true); listGrid.setExpansionMode(ExpansionMode.DETAIL_FIELD); listGrid.setDetailField("result"); - ListGridField step = new ListGridField("description", "Step"); - ListGridField result = new ListGridField("result", "Result"); - ListGridField resultCode = new ListGridField("resultCode", "Result Code", 90); - ListGridField duration = new ListGridField("duration", "Duration", 90); + ListGridField step = new ListGridField("description", MSG.view_remoteAgentInstall_step()); + ListGridField result = new ListGridField("result", MSG.view_remoteAgentInstall_result()); + ListGridField resultCode = new ListGridField("resultCode", MSG.view_remoteAgentInstall_resultCode(), 90); + ListGridField duration = new ListGridField("duration", MSG.common_title_duration(), 90); listGrid.setFields(step, result, resultCode, duration); listGrid.setData(getStepRecords(info));
@@ -409,7 +411,7 @@ public class RemoteAgentInstallView extends LocatableVLayout { rec.setAttribute("description", step.getDescription()); String result = step.getResult(); if (result == null || result.trim().length() == 0) { - result = "Result code=" + step.getResultCode(); + result = MSG.view_remoteAgentInstall_resultCode() + "=" + step.getResultCode(); } rec.setAttribute("result", result); rec.setAttribute("resultCode", "" + step.getResultCode()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionEditorView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionEditorView.java index a85dbb9..589b0e3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionEditorView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionEditorView.java @@ -33,12 +33,15 @@ import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.HeaderItem;
import org.rhq.core.domain.authz.Permission; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
/** * @author Greg Hinkle */ public class PermissionEditorView extends CanvasItem { + private static Messages MSG = CoreGUI.getMessages();
private Set<Permission> selectedPermissions = EnumSet.noneOf(Permission.class);
@@ -60,16 +63,16 @@ public class PermissionEditorView extends CanvasItem {
List<FormItem> items = new ArrayList<FormItem>();
- HeaderItem globalPermsHeader = new HeaderItem("globalPermissions", "Global Permissions"); - globalPermsHeader.setValue("Global Permissions"); + HeaderItem globalPermsHeader = new HeaderItem("globalPermissions", MSG.view_adminRoles_globalPerms()); + globalPermsHeader.setValue(MSG.view_adminRoles_globalPerms()); items.add(globalPermsHeader); for (Permission permission : Permission.GLOBAL_ALL) { - CheckboxItem checkboxItem = new CheckboxItem(permission.name(), permission.name()); + CheckboxItem checkboxItem = new CheckboxItem(permission.name(), permission.name()); items.add(checkboxItem); }
- HeaderItem resourcePermsHeader = new HeaderItem("resourcePermissions", "Resource Permissions"); - resourcePermsHeader.setValue("Resource Permissions"); + HeaderItem resourcePermsHeader = new HeaderItem("resourcePermissions", MSG.view_adminRoles_resourcePerms()); + resourcePermsHeader.setValue(MSG.view_adminRoles_resourcePerms()); items.add(resourcePermsHeader); for (Permission permission : Permission.RESOURCE_ALL) { CheckboxItem checkboxItem = new CheckboxItem(permission.name(), permission.name()); @@ -110,5 +113,5 @@ public class PermissionEditorView extends CanvasItem { public Set<Permission> getPermissions() { return selectedPermissions; } - + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java index d9ba0c0..4173bcf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java @@ -81,8 +81,7 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen @Override public void renderView(ViewPath viewPath) { super.renderView(viewPath); - UserPermissionsManager.getInstance().loadGlobalPermissions( - new PermissionsLoadedListener() { + UserPermissionsManager.getInstance().loadGlobalPermissions(new PermissionsLoadedListener() { public void onPermissionsLoaded(Set<Permission> globalPermissions) { RoleEditView.this.hasManageSecurityPermission = globalPermissions.contains(Permission.MANAGE_SECURITY); checkIfLdapConfigured(); @@ -98,7 +97,7 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen }
public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to determine if LDAP configured - assuming not.", caught); + CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdap(), caught); RoleEditView.this.isLdapConfigured = false; fetchAvailableLdapGroups(); } @@ -109,23 +108,21 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen final boolean isReadOnly = (!this.hasManageSecurityPermission); if (this.isLdapConfigured) { final Set<LdapGroup> availableLdapGroups = null; - GWTServiceLookup.getLdapService().findAvailableGroups( - new AsyncCallback<Set<Map<String, String>>>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError("Failed to retrieve available LDAP groups - assuming none.", - caught); - Set<LdapGroup> availableLdapGroups = Collections.emptySet(); - init(isReadOnly); - } + GWTServiceLookup.getLdapService().findAvailableGroups(new AsyncCallback<Set<Map<String, String>>>() { + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdapGroups(), caught); + Set<LdapGroup> availableLdapGroups = Collections.emptySet(); + init(isReadOnly); + }
- public void onSuccess(Set<Map<String, String>> result) { - // Get assigned LDAP groups. - Set<LdapGroup> availableLdapGroups = RoleLdapGroupSelector.convertToCollection(result); - // Update record with both objects. - //record.setAttribute("ldapGroupsAvailable", availableGroups); - init(isReadOnly); - } - }); + public void onSuccess(Set<Map<String, String>> result) { + // Get assigned LDAP groups. + Set<LdapGroup> availableLdapGroups = RoleLdapGroupSelector.convertToCollection(result); + // Update record with both objects. + //record.setAttribute("ldapGroupsAvailable", availableGroups); + init(isReadOnly); + } + }); } else { // LDAP not configured - we won't display an LDAP group selector. // TODO: Should we display a message stating that LDAP is not configured with a link to Admin Settings view? @@ -140,7 +137,7 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen }
@Override - protected void editRecord(Record record) { + protected void editRecord(Record record) { // A user can always view their own assigned roles, but only users with MANAGE_SECURITY can view or update // other users' assigned roles. Subject whoami = UserSessionManager.getSessionSubject(); @@ -184,9 +181,11 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen }); this.ldapGroupsItem.setCanvas(this.ldapGroupSelector); } else { - Label label = new Label("<b>NOTE:</b> The LDAP security integration is not configured. To configure " + - "it, go to <a href='#Administration/Configuration/SystemSettings'>System " + - "Settings</a>."); + Label label = new Label("<b>" + + MSG.common_msg_emphasizedNotePrefix() + + "</b> " + + MSG.view_adminRoles_noLdap("href='#Administration/Configuration/SystemSettings'", MSG + .view_adminConfig_systemSettings())); label.setWidth100(); label.setPadding(6); this.ldapGroupsItem.setCanvas(label); @@ -205,34 +204,35 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen protected List<FormItem> createFormItems(boolean newUser) { List<FormItem> items = new ArrayList<FormItem>();
- TextItem nameItem = new TextItem(RolesDataSource.Field.NAME, "Name"); + TextItem nameItem = new TextItem(RolesDataSource.Field.NAME, MSG.common_title_name()); items.add(nameItem);
- TextItem descriptionItem = new TextItem(RolesDataSource.Field.DESCRIPTION, "Description"); + TextItem descriptionItem = new TextItem(RolesDataSource.Field.DESCRIPTION, MSG.common_title_description()); descriptionItem.setColSpan(getForm().getNumCols()); descriptionItem.setWidth("*"); items.add(descriptionItem);
- permissionEditorItem = new PermissionEditorView(this.getLocatorId(), "permissionsEditor", "Permissions", this); + permissionEditorItem = new PermissionEditorView(this.getLocatorId(), "permissionsEditor", MSG + .view_adminRoles_perms(), this); permissionEditorItem.setShowTitle(false); permissionEditorItem.setColSpan(getForm().getNumCols()); items.add(permissionEditorItem);
- resourceGroupsItem = new CanvasItem(RolesDataSource.Field.RESOURCE_GROUPS, "Assigned Resource Groups"); + resourceGroupsItem = new CanvasItem(RolesDataSource.Field.RESOURCE_GROUPS, MSG.view_adminRoles_assignedGroups()); resourceGroupsItem.setShowTitle(false); resourceGroupsItem.setTitleOrientation(TitleOrientation.TOP); resourceGroupsItem.setColSpan(getForm().getNumCols()); resourceGroupsItem.setCanvas(new Canvas()); items.add(resourceGroupsItem);
- subjectsItem = new CanvasItem(RolesDataSource.Field.SUBJECTS, "Assigned Subjects"); + subjectsItem = new CanvasItem(RolesDataSource.Field.SUBJECTS, MSG.view_adminRoles_assignedSubjects()); subjectsItem.setShowTitle(false); subjectsItem.setTitleOrientation(TitleOrientation.TOP); subjectsItem.setColSpan(getForm().getNumCols()); subjectsItem.setCanvas(new Canvas()); items.add(subjectsItem);
- ldapGroupsItem = new CanvasItem(RolesDataSource.Field.LDAP_GROUPS, "LDAP Groups"); + ldapGroupsItem = new CanvasItem(RolesDataSource.Field.LDAP_GROUPS, MSG.view_adminRoles_ldapGroups()); ldapGroupsItem.setShowTitle(false); ldapGroupsItem.setTitleOrientation(TitleOrientation.TOP); ldapGroupsItem.setColSpan(getForm().getNumCols()); @@ -267,5 +267,5 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen this.subjectSelector.reset(); this.ldapGroupSelector.reset(); } - + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java index 73552aa..80194f7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java @@ -87,7 +87,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>> availableFilterForm.setWidth100(); availableFilterForm.setNumCols(2);
- final TextItem search = new TextItem("search", "Search"); + final TextItem search = new TextItem("search", MSG.common_title_search()); availableFilterForm.setItems(search, new SpacerItem());
return availableFilterForm; @@ -112,7 +112,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>> new AsyncCallback<PageList<LdapGroup>>() { public void onFailure(Throwable throwable) { CoreGUI.getErrorHandler().handleError( - "Failed to load LdapGroups available for role.", throwable); + MSG.view_adminRoles_failLdapGroupsRole(), throwable); }
public void onSuccess(PageList<LdapGroup> currentlyAssignedLdapGroups) { @@ -174,9 +174,6 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>>
public class LdapGroupsDataSource extends RPCDataSource<PageList<LdapGroup>> {
- public static final String LDAP_NOT_CONFIGURED_EMPTY_MESSAGE = "(LDAP not configured. 'Administrator'->System Settings to change)"; - public static final String EMPTY_MESSAGE = "No items to show"; - public LdapGroupsDataSource() { DataSourceTextField nameField = new DataSourceTextField(name, name); nameField.setPrimaryKey(true); @@ -215,7 +212,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>>
@Override public PageList<LdapGroup> copyValues(Record from) { - throw new UnsupportedOperationException("Ldap Group data is read only"); + throw new UnsupportedOperationException(MSG.view_adminRoles_ldapGroupsReadOnly()); }
@Override @@ -232,13 +229,13 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>> @Override public void onSuccess(Boolean ldapConfigured) { if (ldapConfigured) { - availableGrid.setEmptyMessage(EMPTY_MESSAGE); + availableGrid.setEmptyMessage(MSG.view_adminRoles_noItems()); GWTServiceLookup.getLdapService().findAvailableGroups( new AsyncCallback<Set<Map<String, String>>>() {
public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError( - "Failed to load LdapGroups available for role.", throwable); + CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdapGroupsRole(), + throwable); }
public void onSuccess(Set<Map<String, String>> locatedGroups) { @@ -260,9 +257,12 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>> } });//end of findAvailableGroups } else {//ldap not configured - Log.debug("(LDAP not currently enabled. " + EMPTY_MESSAGE); + Log.debug("(LDAP not currently enabled. " + MSG.view_adminRoles_noItems()); response.setTotalRows(0); - availableGrid.setEmptyMessage(LDAP_NOT_CONFIGURED_EMPTY_MESSAGE); + String message = "(" + + MSG.view_adminRoles_noLdap("href='#Administration/Configuration/SystemSettings'", MSG + .view_adminConfig_systemSettings()) + ")"; + availableGrid.setEmptyMessage(message); processResponse(request.getRequestId(), response); } }//end onSuccess @@ -366,8 +366,7 @@ public class RoleLdapGroupSelector extends AbstractSelector<PageList<LdapGroup>> new AsyncCallback<PageList<LdapGroup>>() {
public void onFailure(Throwable throwable) { - CoreGUI.getErrorHandler().handleError("Failed to load LdapGroups available for role.", - throwable); + CoreGUI.getErrorHandler().handleError(MSG.view_adminRoles_failLdapGroupsRole(), throwable); }
public void onSuccess(PageList<LdapGroup> currentlyAssignedLdapGroups) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java index cd504f6..305b5bf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleSubjectSelector.java @@ -22,8 +22,6 @@ */ package org.rhq.enterprise.gui.coregui.client.admin.roles;
-import java.util.Collection; - import com.smartgwt.client.data.Criteria; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.grid.ListGridRecord; @@ -61,12 +59,12 @@ public class RoleSubjectSelector extends AbstractSelector<Subject> {
@Override protected String getItemTitle() { - return "user"; + return MSG.common_title_user(); }
@Override protected String getItemIcon() { return ITEM_ICON; } - + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java index cd10a48..7eb099c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java @@ -98,10 +98,11 @@ public class RolesDataSource extends RPCDataSource<Role> { idDataField.setCanEdit(false); fields.add(idDataField);
- DataSourceTextField nameField = new DataSourceTextField(Field.NAME, "Name", 100, true); + DataSourceTextField nameField = new DataSourceTextField(Field.NAME, MSG.common_title_name(), 100, true); fields.add(nameField);
- DataSourceTextField descriptionField = new DataSourceTextField(Field.DESCRIPTION, "Description", 100, false); + DataSourceTextField descriptionField = new DataSourceTextField(Field.DESCRIPTION, MSG + .common_title_description(), 100, false); fields.add(descriptionField);
return fields; @@ -113,7 +114,7 @@ public class RolesDataSource extends RPCDataSource<Role> {
roleService.findRolesByCriteria(criteria, new AsyncCallback<PageList<Role>>() { public void onFailure(Throwable caught) { - sendFailureResponse(request, response, "Failed to fetch role(s).", caught); + sendFailureResponse(request, response, MSG.view_adminRoles_failRoles(), caught); }
public void onSuccess(PageList<Role> result) { @@ -130,12 +131,12 @@ public class RolesDataSource extends RPCDataSource<Role> { roleService.createRole(roleToAdd, new AsyncCallback<Role>() { public void onFailure(Throwable caught) { Map<String, String> errorMessages = new HashMap<String, String>(); - errorMessages.put(Field.NAME, "A role named [" + rolename + "] already exists."); + errorMessages.put(Field.NAME, MSG.view_adminRoles_roleExists(rolename)); sendValidationErrorResponse(request, response, errorMessages); }
public void onSuccess(Role addedRole) { - sendSuccessResponse(request, response, addedRole, new Message("Role [" + rolename + "] added.")); + sendSuccessResponse(request, response, addedRole, new Message(MSG.view_adminRoles_roleAdded(rolename))); } });
@@ -143,17 +144,18 @@ public class RolesDataSource extends RPCDataSource<Role> {
@Override protected void executeUpdate(Record recordToUpdate, Record oldRecord, final DSRequest request, - final DSResponse response) { + final DSResponse response) { Role roleToUpdate = copyValues(recordToUpdate);
final String rolename = roleToUpdate.getName(); roleService.updateRole(roleToUpdate, new AsyncCallback<Role>() { public void onFailure(Throwable caught) { - sendFailureResponse(request, response, "Failed to update role [" + rolename + "].", caught); + sendFailureResponse(request, response, MSG.view_adminRoles_roleUpdateFailed(rolename), caught); }
public void onSuccess(Role updatedRole) { - sendSuccessResponse(request, response, updatedRole, new Message("Role [" + rolename + "] updated.")); + sendSuccessResponse(request, response, updatedRole, new Message(MSG + .view_adminRoles_roleUpdated(rolename))); } }); } @@ -165,12 +167,12 @@ public class RolesDataSource extends RPCDataSource<Role> { final String rolename = roleToRemove.getName(); roleService.removeRoles(new int[] { roleToRemove.getId() }, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - sendFailureResponse(request, response, "Failed to delete role [" + rolename + "].", caught); + sendFailureResponse(request, response, MSG.view_adminRoles_roleDeleteFailed(rolename), caught); }
public void onSuccess(Void result) { - sendSuccessResponse(request, response, roleToRemove, new Message("Role [" + roleToRemove.getName() - + "] deleted.")); + sendSuccessResponse(request, response, roleToRemove, new Message(MSG + .view_adminRoles_roleDeleted(rolename))); } });
@@ -200,7 +202,8 @@ public class RolesDataSource extends RPCDataSource<Role> { targetRecord.setAttribute(Field.NAME, sourceRole.getName()); targetRecord.setAttribute(Field.DESCRIPTION, sourceRole.getDescription());
- ListGridRecord[] resourceGroupRecords = ResourceGroupsDataSource.getInstance().buildRecords(sourceRole.getResourceGroups()); + ListGridRecord[] resourceGroupRecords = ResourceGroupsDataSource.getInstance().buildRecords( + sourceRole.getResourceGroups()); targetRecord.setAttribute(Field.RESOURCE_GROUPS, resourceGroupRecords);
// First split the set of permissions into two subsets - one for global perms and one for resource perms. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java index 393293c..35417e7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java @@ -99,12 +99,12 @@ public class RolesView extends TableSection implements BookmarkableView {
@Override protected String getDataTypeName() { - return "role"; + return MSG.common_label_role(); }
@Override protected String getDataTypeNamePlural() { - return "roles"; + return MSG.common_label_roles(); }
} \ No newline at end of file