modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/Dashboard.java
| 2
modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
| 38 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
| 59 ++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
| 81 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
| 21 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
| 9 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
| 10 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
| 9 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
| 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java
| 5
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 42 ++---
18 files changed, 192 insertions(+), 131 deletions(-)
New commits:
commit 2d80a4ce1b73a6e799dc34893647e8cd746ed1bd
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 23 10:31:28 2010 -0500
Dashboard Work
- Always use persisted dashboards. So, when using the default dashbaord,
persist it as opposed to just displaying it. This is trivial db overhead
and allows us to assume we're working with persisted entities (with assigned
ids). This simplifies some logic, especially since portlets unique key is
the id. (note, this was recommended by ghinkle and I agreed it was a good
idea.)
- Implemented hashcode/equals for DashboardPortlet. The dash portlets are
managed in a Set, which uses equals() comparisons. On persisted dash
updates the portlet objects for a dash are replaced and so object
comparisons were failing. Now using the overrides we perform "id"
comparisons.
- Now disable the Dash while persisting a dash update asynchronously. This
prevents the user from losing modifications made during that async window.
For example, rapid portlet removal could be imcomplete. (This replaces the
faulty "synchronized" logic I had put in earlier. synchronized methods are
not (cannot be) honored in smartgwts generated javascript. That code has been
reverted)
- note, [BZ 661808 Removing portlets from the dashboard is not working]
resulted from both the bad equals logic *and* the async update window
problem, yeesh...
- reenabled the ability to delete the last dashboard tab. We had prevented
this so that the user would not have a blank dashboards view. Instead, now
if the user kills his last dashboard we immediately assign and display a
new default dash for the user. This allows a user to delete a dash he
doesn't like/need and basically start over, instead of trying to edit the
current one back into shape.
- replaced some homegrown locatorId logic with SeleniumUtility.getSafeId()
- trivial: fix a few typos in method and variable names
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/Dashboard.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/Dashboard.java
index 95e920d..4521f36 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/Dashboard.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/Dashboard.java
@@ -183,7 +183,7 @@ public class Dashboard implements Serializable {
portlets.add(storedPortlet);
}
- public Dashboard deepCoopy(boolean keepIds) {
+ public Dashboard deepCopy(boolean keepIds) {
Dashboard newDashboard = new Dashboard();
if (keepIds) {
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
index 19debd6..a83b061 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
@@ -174,4 +174,35 @@ public class DashboardPortlet implements Serializable {
public String toString() {
return "DashboardPortlet[id=" + id + ",key=" + portletKey +
",name=" + name + "]";
}
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + id;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (!(obj instanceof DashboardPortlet)) {
+ return false;
+ }
+
+ final DashboardPortlet other = (DashboardPortlet) obj;
+
+ // id test is only valid for entities. if not persisted entities then fail.
+ if (id <= 0 || other.id <= 0) {
+ return false;
+ } else if (id != other.id) {
+ return false;
+ }
+
+ return true;
+ }
+
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
index 9feaffd..5843658 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
@@ -59,6 +59,7 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIMenuButton;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
@@ -197,19 +198,18 @@ public class DashboardView extends LocatableVLayout {
}
});
- Menu addPorletMenu = new Menu();
+ Menu addPortletMenu = new Menu();
for (String portletName : PortletFactory.getRegisteredPortletKeys()) {
- addPorletMenu.addItem(new MenuItem(portletName));
+ addPortletMenu.addItem(new MenuItem(portletName));
}
- addPortlet = new LocatableIMenuButton(extendLocatorId("AddPortal"),
MSG.common_title_add_portlet(),
- addPorletMenu);
+ addPortlet = new LocatableIMenuButton(extendLocatorId("AddPortlet"),
MSG.common_title_add_portlet(),
+ addPortletMenu);
- // addPortlet = new ButtonItem("addPortlet", "Add
Portlet");
addPortlet.setIcon("[skin]/images/actions/add.png");
addPortlet.setAutoFit(true);
- addPorletMenu.addItemClickHandler(new ItemClickHandler() {
+ addPortletMenu.addItemClickHandler(new ItemClickHandler() {
public void onItemClick(ItemClickEvent itemClickEvent) {
String portletTitle = itemClickEvent.getItem().getTitle();
addPortlet(portletTitle, portletTitle);
@@ -325,11 +325,7 @@ public class DashboardView extends LocatableVLayout {
}
}
- /**
- * A synchronized call to ensure add/remove/save are exclusive.
- *
- */
- synchronized private void addPortlet(String portletKey, String portletName) {
+ private void addPortlet(String portletKey, String portletName) {
DashboardPortlet storedPortlet = new DashboardPortlet(portletName, portletKey,
250);
final PortletWindow newPortlet = new PortletWindow(extendLocatorId(portletKey),
this, storedPortlet);
@@ -369,46 +365,39 @@ public class DashboardView extends LocatableVLayout {
newPortlet.show();
}
}, 750);
- save(storedDashboard);
+ save();
}
- /**
- * A synchronized call to ensure the remove and save are atomic.
- *
- * @param portlet
- */
- synchronized public void removePortlet(DashboardPortlet portlet) {
+ public void removePortlet(DashboardPortlet portlet) {
storedDashboard.removePortlet(portlet);
- save(storedDashboard);
+ save();
}
- /**
- * A synchronized call to ensure add/remove/save are exclusive.
- */
- synchronized private void setDashboard(Dashboard dashboard) {
- storedDashboard = dashboard;
+ public void save(Dashboard dashboard) {
+ if (null != dashboard) {
+ storedDashboard = dashboard;
+ save();
+ }
}
public void save() {
- save(storedDashboard);
- }
+ // since we reset storedDashboard after the async update completes, block
modification of the dashboard
+ // during that interval.
+ DashboardView.this.disable();
- private void save(Dashboard dashboard) {
- GWTServiceLookup.getDashboardService().storeDashboard(dashboard, new
AsyncCallback<Dashboard>() {
+ GWTServiceLookup.getDashboardService().storeDashboard(storedDashboard, new
AsyncCallback<Dashboard>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_dashboardManager_error(),
caught);
+ DashboardView.this.enable();
}
public void onSuccess(Dashboard result) {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_dashboardManager_saved(result.getName()),
Message.Severity.Info));
- // use the synchronized call to ensure add/delete portlet doesn't get
interrupted. This is really
- // just limited protection for add/remove portlet. Since this now sets
storedDashboard,
- // anything using the old version could lose edits. If we want to make
this more robust we'll probably
- // need a locking mechanism for editing the dashboard.
- setDashboard(storedDashboard);
updateConfigs(result);
+ storedDashboard = result;
+ DashboardView.this.enable();
}
});
}
@@ -432,8 +421,8 @@ public class DashboardView extends LocatableVLayout {
// TODO: Note, we're using a sequence generated ID here as a
locatorId. This is not optimal for repeatable
// tests as a change in the number of default portlets, or a
change in test order could make a test
// non-repeatable. But, at the moment we lack the infrastructure
to generate a unique, predictable id.
- Portlet view =
viewFactory.getInstance(PortletFactory.replaceSpaces(portlet.getPortletKey())
- + "-" + Integer.toString(portlet.getId()));
+ Portlet view =
viewFactory.getInstance(SeleniumUtility.getSafeId(portlet.getPortletKey() + "-"
+ + Integer.toString(portlet.getId())));
//add code to re-initialize refresh cycle for portlets
if (view instanceof AutoRefreshPortlet) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
index 1b837bf..e9df895 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
@@ -76,7 +76,7 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
// Each NamedTab is a Dashboard, name=Dashboard.id, title=Dashboard.name
private NamedTabSet tabSet;
- // The ID (0 for default dash)
+ // The ID
private String selectedTabName;
private IButton editButton;
@@ -109,12 +109,31 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
CoreGUI.getErrorHandler().handleError(MSG.view_dashboardsManager_error1(), caught);
}
- public void onSuccess(List<Dashboard> result) {
+ public void onSuccess(final List<Dashboard> result) {
initialized = true;
+
if (result.isEmpty()) {
- result.add(getDefaultDashboard());
+ // if the user has no dashboards persist a default dashboard for him
to work with. In
+ // this way we're always working with a persisted dashboard and
real entities.
+ addDefaultDashboard();
+
+ } else {
+ updateDashboards(result);
}
- updateDashboards(result);
+ }
+ });
+ }
+
+ private void addDefaultDashboard() {
+ dashboardService.storeDashboard(getDefaultDashboard(), new
AsyncCallback<Dashboard>() {
+ public void onFailure(Throwable caught) {
+
CoreGUI.getErrorHandler().handleError(MSG.view_dashboardsManager_error1(), caught);
+ }
+
+ public void onSuccess(Dashboard defaultDashboard) {
+ List<Dashboard> dashboards = new ArrayList<Dashboard>(1);
+ dashboards.add(defaultDashboard);
+ updateDashboards(dashboards);
}
});
}
@@ -190,8 +209,6 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
}
- //updateFirstTabCanCloseState("update dashboards");
-
tabSet.addCloseClickHandler(new CloseClickHandler() {
public void onCloseClick(final TabCloseClickEvent tabCloseClickEvent) {
tabCloseClickEvent.cancel();
@@ -203,12 +220,11 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
dashboardsByName.remove(tabCloseClickEvent.getTab().getTitle());
tabSet.removeTab(tabCloseClickEvent.getTab());
dashboardView.delete();
- // if ( 0 ==
tabSet.getTabs().length) {
- //
- // }
- History.newItem(VIEW_ID.getName());
- //updateFirstTabCanCloseState("close
handler");
+ // if it's the last tab go back to a default tab
+ if (0 == tabSet.getTabs().length) {
+ addDefaultDashboard();
+ }
}
}
});
@@ -311,8 +327,6 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
tabSet.selectTab(tab);
editMode = true;
editButton.setTitle(editMode ? MSG.common_title_view_mode() :
MSG.common_title_edit_mode());
-
- //updateFirstTabCanCloseState("store dashboard");
}
});
}
@@ -325,16 +339,13 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
}
public void renderView(ViewPath viewPath) {
- NamedTab[] tabs = tabSet.getTabs();
-
// make sure we have at least a default dashboard tab
- if (0 == tabs.length) {
- List<Dashboard> defaultTabs = new ArrayList<Dashboard>(1);
- defaultTabs.add(getDefaultDashboard());
- updateDashboards(defaultTabs);
- tabs = tabSet.getTabs();
+ if (null == tabSet || 0 == tabSet.getTabs().length) {
+ return;
}
+ NamedTab[] tabs = tabSet.getTabs();
+
// if nothing selected or pathtab does not exist, default to the first tab
NamedTab selectedTab = tabs[0];
selectedTabName = selectedTab.getName();
@@ -351,8 +362,6 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
}
}
- //updateFirstTabCanCloseState("render view");
-
tabSet.selectTab(selectedTab);
}
@@ -364,13 +373,4 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
public boolean isInitialized() {
return initialized;
}
-
- // must be called when the tabset is first loaded (onInit), on each subsequent load,
and whenever it changes
- //public void updateFirstTabCanCloseState(String comingFrom) {
- // do not allow closing if there is only one dashboard tab remaining
- // boolean canClose = tabSet.getTabs().length > 1;
- // NamedTab firstTab = tabSet.getTabs()[0];
- // firstTab.setCanClose(canClose);
- //}
-
}
commit 248c9ab7ade22850f2e39f32433cc8b9bbeb5504
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 22 18:41:21 2010 -0500
Dashboard Work
- Add some doc to DashboardPortlet for name and portletKey semantics
- Remove improper I18N of portlet keys and use static keys
- Add explicit I18Nd default names for all portlets
- Make sure name and key are used properly
diff --git
a/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
index 5562dbe..19debd6 100644
---
a/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
+++
b/modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java
@@ -53,14 +53,17 @@ public class DashboardPortlet implements Serializable {
private static final long serialVersionUID = 1L;
+ // This is the only unique key. dashboard+portletKey+name does not have to be unique
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.AUTO, generator =
"RHQ_DASHBOARD_PORTLET_ID_SEQ")
@Id
private int id;
+ // A non-displayed, persisted identifier for the portlet.
@Column(name = "PORTLET_KEY")
private String portletKey;
+ // A displayed, persisted, editable name for the portlet.
@Column(name = "NAME")
private String name;
@@ -167,4 +170,8 @@ public class DashboardPortlet implements Serializable {
newPortlet.configuration = this.configuration != null ?
this.configuration.deepCopy(keepIds) : null;
return newPortlet;
}
+
+ public String toString() {
+ return "DashboardPortlet[id=" + id + ",key=" + portletKey +
",name=" + name + "]";
+ }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
index 61bd111..1b837bf 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
@@ -190,7 +190,7 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
}
- updateFirstTabCanCloseState("update dashboards");
+ //updateFirstTabCanCloseState("update dashboards");
tabSet.addCloseClickHandler(new CloseClickHandler() {
public void onCloseClick(final TabCloseClickEvent tabCloseClickEvent) {
@@ -203,9 +203,12 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
dashboardsByName.remove(tabCloseClickEvent.getTab().getTitle());
tabSet.removeTab(tabCloseClickEvent.getTab());
dashboardView.delete();
+ // if ( 0 ==
tabSet.getTabs().length) {
+ //
+ // }
History.newItem(VIEW_ID.getName());
- updateFirstTabCanCloseState("close handler");
+ //updateFirstTabCanCloseState("close
handler");
}
}
});
@@ -223,44 +226,40 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
dashboard.setColumnWidths("32%", "68%");
dashboard.getConfiguration().put(new PropertySimple(Dashboard.CFG_BACKGROUND,
"#F1F2F3"));
- DashboardPortlet summary = new
DashboardPortlet(MSG.view_dashboardsManager_inventory_title(),
- InventorySummaryPortlet.KEY, 230);
+ DashboardPortlet summary = new DashboardPortlet(InventorySummaryPortlet.NAME,
InventorySummaryPortlet.KEY, 230);
dashboard.addPortlet(summary, 0, 0);
- DashboardPortlet tagCloud = new
DashboardPortlet(MSG.view_dashboardsManager_tagcloud_title(),
- TagCloudPortlet.KEY, 200);
+ DashboardPortlet tagCloud = new DashboardPortlet(TagCloudPortlet.NAME,
TagCloudPortlet.KEY, 200);
dashboard.addPortlet(tagCloud, 0, 1);
// Experimental
// StoredPortlet platformSummary = new StoredPortlet("Platform
Summary", PlatformPortletView.KEY, 300);
// col2.add(platformSummary);
- DashboardPortlet welcome = new
DashboardPortlet(MSG.view_dashboardsManager_message_title(), MessagePortlet.KEY,
- 180);
+ DashboardPortlet welcome = new DashboardPortlet(MessagePortlet.NAME,
MessagePortlet.KEY, 180);
welcome.getConfiguration().put(
new PropertySimple("message",
MSG.view_dashboardsManager_message_title_details()));
dashboard.addPortlet(welcome, 1, 0);
- DashboardPortlet news = new
DashboardPortlet(MSG.view_dashboardsManager_mashup_title(), MashupPortlet.KEY, 320);
+ DashboardPortlet news = new DashboardPortlet(MashupPortlet.NAME,
MashupPortlet.KEY, 320);
news.getConfiguration().put(
new PropertySimple("address",
"http://rhq-project.org/display/RHQ/RHQ+News?decorator=popup"));
dashboard.addPortlet(news, 1, 1);
//
- DashboardPortlet discoveryQueue = new
DashboardPortlet(MSG.view_portlet_autodiscovery_title(),
- AutodiscoveryPortlet.KEY, 250);
+ DashboardPortlet discoveryQueue = new DashboardPortlet(AutodiscoveryPortlet.NAME,
AutodiscoveryPortlet.KEY, 250);
dashboard.addPortlet(discoveryQueue, 1, 2);
- DashboardPortlet recentAlerts = new DashboardPortlet(RecentAlertsPortlet.KEY,
RecentAlertsPortlet.KEY, 250);
+ DashboardPortlet recentAlerts = new DashboardPortlet(RecentAlertsPortlet.NAME,
RecentAlertsPortlet.KEY, 250);
dashboard.addPortlet(recentAlerts, 1, 3);
- DashboardPortlet recentlyAdded = new
DashboardPortlet(MSG.common_title_recently_added(),
+ DashboardPortlet recentlyAdded = new
DashboardPortlet(RecentlyAddedResourcesPortlet.NAME,
RecentlyAddedResourcesPortlet.KEY, 250);
dashboard.addPortlet(recentlyAdded, 1, 4);
- DashboardPortlet operations = new DashboardPortlet(MSG.common_title_operations(),
OperationsPortlet.KEY, 500);
+ DashboardPortlet operations = new DashboardPortlet(OperationsPortlet.NAME,
OperationsPortlet.KEY, 500);
dashboard.addPortlet(operations, 1, 5);
- DashboardPortlet problemResources = new
DashboardPortlet(MSG.view_portlet_problem_resources_title(),
+ DashboardPortlet problemResources = new
DashboardPortlet(ProblemResourcesPortlet.NAME,
ProblemResourcesPortlet.KEY, 250);
//initialize config for the problemResources portlet.
problemResources.getConfiguration()
@@ -313,7 +312,7 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
editMode = true;
editButton.setTitle(editMode ? MSG.common_title_view_mode() :
MSG.common_title_edit_mode());
- updateFirstTabCanCloseState("store dashboard");
+ //updateFirstTabCanCloseState("store dashboard");
}
});
}
@@ -352,7 +351,7 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
}
}
- updateFirstTabCanCloseState("render view");
+ //updateFirstTabCanCloseState("render view");
tabSet.selectTab(selectedTab);
}
@@ -367,11 +366,11 @@ public class DashboardsView extends LocatableVLayout implements
BookmarkableView
}
// must be called when the tabset is first loaded (onInit), on each subsequent load,
and whenever it changes
- public void updateFirstTabCanCloseState(String comingFrom) {
- // do not allow closing if there is only one dashboard tab remaining
- boolean canClose = tabSet.getTabs().length > 1;
- NamedTab firstTab = tabSet.getTabs()[0];
- firstTab.setCanClose(canClose);
- }
+ //public void updateFirstTabCanCloseState(String comingFrom) {
+ // do not allow closing if there is only one dashboard tab remaining
+ // boolean canClose = tabSet.getTabs().length > 1;
+ // NamedTab firstTab = tabSet.getTabs()[0];
+ // firstTab.setCanClose(canClose);
+ //}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
index 857f893..4e1ac46 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletFactory.java
@@ -37,6 +37,7 @@ import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.summary.Inventor
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.summary.TagCloudPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MashupPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.util.MessagePortlet;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
@@ -49,7 +50,9 @@ public class PortletFactory {
registeredPortlets = new HashMap<String, PortletViewFactory>();
registeredPortlets.put(InventorySummaryPortlet.KEY,
InventorySummaryPortlet.Factory.INSTANCE);
+
registeredPortlets.put(RecentlyAddedResourcesPortlet.KEY,
RecentlyAddedResourcesPortlet.Factory.INSTANCE);
+
registeredPortlets.put(PlatformSummaryPortlet.KEY,
PlatformSummaryPortlet.Factory.INSTANCE);
registeredPortlets.put(AutodiscoveryPortlet.KEY,
AutodiscoveryPortlet.Factory.INSTANCE);
@@ -63,8 +66,11 @@ public class PortletFactory {
registeredPortlets.put(FavoriteResourcesPortlet.KEY,
FavoriteResourcesPortlet.Factory.INSTANCE);
registeredPortlets.put(MashupPortlet.KEY, MashupPortlet.Factory.INSTANCE);
+
registeredPortlets.put(MessagePortlet.KEY, MessagePortlet.Factory.INSTANCE);
+
registeredPortlets.put(ProblemResourcesPortlet.KEY,
ProblemResourcesPortlet.Factory.INSTANCE);
+
registeredPortlets.put(OperationsPortlet.KEY,
OperationsPortlet.Factory.INSTANCE);
}
@@ -75,7 +81,7 @@ public class PortletFactory {
// TODO: Note, we're using a sequence generated ID here as a locatorId. This
is not optimal for repeatable
// tests as a change in the number of default portlets, or a change in test order
could make a test
// non-repeatable. But, at the moment we lack the infrastructure to generate a
unique, predictable id.
- Portlet view =
viewFactory.getInstance(replaceSpaces(storedPortlet.getPortletKey()) + "-"
+ Portlet view =
viewFactory.getInstance(SeleniumUtility.getSafeId(storedPortlet.getPortletKey()) +
"-"
+ Integer.toString(storedPortlet.getId()));
view.configure(portletWindow, storedPortlet);
@@ -87,19 +93,6 @@ public class PortletFactory {
return view;
}
- /** Translated spaces to underscore. Spaces not allowed in locator ids.
- *
- * @param portletKey
- * @return
- */
- public static String replaceSpaces(String portletKey) {
- String translated = portletKey;
- if (portletKey != null) {
- translated = portletKey.replaceAll(" ", "_");
- }
- return translated;
- }
-
@SuppressWarnings("unchecked")
public static List<String> getRegisteredPortletKeys() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
index e31ea1d..e92d367 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
@@ -50,8 +50,13 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
*/
public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements
CustomSettingsPortlet,
AutoRefreshPortlet {
+
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "Autodiscovery";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_autodiscovery();
+
//ui attributes/properties/indentifiers
- public static final String KEY = MSG.view_portlet_autodiscovery_title();
private static final String AUTODISCOVERY_PLATFORM_MAX =
"auto-discovery-platform-max";
private String unlimited = MSG.common_label_unlimited();
private String defaultValue = unlimited;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
index 1681d58..b41778b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/FavoriteResourcesPortlet.java
@@ -47,7 +47,10 @@ import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
*/
public class FavoriteResourcesPortlet extends ResourceSearchView implements
AutoRefreshPortlet {
- public static final String KEY = MSG.view_portlet_favoriteResources_title();
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "FavoriteResources";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_favoriteResources();
public static final String CFG_TABLE_PREFS = "tablePreferences";
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java
index 0175f28..85a34ff 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/GraphPortlet.java
@@ -47,7 +47,10 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitorin
*/
public class GraphPortlet extends SmallGraphView implements CustomSettingsPortlet {
- public static final String KEY = MSG.view_portlet_graph_title();
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "Graph";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_graph();
private PortletWindow portletWindow;
private DashboardPortlet storedPortlet;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
index 3540d9b..12bbce7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
@@ -62,11 +62,15 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet {
public static final ViewName VIEW_ID = new
ViewName("CpuAndMemoryUtilization", MSG.view_reports_platforms());
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "PlatformSummary";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_platformSummary();
+
private MeasurementDataGWTServiceAsync measurementService =
GWTServiceLookup.getMeasurementDataService();
private ResourceTypeGWTServiceAsync typeService =
GWTServiceLookup.getResourceTypeGWTService();
private HashMap<Integer, PlatformMetricDefinitions>
platformMetricDefinitionsHashMap = new HashMap<Integer,
PlatformMetricDefinitions>();
- public static final String KEY = MSG.view_portlet_platform_title();
public PlatformSummaryPortlet(String locatorId) {
super(locatorId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
index a9a801d..df8e479 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
@@ -57,7 +57,11 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*/
public class RecentAlertsPortlet extends AlertHistoryView implements
CustomSettingsPortlet, AutoRefreshPortlet {
- public static final String KEY = MSG.view_portlet_recentAlerts_title();
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "RecentAlerts";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_recentAlerts();
+
//widget keys also used in form population
public static final String ALERT_RANGE_DISPLAY_AMOUNT_VALUE =
"alert-range-display-amount-value";
public static final String ALERT_RANGE_PRIORITY_VALUE =
"alert-range-priority-value";
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
index b80f0d3..f925bde 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/imported/RecentlyAddedResourcesPortlet.java
@@ -50,7 +50,10 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class RecentlyAddedResourcesPortlet extends LocatableVLayout implements
CustomSettingsPortlet,
AutoRefreshPortlet {
- public static final String KEY = MSG.view_portlet_recentlyAdded_title();
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "RecentlyAddedResources";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME =
MSG.view_portlet_defaultName_recentlyAddedResources();
private boolean simple = true;
private DashboardPortlet storedPortlet;
@@ -75,7 +78,7 @@ public class RecentlyAddedResourcesPortlet extends LocatableVLayout
implements C
treeGrid = new TreeGrid();
treeGrid.setDataSource(getDataSource());
treeGrid.setAutoFetchData(true);
- treeGrid.setTitle(MSG.common_title_recently_added());
+ treeGrid.setTitle(MSG.view_portlet_defaultName_recentlyAddedResources());
treeGrid.setResizeFieldsInRealTime(true);
treeGrid.setTreeFieldTitle("Resource Name");
@@ -92,7 +95,7 @@ public class RecentlyAddedResourcesPortlet extends LocatableVLayout
implements C
treeGrid.setFields(resourceNameField, timestampField);
if (!simple) {
- addMember(new HeaderLabel(MSG.common_title_recently_added()));
+ addMember(new
HeaderLabel(MSG.view_portlet_defaultName_recentlyAddedResources()));
}
addMember(treeGrid);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
index 8ae6ee3..c884170 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationsPortlet.java
@@ -59,14 +59,16 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*/
public class OperationsPortlet extends LocatableVLayout implements CustomSettingsPortlet,
AutoRefreshPortlet {
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "Operations";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_operations();
+
//unique field/form identifiers
public static final String OPERATIONS_RANGE_COMPLETED_ENABLED =
"operations-completed-enabled";
public static final String OPERATIONS_RANGE_SCHEDULED_ENABLED =
"operations-scheduled-enabled";
public static final String OPERATIONS_RANGE_COMPLETED =
"operations-range-completed";
public static final String OPERATIONS_RANGE_SCHEDULED =
"operations-range-scheduled";
- //portlet key
- public static final String KEY = MSG.common_title_operations();
- private static final String TITLE = KEY;
private static String recentOperations = MSG.common_title_recent_operations();
private static String scheduledOperations = MSG.common_title_scheduled_operations();
public static String RANGE_DISABLED_MESSAGE =
MSG.view_portlet_operations_disabled();
@@ -98,7 +100,7 @@ public class OperationsPortlet extends LocatableVLayout implements
CustomSetting
protected void onInit() {
super.onInit();
//set title for larger container
- setTitle(TITLE);
+ //setTitle(TITLE);
this.recentOperationsGrid = new LocatableListGrid(recentOperations);
recentOperationsGrid.setDataSource(getDataSourceCompleted());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
index 8c6f106..d040f7c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
@@ -60,11 +60,14 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
*/
public class ProblemResourcesPortlet extends Table implements CustomSettingsPortlet,
AutoRefreshPortlet {
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "ProblemResources";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_problemResources();
+
//keys for smart gwt elements. should be unique
public static final String PROBLEM_RESOURCE_SHOW_HRS =
"max-problems-query-span";
public static final String PROBLEM_RESOURCE_SHOW_MAX =
"max-problems-shown";
- public static final String KEY = MSG.view_portlet_problem_resources_title();
- private static final String TITLE = KEY;
private DashboardPortlet storedPortlet;
//reference to datasource
private ProblemResourcesDataSource dataSource;
@@ -75,7 +78,7 @@ public class ProblemResourcesPortlet extends Table implements
CustomSettingsPort
private Timer defaultReloader;
public ProblemResourcesPortlet(String locatorId) {
- super(locatorId, TITLE, true);
+ super(locatorId, NAME, true);
setShowHeader(false);
setShowFooter(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
index adb7911..b5e11ec 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/InventorySummaryPortlet.java
@@ -50,11 +50,17 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class InventorySummaryPortlet extends LocatableVLayout implements
AutoRefreshPortlet {
+
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "InventorySummary";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_inventorySummary();
+
private ResourceBossGWTServiceAsync resourceBossService =
GWTServiceLookup.getResourceBossService();
private LocatableDynamicForm form;
- public static final String KEY = MSG.common_title_summary_counts();
private Timer defaultReloader;
+ private Timer reloader;
public InventorySummaryPortlet(String locatorId) {
super(locatorId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java
index 1ca4b1f..716f66f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/summary/TagCloudPortlet.java
@@ -36,7 +36,10 @@ import org.rhq.enterprise.gui.coregui.client.report.tag.TagCloudView;
*/
public class TagCloudPortlet extends TagCloudView implements Portlet {
- public static final String KEY = MSG.view_portlet_tagCloud_title();
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "TagCloud";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_tagCloud();
public TagCloudPortlet(String locatorId) {
super(locatorId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java
index 8d6af1c..3cff303 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MashupPortlet.java
@@ -41,7 +41,10 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLPane;
*/
public class MashupPortlet extends LocatableHTMLPane implements ConfigurablePortlet {
- public static final String KEY = MSG.common_title_mashup();
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "Mashup";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_mashup();
public MashupPortlet(String locatorId) {
super(locatorId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java
index bb37906..2a463aa 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/util/MessagePortlet.java
@@ -41,7 +41,10 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLPane;
*/
public class MessagePortlet extends LocatableHTMLPane implements ConfigurablePortlet {
- public static final String KEY = MSG.view_portlet_message_title();
+ // A non-displayed, persisted identifier for the portlet
+ public static final String KEY = "Message";
+ // A default displayed, persisted name for the portlet
+ public static final String NAME = MSG.view_portlet_defaultName_message();
public MessagePortlet(String locatorId) {
super(locatorId);
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 0263cc9..548d86b 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
@@ -133,14 +133,14 @@ common_title_plugin = Plugin
common_title_port = Port
common_title_portlet_auto_refresh=Portlet Auto-refresh Interval
common_title_providers = Providers
-common_title_recently_added = Recently Added Resources
common_title_recent_alerts = Recent Alerts
-common_title_recent_configuration_updates=Recent Configuration Updates
-common_title_recent_event_counts=Recent Event Counts
-common_title_recent_measurements=Recent Measurements
-common_title_recent_oob_metrics=Recent Out of Bound metrics
+common_title_recent_configuration_updates = Recent Configuration Updates
+common_title_recent_event_counts = Recent Event Counts
+common_title_recent_measurements = Recent Measurements
+common_title_recent_oob_metrics = Recent Out of Bound metrics
common_title_recent_operations = Recent Operations
-common_title_recent_pkg_history=Recent Package History
+common_title_recent_pkg_history = Recent Package History
+common_title_recently_added = Recently Added
common_title_remove_column = Remove Column
common_title_repositories = Repositories
common_title_resource = Resource
@@ -168,7 +168,6 @@ common_title_stop= Stop
common_title_summary = Summary
common_title_tag_cloud = Tag Cloud
common_title_the = The
-common_title_summary_counts = Summary Counts
common_title_timestamp = Date/Time
common_title_total = Total
common_title_type = Type
@@ -1178,17 +1177,25 @@ view_dashboards_portlets_refresh_one_min = Refresh every 1 minute
view_dashboards_portlets_refresh_success1=Updated interval for portlets that
auto-refresh
view_dashboards_portlets_refresh_success2=Stopping reload for portlets that auto-refresh
view_dashboardsManager_error1 = Failed to add new dashboard
-# // dup in common
-view_dashboardsManager_inventory_title = Inventory Summary
-view_dashboardsManager_mashup_title = RHQ News
-view_dashboardsManager_message_title = Welcome To RHQ
view_dashboardsManager_message_title_details = <h1>Welcome to
RHQ</h1>\n<p>The RHQ project is an abstraction and plug-in based systems
management suite that provides extensible and integrated systems management for multiple
products and platforms across a set of core features. The project is designed with layered
modules that provide a flexible architecture for deployment. It delivers a core user
interface that delivers audited and historical management across an entire enterprise. A
Server/Agent architecture provides remote management and plugins implement all specific
support for managed products.</p>\n <p>This default dashboard can be edited by
clicking the (edit mode) button above.</p>
-view_dashboardsManager_tagcloud_title = Tag Cloud
+
+view_portlet_defaultName_autodiscovery = Discovery Queue
+view_portlet_defaultName_favoriteResources = Favorite Resources
+view_portlet_defaultName_graph = Resource Graph
+view_portlet_defaultName_inventorySummary = Inventory Summary
+view_portlet_defaultName_mashup = RHQ News
+view_portlet_defaultName_message = Welcome To RHQ
+view_portlet_defaultName_operations = Operations
+view_portlet_defaultName_platformSummary = Platforms Summary
+view_portlet_defaultName_problemResources = Alerted or Unavailable Resources
+view_portlet_defaultName_recentAlerts = Recent Alerts
+view_portlet_defaultName_recentlyAddedResources = Recently Added Resources
+view_portlet_defaultName_tagCloud = Tag Cloud
+
+
view_portlet_autodiscovery_config_platform_selection = Number of platforms to display
view_portlet_autodiscovery_help_msg = This portlet offers the ability to import newly
discovered resources into the inventory for monitoring and management or to ignore them
from further action.
-view_portlet_autodiscovery_title = Discovery Queue
view_portlet_favoriteResources_msg = This portlet displays your favorite resources
-view_portlet_favoriteResources_title = Favorite Resources
view_portlet_generic_help = No help available for this portlet
view_portlet_generic_unconfigured = No settings available for this portlet
view_portlet_graph_configure_resource_graph = The resource to graph
@@ -1198,7 +1205,6 @@ view_portlet_graph_configure_title_desc = Configuration of the graph
portlet
view_portlet_graph_help_msg = This Portlet supports the graphing of a resource metric.
view_portlet_graph_help_title = Graph Portlet
view_portlet_graph_help_unconfigured = This graph is unconfigured, click the settings
button to configure.
-view_portlet_graph_title = Resource Graph
view_portlet_inventory_error1 = Failed to retrieve inventory summary
view_portlet_inventory_tooltip_expand = Click to show more details for this resource.
view_portlet_inventory_tooltip_collapse = Click to hide details for this resource.
@@ -1224,7 +1230,6 @@ view_portlet_operations_disabled = (Results currently disabled.
Change settings
view_portlet_operations_help_msg = This portlet displays both operations that have
occurred and are scheduled to occur.
view_portlet_platform_help_msg = This portlet displays information about platforms in
inventory.
view_portlet_platform_platform_error_1 = Failed to load platform metrics
-view_portlet_platform_title = Platforms Summary
view_portlet_platform_type_error_1 = Could not load type data
view_portlet_problem_resources_config_display_maximum = Maximum number of Problem
resources to display.
view_portlet_problem_resources_config_display_range = Show problem resources going back
this many hours.
@@ -1233,20 +1238,15 @@ view_portlet_problem_resources_config_problem_label = problem
resources on dashb
view_portlet_problem_resources_config_title = ProblemResourcesPortlet Configuration
view_portlet_problem_resources_config_title_desc = The configuration settings for the
Problem resources portlet.
view_portlet_problem_resources_help = This portlet displays resources that have reported
alerts or Down availability.
-view_portlet_problem_resources_title = Has Alerts or Currently Unavailable
view_portlet_recentAlerts_config_members = Select Members
view_portlet_recentAlerts_config_priority_label = priority Alerts,
view_portlet_recentAlerts_config_when = within the past
view_portlet_recentAlerts_help_msg = Displays recent alerts fired on resources visible to
the current user login.
view_portlet_recentAlerts_fail_msg = Failed to load resources assigned for alert
filtering.
-# // dup in common
-view_portlet_recentAlerts_title = Recent Alerts
view_portlet_recentlyAdded_approved_platforms = recently approved platforms on
dashboard.
view_portlet_recentlyAdded_error1 = Failed to load recently added resources
view_portlet_recentlyAdded_help_msg = This portlet displays resources that have recently
been imported into the inventory.
-view_portlet_recentlyAdded_title =Recently Added Portlet
view_portlet_tagCloud_help = portlet displays the relative tag counts in the system
visible to the current user.
-view_portlet_tagCloud_title = TagCloud
# =================== Inventory =====================