modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 7 +++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 9 ++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java | 3 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java | 5 ++--- 4 files changed, 11 insertions(+), 13 deletions(-)
New commits: commit 03e49ccb3c9f366476ab4e3b0654300e3391d183 Author: Jay Shaughnessy jshaughn@redhat.com Date: Thu Nov 18 17:23:38 2010 -0500
I18N - fixed a problem with LHS section headers displaying name and not title - replaced a lurking literal
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index 05037fe..3c15857 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -72,7 +72,6 @@ import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.enterprise.gui.coregui.client.CoreGUI; -import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.RefreshableView; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -557,7 +556,7 @@ public class Table extends LocatableHLayout implements RefreshableView { ListGridField[] newFields = new ListGridField[fields.length + dataSourceFieldNamesSet.size()]; int destIndex = 0; if (dataSourceFieldNamesSet.contains(FIELD_ID)) { - listGridIdField = new ListGridField(FIELD_ID, "ID", 55); + listGridIdField = new ListGridField(FIELD_ID, MSG.common_title_id(), 55); // Override the DataSource id field metadata for consistent display across all Tables. listGridIdField.setType(ListGridFieldType.INTEGER); listGridIdField.setCanEdit(false); @@ -677,8 +676,9 @@ public class Table extends LocatableHLayout implements RefreshableView { recordNames.add(name); }
- Message message = new Message(MSG.widget_recordEditor_info_recordUpdatedConcise(getDataTypeNamePlural()), - MSG.widget_recordEditor_info_recordsDeletedDetailed(String.valueOf(deletedRecords.length), + Message message = new Message(MSG + .widget_recordEditor_info_recordUpdatedConcise(getDataTypeNamePlural()), MSG + .widget_recordEditor_info_recordsDeletedDetailed(String.valueOf(deletedRecords.length), getDataTypeNamePlural(), recordNames.toString())); CoreGUI.getMessageCenter().notify(message); } @@ -701,7 +701,6 @@ public class Table extends LocatableHLayout implements RefreshableView { return MSG.common_msg_deleteConfirm(getDataTypeNamePlural()); }
- // -------------- Inner utility classes ------------- //
/** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java index bee3bb6..7a027ac 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java @@ -137,6 +137,7 @@ public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayo
private void addSection(final TreeGrid treeGrid) { final String sectionName = treeGrid.getTree().getRoot().getName(); + final String sectionTitle = treeGrid.getTree().getRoot().getTitle(); this.treeGrids.put(sectionName, treeGrid);
treeGrid.addCellClickHandler(new CellClickHandler() { @@ -154,7 +155,7 @@ public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayo } });
- SectionStackSection section = new SectionStackSection(sectionName); + SectionStackSection section = new SectionStackSection(sectionTitle); section.setExpanded(true); section.addItem(treeGrid);
commit f68033f4b94d0f57e2b680836ffeae773f948bb3 Author: Jay Shaughnessy jshaughn@redhat.com Date: Thu Nov 18 17:21:52 2010 -0500
Fix I18N classloading issue (in dev mode) by ensuring the I18N Messages is created up front.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java index 5f4ed59..1030227 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java @@ -63,7 +63,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; * @author Ian Springer */ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> { - private static final Messages MSG = CoreGUI.getMessages(); + // This must come first to ensure proper I18N class loading for dev mode + private static final Messages MSG = GWT.create(Messages.class);
private static final String DEFAULT_VIEW_PATH = DashboardsView.VIEW_ID.getName();
@@ -92,8 +93,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> {
private static CoreGUI coreGUI;
- public static Messages messages = GWT.create(Messages.class); - private static Message pendingMessage;
public void onModuleLoad() { @@ -298,7 +297,7 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> { }
public static Messages getMessages() { - return messages; + return MSG; }
private class RootCanvas extends VLayout implements BookmarkableView { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java index 61d1b25..1cfe874 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java @@ -1,7 +1,6 @@ package org.rhq.enterprise.gui.coregui.client.util.selenium;
-import com.google.gwt.core.client.GWT; - +import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages;
/** @@ -9,7 +8,7 @@ import org.rhq.enterprise.gui.coregui.client.Messages; */ public interface Locatable {
- Messages MSG = GWT.create(Messages.class); + Messages MSG = CoreGUI.getMessages();
/** * Returns the locatorId. This can be useful for constructing more granular locatorIds. For example, if
rhq-commits@lists.fedorahosted.org