modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java | 44 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java | 11 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java | 23 +++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java | 11 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java | 12 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 17 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java | 8 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java | 11 ++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 10 --
18 files changed, 94 insertions(+), 80 deletions(-)
New commits:
commit d6d45fb340f742b38b38939dbeb86adfae977e68
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Nov 17 11:54:52 2010 -0500
i18n (is fun)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
index 380d16b..7e65e88 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/ProblemResourcesDataSource.java
@@ -47,10 +47,12 @@ import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
* @author Simeon Pinder
*/
public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationReport<ProblemResourceComposite>> {
- public static final String resource = "resource";
- public static final String location = "location";
- public static final String alerts = "alerts";
- public static final String available = "available";
+
+ public static final String FIELD_RESOURCE = "resource";
+ public static final String FIELD_LOCATION = "location";
+ public static final String FIELD_ALERTS = "alerts";
+ public static final String FIELD_AVAILABLE = "available";
+
private Portlet portlet = null;
private long oldestDate = -1;
//configure elements
@@ -72,17 +74,21 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo
protected List<DataSourceField> addDataSourceFields() {
List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceTextField resourceField = new DataSourceTextField(resource, "Resource");
+ DataSourceTextField resourceField = new DataSourceTextField(FIELD_RESOURCE,
+ MSG.dataSource_problemResources_field_resource());
resourceField.setPrimaryKey(true);
fields.add(resourceField);
- DataSourceTextField locationField = new DataSourceTextField(location, "Location");
+ DataSourceTextField locationField = new DataSourceTextField(FIELD_LOCATION,
+ MSG.dataSource_problemResources_field_location());
fields.add(locationField);
- DataSourceTextField alertsField = new DataSourceTextField(alerts, "Alerts");
+ DataSourceTextField alertsField = new DataSourceTextField(FIELD_ALERTS,
+ MSG.dataSource_problemResources_field_alerts());
fields.add(alertsField);
- DataSourceImageField availabilityField = new DataSourceImageField(available, "Current Availability");
+ DataSourceImageField availabilityField = new DataSourceImageField(FIELD_AVAILABLE,
+ MSG.dataSource_problemResources_field_available());
fields.add(availabilityField);
return fields;
@@ -118,7 +124,7 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo
new AsyncCallback<List<DisambiguationReport<ProblemResourceComposite>>>() {
public void onFailure(Throwable throwable) {
- CoreGUI.getErrorHandler().handleError("Failed to load resources with alerts/unavailability.",
+ CoreGUI.getErrorHandler().handleError(MSG.dataSource_problemResources_error_fetchFailure(),
throwable);
}
@@ -159,18 +165,18 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo
for (DisambiguationReport<ProblemResourceComposite> report : list) {
ListGridRecord record = new ListGridRecord();
//disambiguated Resource name, decorated with html anchors to problem resources
- record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
+ record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
report.getResourceType(), report.getOriginal().getResourceName(), report.getOriginal()
.getResourceId(), true));
//disambiguated resource lineage, decorated with html anchors
- record.setAttribute(location, ReportDecorator.decorateResourceLineage(report.getParents(), true));
+ record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(report.getParents(), true));
//alert cnt.
- record.setAttribute(alerts, report.getOriginal().getNumAlerts());
+ record.setAttribute(FIELD_ALERTS, report.getOriginal().getNumAlerts());
//populate availability icon
if (report.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) == 0) {
- record.setAttribute(available, "/images/icons/availability_red_16.png");
+ record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_red_16.png");
} else {
- record.setAttribute(available, "/images/icons/availability_green_16.png");
+ record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_green_16.png");
}
dataValues[indx++] = record;
@@ -182,14 +188,14 @@ public class ProblemResourcesDataSource extends RPCDataSource<DisambiguationRepo
@Override
public ListGridRecord copyValues(DisambiguationReport<ProblemResourceComposite> from) {
ListGridRecord record = new ListGridRecord();
- record.setAttribute(resource, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
+ record.setAttribute(FIELD_RESOURCE, ReportDecorator.decorateResourceName(ReportDecorator.GWT_RESOURCE_URL,
from.getResourceType(), from.getOriginal().getResourceName(), from.getOriginal().getResourceId(), true));
- record.setAttribute(location, ReportDecorator.decorateResourceLineage(from.getParents(), true));
- record.setAttribute(alerts, from.getOriginal().getNumAlerts());
+ record.setAttribute(FIELD_LOCATION, ReportDecorator.decorateResourceLineage(from.getParents(), true));
+ record.setAttribute(FIELD_ALERTS, from.getOriginal().getNumAlerts());
if (from.getOriginal().getAvailabilityType().compareTo(AvailabilityType.DOWN) == 0) {
- record.setAttribute(available, "/images/icons/availability_red_16.png");
+ record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_red_16.png");
} else {
- record.setAttribute(available, "/images/icons/availability_green_16.png");
+ record.setAttribute(FIELD_AVAILABLE, "/images/icons/availability_green_16.png");
}
record.setAttribute("entity", from);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java
index 30b68d7..0d4481f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java
@@ -6,6 +6,8 @@ import java.util.List;
import org.rhq.core.domain.resource.composite.DisambiguationReport;
import org.rhq.core.domain.resource.composite.DisambiguationReport.Resource;
import org.rhq.core.domain.resource.composite.DisambiguationReport.ResourceType;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Messages;
/**
* Class handles some of the data decoration that used to be done for legacy struts
@@ -17,6 +19,8 @@ import org.rhq.core.domain.resource.composite.DisambiguationReport.ResourceType;
*/
public class ReportDecorator {
+ private static final Messages MSG = CoreGUI.getMessages();
+
//TODO: pull value from more bookmarking/history definition
public final static String GWT_RESOURCE_URL = "#Resource/";
public static final String DEFAULT_SEPARATOR = " > ";
@@ -60,7 +64,7 @@ public class ReportDecorator {
if (type != null) {
decorated += type.getName();
if (type.getPlugin() != null) {
- decorated += " (" + type.getPlugin() + " plugin)";
+ decorated += " " + MSG.util_disambiguationReportDecorator_pluginSuffix(type.getPlugin());
}
decorated += " ";
}
@@ -116,11 +120,10 @@ public class ReportDecorator {
private static StringBuilder writeResource(StringBuilder existing, String url,
ResourceType resourceType) {
if (!resourceType.isSingleton()) {
-
existing.append(resourceType.getName()).append(" ");
if (resourceType.getPlugin() != null) {
- existing.append("(").append(resourceType.getPlugin()).append(" plugin) ");
+ existing.append(MSG.util_disambiguationReportDecorator_pluginSuffix(resourceType.getPlugin()));
}
}
@@ -129,7 +132,7 @@ public class ReportDecorator {
}
if (resourceType.isSingleton() && resourceType.getPlugin() != null) {
- existing.append(" (").append(resourceType.getPlugin()).append(" plugin)");
+ existing.append(" ").append(MSG.util_disambiguationReportDecorator_pluginSuffix(resourceType.getPlugin()));
}
return existing;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
index 42c830b..7d330d1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.search;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.event.dom.client.BlurEvent;
import com.google.gwt.event.dom.client.BlurHandler;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -47,6 +48,8 @@ import com.google.gwt.user.client.ui.TextBox;
import org.rhq.core.domain.search.SavedSearch;
import org.rhq.core.domain.search.SearchSubsystem;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid;
import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchManager;
import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid.PatternSelectionHandler;
@@ -57,9 +60,11 @@ import org.rhq.enterprise.gui.coregui.client.search.suggest.SuggestTextBox_v3;
*/
public class SearchBar extends SimplePanel {
+ private static final Messages MSG = CoreGUI.getMessages();
+
public String welcomeMessage;
- public static final String DEFAULT_PATTERN_NAME = "name your pattern";
+ public static final String DEFAULT_PATTERN_NAME = MSG.view_searchBar_defaultPattern();
private static final String IMAGE_DIR = "/coregui/images/search/";
@@ -140,7 +145,7 @@ public class SearchBar extends SimplePanel {
}
public SearchBar() {
- com.allen_sauer.gwt.log.client.Log.info("Loading SearchBar...");
+ Log.info("Loading SearchBar...");
// in the future, will be instantiated directly from a higher-level widget
if (existsOnPage()) {
@@ -174,7 +179,7 @@ public class SearchBar extends SimplePanel {
Integer savedSearchId = Integer.valueOf(defaultSavedSearchPatternId);
activateSavedSearch(savedSearchId);
} catch (Exception e) {
- this.autoCompletePatternField.setText("'Error selecting saved search'");
+ this.autoCompletePatternField.setText(MSG.view_searchBar_error_selectSavedSearch());
click(searchButton); // execute the search, which will help to further highlight the error
}
}
@@ -194,7 +199,7 @@ public class SearchBar extends SimplePanel {
public void setSearchSubsystem(SearchSubsystem searchSubsystem) {
this.searchSubsystem = searchSubsystem;
- this.welcomeMessage = "search for " + searchSubsystem.getName().toLowerCase() + "s";
+ this.welcomeMessage = MSG.view_searchBar_welcomeMessage(this.searchSubsystem.getName());
this.autoCompletePatternField.setText(welcomeMessage);
}
@@ -383,7 +388,7 @@ public class SearchBar extends SimplePanel {
class PatternNameFieldEventHandler implements KeyPressHandler, ClickHandler, BlurHandler {
public void onKeyPress(KeyPressEvent event) {
if (event.getCharCode() == KeyCodes.KEY_ENTER) {
- SearchLogger.debug("key press pattern name field");
+ Log.debug("key press pattern name field");
turnNameFieldIntoLabel();
}
}
@@ -468,7 +473,7 @@ public class SearchBar extends SimplePanel {
}
public void handleSelection(int rowIndex, int columnIndex, String patternName) {
- SearchLogger.debug("SavedSearchesEventHandler.handleSelection(" + rowIndex + "," + columnIndex + ","
+ Log.debug("SavedSearchesEventHandler.handleSelection(" + rowIndex + "," + columnIndex + ","
+ patternName + ")");
if (columnIndex == 1) {
savedSearchManager.removePatternByName(patternName);
@@ -503,7 +508,7 @@ public class SearchBar extends SimplePanel {
public void activateSavedSearch(Integer savedSearchId) {
SavedSearch savedSearch = savedSearchManager.getSavedSearchById(savedSearchId);
if (savedSearch == null) {
- SearchLogger.debug("activateSavedSearch: no known saved search with id '" + savedSearchId + "'");
+ Log.debug("activateSavedSearch: no known saved search with id '" + savedSearchId + "'");
return; // no saved search existing with the specified id
}
activateSavedSearch(savedSearch);
@@ -512,7 +517,7 @@ public class SearchBar extends SimplePanel {
public void activateSavedSearch(String savedSearchName) {
SavedSearch savedSearch = savedSearchManager.getSavedSearchByName(savedSearchName);
if (savedSearch == null) {
- SearchLogger.debug("activateSavedSearch: no known saved search with name '" + savedSearchName + "'");
+ Log.debug("activateSavedSearch: no known saved search with name '" + savedSearchName + "'");
return; // no saved search existing with the specified name
}
activateSavedSearch(savedSearch);
@@ -522,7 +527,7 @@ public class SearchBar extends SimplePanel {
currentSearch = "";
autoCompletePatternField.setValue(savedSearch.getPattern(), true);
patternNameField.setValue(savedSearch.getName(), true);
- SearchLogger.debug("search results change: [" + savedSearch.getName() + "," + savedSearch.getPattern() + "]");
+ Log.debug("search results change: [" + savedSearch.getName() + "," + savedSearch.getPattern() + "]");
turnNameFieldIntoLabel();
savedSearchesPanel.hide();
click(searchButton);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java
deleted file mode 100644
index c482a97..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.search;
-
-import com.allen_sauer.gwt.log.client.Log;
-
-public class SearchLogger {
-
- public static void debug(String message) {
- Log.debug("SearchBar: " + message);
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
index c250f7c..fd5c55f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.search.favorites;
import java.util.List;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Event;
@@ -27,7 +28,6 @@ import com.google.gwt.user.client.ui.Grid;
import org.rhq.core.domain.search.SavedSearch;
import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
-import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
/**
* @author Joseph Marques
@@ -88,7 +88,7 @@ public class SavedSearchGrid extends Grid {
int startIndex = text.indexOf('>') + 1;
int endIndex = text.toLowerCase().indexOf("</span>", startIndex);
String patternName = text.substring(startIndex, endIndex);
- SearchLogger.debug("Selected '" + patternName + " at row=" + rowIndex + ", col=" + columnIndex);
+ Log.debug("Selected '" + patternName + " at row=" + rowIndex + ", col=" + columnIndex);
patternSelectionHandler.handleSelection(rowIndex, columnIndex, patternName);
if (columnIndex == 0) {
onRowOut(tr);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
index ac069cb..21a4f5f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java
@@ -24,6 +24,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import org.rhq.core.domain.auth.Subject;
@@ -33,7 +34,6 @@ import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
-import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
/**
* @author Joseph Marques
@@ -79,7 +79,7 @@ public class SavedSearchManager {
searchService.createSavedSearch(newSavedSearch, new AsyncCallback<Integer>() {
public void onFailure(Throwable caught) {
- SearchLogger.debug("Error: created saved search [" + name + "] with pattern [" + pattern + "]: "
+ Log.debug("Error: created saved search [" + name + "] with pattern [" + pattern + "]: "
+ caught.getMessage());
}
@@ -93,7 +93,7 @@ public class SavedSearchManager {
searchService.updateSavedSearch(savedSearch, new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
- SearchLogger.debug("Error: updating saved search [" + name + "] with pattern [" + pattern + "]: "
+ Log.debug("Error: updating saved search [" + name + "] with pattern [" + pattern + "]: "
+ caught.getMessage());
}
@@ -122,7 +122,7 @@ public class SavedSearchManager {
searchService.deleteSavedSearch(savedSearch.getId(), new AsyncCallback<Void>() {
public void onFailure(Throwable caught) {
- SearchLogger.debug("Error: removing saved search [" + name + "]: " + caught.getMessage());
+ Log.debug("Error: removing saved search [" + name + "]: " + caught.getMessage());
}
public void onSuccess(Void result) {
@@ -142,7 +142,7 @@ public class SavedSearchManager {
public void onFailure(Throwable caught) {
savedSearch.setName(oldName); // revive old name because server-side change failed
- SearchLogger.debug("Error: renaming saved search from [" + oldName + "] to [" + newName + "]: "
+ Log.debug("Error: renaming saved search from [" + oldName + "] to [" + newName + "]: "
+ caught.getMessage());
}
@@ -182,7 +182,7 @@ public class SavedSearchManager {
public void onFailure(Throwable caught) {
try {
- SearchLogger.debug("Error: loading saved searches: " + caught.getMessage());
+ Log.debug("Error: loading saved searches: " + caught.getMessage());
} finally {
searchBar.onSavedSearchManagerLoaded();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
index 5ac3651..fd3ecc8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.event.dom.client.BlurHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
@@ -64,7 +65,6 @@ import org.rhq.core.domain.search.SearchSuggestion.Kind;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.search.SearchBar;
-import org.rhq.enterprise.gui.coregui.client.search.SearchLogger;
public class SuggestTextBox_v3 extends Composite implements HasText, HasAllFocusHandlers, HasValue<String>,
HasSelectionHandlers<Suggestion> {
@@ -708,7 +708,7 @@ public class SuggestTextBox_v3 extends Composite implements HasText, HasAllFocus
if (searchSuggestion.getKind() == SearchSuggestion.Kind.GlobalSavedSearch
|| searchSuggestion.getKind() == SearchSuggestion.Kind.UserSavedSearch) {
// execute saved searches immediately, since they presumably constitute complete expressions
- SearchLogger.debug("selected '" + searchSuggestion.getLabel() + "' saved search suggestion");
+ Log.debug("selected '" + searchSuggestion.getLabel() + "' saved search suggestion");
searchBar.activateSavedSearch(searchSuggestion.getValue());
} else {
// selecting a simple suggestion or advanced suggestion
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
index 3714034..cf617f8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
@@ -40,6 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.test.configuration.TestGroupConfigu
* @author Ian Springer
*/
public class TestTopView extends AbstractSectionedLeftNavigationView {
+
public static final String VIEW_ID = "Test";
// view IDs for Inventory section
@@ -60,8 +61,7 @@ public class TestTopView extends AbstractSectionedLeftNavigationView {
}
protected Canvas defaultView() {
- String contents = "<h1>Test</h1>\n"
- + "This section contains pages for testing various GUI components.";
+ String contents = "<h1>" + MSG.view_testTop_title() + "</h1>\n" + MSG.view_testTop_description();
HTMLFlow flow = new HTMLFlow(contents);
flow.setPadding(20);
return flow;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java
index 1f7ccaf..206c78a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java
@@ -70,7 +70,7 @@ public class TestConfigurationView
toolStrip.addMember(new LayoutSpacer());
- this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), "Save");
+ this.saveButton = new LocatableIButton(this.extendLocatorId("Save"), MSG.common_button_save());
this.saveButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
save();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java
index 59495f8..0721562 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/CanvasUtility.java
@@ -26,7 +26,6 @@ import com.smartgwt.client.widgets.Canvas;
*/
public class CanvasUtility {
-
public static void blink(Canvas canvas) {
canvas.animateFade(10, new FadeAnimationCallback(3,canvas,false));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
index 1b97a65..0e1aeb4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java
@@ -28,6 +28,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
* @author Joseph Marques
*/
public class ErrorHandler {
+
public void handleError(String message) {
handleError(message, null);
}
@@ -77,4 +78,5 @@ public class ErrorHandler {
return list.toArray(new String[list.size()]);
}
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java
index a464b5e..1a4845d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenter.java
@@ -28,6 +28,7 @@ import com.allen_sauer.gwt.log.client.Log;
* @author Greg Hinkle
*/
public class MessageCenter {
+
private LinkedList<Message> messages = new LinkedList<Message>();
private List<MessageListener> listeners = new ArrayList<MessageListener>();
@@ -64,7 +65,7 @@ public class MessageCenter {
}
private void log(Message message) {
- String formattedMessage = "On " + message.getFired() + " MessageCenter received " + message.getConciseMessage();
+ String formattedMessage = "On " + message.getFired() + ", MessageCenter received " + message.getConciseMessage();
if (message.severity == Message.Severity.Info) {
Log.info(formattedMessage);
} else if (message.severity == Message.Severity.Warning) {
@@ -77,4 +78,5 @@ public class MessageCenter {
Log.debug(formattedMessage);
}
}
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
index 1a6968d..0a3f94c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
@@ -54,6 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
* @author Greg Hinkle
*/
public class MessageCenterView extends LocatableHLayout implements MessageCenter.MessageListener {
+
public static final String LOCATOR_ID = "MessageCenter";
public MessageCenterView(String locatorId) {
@@ -71,7 +72,8 @@ public class MessageCenterView extends LocatableHLayout implements MessageCenter
final Menu recentEventsMenu = new LocatableMenu(this.extendLocatorId("Messages"));
- IMenuButton recentEventsButton = new LocatableIMenuButton(extendLocatorId("RecentEvents"), "Messages",
+ IMenuButton recentEventsButton = new LocatableIMenuButton(extendLocatorId("RecentEvents"),
+ MSG.view_messageCenter_messageTitle(),
recentEventsMenu);
recentEventsButton.setTop(5);
recentEventsButton.setShowMenuBelow(false);
@@ -82,7 +84,7 @@ public class MessageCenterView extends LocatableHLayout implements MessageCenter
public void onClick(ClickEvent clickEvent) {
List<Message> messages = CoreGUI.getMessageCenter().getMessages();
if (messages.isEmpty()) {
- recentEventsMenu.setItems(new MenuItem("No recent messages."));
+ recentEventsMenu.setItems(new MenuItem(MSG.view_messageCenter_noRecentMessages()));
} else {
MenuItem[] items = new MenuItem[messages.size()];
for (int i = 0, messagesSize = messages.size(); i < messagesSize; i++) {
@@ -116,24 +118,24 @@ public class MessageCenterView extends LocatableHLayout implements MessageCenter
DynamicForm form = new LocatableDynamicForm(extendLocatorId("Details"));
form.setWrapItemTitles(false);
- StaticTextItem title = new StaticTextItem("title", "Title");
+ StaticTextItem title = new StaticTextItem("title", MSG.view_messageCenter_messageTitle());
title.setValue(message.conciseMessage);
- StaticTextItem severity = new StaticTextItem("severity", "Severity");
+ StaticTextItem severity = new StaticTextItem("severity", MSG.view_messageCenter_messageSeverity());
FormItemIcon severityIcon = new FormItemIcon();
severityIcon.setSrc(getSeverityIcon(message.severity));
severity.setIcons(severityIcon);
severity.setValue(message.severity.name());
- StaticTextItem date = new StaticTextItem("time", "Time");
+ StaticTextItem date = new StaticTextItem("time", MSG.view_messageCenter_messageTime());
date.setValue(message.fired);
- StaticTextItem detail = new StaticTextItem("detail", "Detail");
+ StaticTextItem detail = new StaticTextItem("detail", MSG.view_messageCenter_messageDetail());
detail.setTitleOrientation(TitleOrientation.TOP);
detail.setValue(message.detailedMessage);
detail.setColSpan(2);
- ButtonItem okButton = new ButtonItem("Ok", "Ok");
+ ButtonItem okButton = new ButtonItem("ok", MSG.common_button_ok());
okButton.setColSpan(2);
okButton.setAlign(Alignment.CENTER);
@@ -231,4 +233,5 @@ public class MessageCenterView extends LocatableHLayout implements MessageCenter
}
return iconSrc;
}
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java
index d1e321c..17bcbdb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java
@@ -23,8 +23,6 @@ package org.rhq.enterprise.gui.coregui.client.util.preferences;
*/
public interface UserPreferenceChangeListener {
-
- void onPreferrenceChange(UserPreferenceChangeEvent event);
-
+ void onPreferenceChange(UserPreferenceChangeEvent event);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java
index d85d464..839d5e6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java
@@ -101,7 +101,7 @@ public class UserPreferences {
UserPreferenceChangeEvent event = new UserPreferenceChangeEvent(name, value, oldValue);
for (UserPreferenceChangeListener listener : changeListeners) {
- listener.onPreferrenceChange(event);
+ listener.onPreferenceChange(event);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java
index 0ee7b22..51e6b40 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/MonitoringRequestCallback.java
@@ -28,6 +28,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.util.SC;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
/**
@@ -36,6 +38,8 @@ import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
*/
public class MonitoringRequestCallback implements RequestCallback {
+ private static final Messages MSG = CoreGUI.getMessages();
+
private int id;
private String name;
private long start = System.currentTimeMillis();
@@ -75,7 +79,7 @@ public class MonitoringRequestCallback implements RequestCallback {
@Override
public void onFailure(Throwable caught) {
- SC.say("Unable to determine login status - check Server status.");
+ SC.say(MSG.util_monitoringRequestCallback_error_checkServerStatusFailure());
}
});
}
@@ -94,7 +98,7 @@ public class MonitoringRequestCallback implements RequestCallback {
}
public String toString() {
- return "id=" + id + ", name=" + name + ", age=" + age();
+ return "MonitoringRequestCallback{id=" + id + ", name=" + name + ", age=" + age() + "}";
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java
index 72c6bf2..b4799c3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java
@@ -24,12 +24,17 @@ import java.util.Set;
import com.allen_sauer.gwt.log.client.Log;
import com.smartgwt.client.widgets.Img;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.Messages;
+
/**
* @author Greg Hinkle
* @author Joseph Marques
*/
public class RPCManager {
+ private static final Messages MSG = CoreGUI.getMessages();
+
private static final RPCManager INSTANCE = new RPCManager();
private static int nextCallId = 0;
@@ -83,8 +88,9 @@ public class RPCManager {
if (getQueueDepth() > 0) {
activityIndicator.show();
- StringBuilder buf = new StringBuilder().append("<b>").append(inProgress.size()).append(
- " active requests</b>");
+ int numberOfActiveRequests = inProgress.size();
+ String message = MSG.util_rpcManager_activeRequests(String.valueOf(numberOfActiveRequests));
+ StringBuilder buf = new StringBuilder().append("<b>").append(message).append("</b>");
for (MonitoringRequestCallback callback : inProgress) {
buf.append("<br/>");
buf.append(callback);
@@ -95,4 +101,5 @@ public class RPCManager {
activityIndicator.hide();
}
}
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 0fa4733..de2cb19 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -183,8 +183,6 @@ dataSource_measurementOob_field_formattedBaseband = Band~
dataSource_measurementOob_field_formattedOutlier = Outlier~
dataSource_measurementOob_field_factor = Out of Range Factor (%)~
dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information~
-dataSource_measurementOob_field_resourceName =
-dataSource_measurementOob_field_resourceName =
# Measurements
dataSource_schedules_field_resourceGroupId=Group ID~
@@ -427,7 +425,6 @@ view_group_tabs_connectionSettings=Connection Settings~
view_group_tabs_connectionSettingsHistory=Connection Settings History~
view_group_tabs_operations=Operations~
view_group_tabs_history=History~
-view_group_tabs_schedules=Schedules~
view_group_tabs_scheduled=Scheduled~
view_group_tabs_alerts=Alerts~
view_group_tabs_definitions=Definitions~
@@ -516,7 +513,7 @@ view_core_uncaught = Globally uncaught exception~
# Login
#--------------
-view_login_prompt = Please Login
+view_login_prompt = Please Login~
# Menu Bar
#--------------
@@ -539,8 +536,8 @@ view_messageCenter_button_messages = Messages~
view_messageCenter_noRecentMessages = No Recent Messages~
view_messageCenter_messageTitle= Title~
view_messageCenter_messageSeverity= Severity~
-view_messageCenter_messageTitle= Time~
-view_messageCenter_messageTitle= Detail~
+view_messageCenter_messageTime= Time~
+view_messageCenter_messageDetail= Detail~
# About Box
#----------
@@ -551,4 +548,3 @@ view_aboutBox_homepage = Homepage~
view_aboutBox_jbossByRedHat = JBoss by Red Hat~
view_aboutBox_title = About {0}~
view_aboutBox_version = Version:~
-