[rhq] Branch 'feature/cassandra-backend' - modules/common modules/enterprise
by John Sanda 03 Apr '13
by John Sanda 03 Apr '13
03 Apr '13
modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java | 2 +-
modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java | 1 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java | 8 ++++++++
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit b68e06553587b863bc92c62c6448d3ac066514d6
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Apr 3 11:17:16 2013 -0400
do not hard code cql port when initializing session
diff --git a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
index 60ebc62..5195e7e 100644
--- a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
+++ b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
@@ -203,7 +203,7 @@ public class StorageInstaller {
dataDir = cmdLine.getOptionValue("data", dataDir);
savedCachesDir = cmdLine.getOptionValue("saved-caches", savedCachesDir);
- deploymentOptions.setCommitLogDir(cmdLine.getOptionValue(commitLogDir));
+ deploymentOptions.setCommitLogDir(commitLogDir);
deploymentOptions.setDataDir(dataDir);
deploymentOptions.setSavedCachesDir(savedCachesDir);
deploymentOptions.setLoggingLevel("INFO");
diff --git a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
index 29b9104..3670304 100644
--- a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
+++ b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
@@ -97,6 +97,7 @@ public class SchemaManager {
.addContactPoints(hostNames)
.withAuthInfoProvider(authInfoProvider)
.withCompression(SNAPPY)
+ .withPort(nodes.get(0).getNativeTransportPort())
.build();
session = cluster.connect("system");
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java
index f35f7fd..d789da1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java
@@ -66,17 +66,25 @@ public class SessionManagerBean {
if (seedProp == null) {
throw new CQLException("The rhq.cassandra.seeds property is null. Cannot create session.");
}
+ int port = -1;
String[] seeds = seedProp.split(",");
String[] hostNames = new String[seeds.length];
for (int i = 0; i < seeds.length; ++i) {
CassandraNode node = CassandraNode.parseNode(seeds[i]);
+ port = node.getNativeTransportPort();
hostNames[i] = node.getHostName();
}
+ if (port == -1) {
+ throw new RuntimeException("Failed to initialize client port. Cannot create " +
+ Session.class.getName() + " object.");
+ }
+
Cluster cluster = Cluster.builder()
.addContactPoints(hostNames)
.withAuthInfoProvider(new SimpleAuthInfoProvider().add("username", username).add("password", password))
.withCompression(SNAPPY)
+ .withPort(port)
.build();
session = cluster.connect("rhq");
} catch (NoHostAvailableException e) {
1
0
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 96 ++++++----
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml | 3
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml | 4
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml | 2
5 files changed, 76 insertions(+), 31 deletions(-)
New commits:
commit 621226ea3ddaa304f245c13d26af1ec698804d97
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Apr 3 11:17:28 2013 -0400
BZ 535289 - test that we can do things to plugins via plugin manager even if types from plugins are ignored
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
index 2960887..0897163 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java
@@ -43,6 +43,11 @@ import org.rhq.enterprise.server.util.LookupUtil;
@Test(groups = { "plugin.metadata", "PluginManagerBean" }, priority = 100000)
public class PluginManagerBeanTest extends MetadataBeanTest {
+ private static final String PLUGIN_1 = "PluginManagerBeanTestPlugin1";
+ private static final String PLUGIN_2 = "PluginManagerBeanTestPlugin2";
+ private static final String PLUGIN_3 = "PluginManagerBeanTestPlugin3";
+ private static final String PLUGIN_3_1 = "PluginManagerBeanTestPlugin3.1";
+
private SubjectManagerLocal subjectMgr;
private PluginManagerLocal pluginMgr;
@@ -87,34 +92,60 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
createPluginJarFile("test-plugin3.1.jar", "plugin_3.1.xml");
getPluginScannerService().scanAndRegister();
+
+ // ignore some types to make sure the plugin manager can still work with ignored types
+ ignoreType("TestServer1Ignored", PLUGIN_1);
+ ignoreType("TestServer2Ignored", PLUGIN_2);
+ ignoreType("TestServer3Ignored", PLUGIN_3);
+ ignoreType("TestServer3.1Ignored", PLUGIN_3_1);
+
+ return;
+ }
+
+ private void ignoreType(String typeName, String pluginName) {
+ SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
+ ResourceTypeManagerLocal typeMgr = LookupUtil.getResourceTypeManager();
+ ResourceType rt = typeMgr.getResourceTypeByNameAndPlugin(typeName, pluginName);
+ if (rt == null) {
+ fail("Should have had a resource type named [" + typeName + "] from plugin [" + pluginName + "]");
+ }
+ typeMgr.setResourceTypeIgnoreFlagAndUninventoryResources(subjectMgr.getOverlord(), rt.getId(), true);
+
+ // sanity check - make sure the type really got ignored
+ rt = typeMgr.getResourceTypeByNameAndPlugin(typeName, pluginName);
+ if (!rt.isIgnored()) {
+ fail("Should have ignored resource type [" + rt + "]");
+ }
+
+ return;
}
@Test(dependsOnMethods = { "registerPlugins" })
public void scanAndRegisterTest() throws Exception {
- Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1");
+ Plugin plugin = getPlugin(PLUGIN_1);
assertNotNull(plugin);
- pluginDeployed("PluginManagerBeanTestPlugin1");
+ pluginDeployed(PLUGIN_1);
- plugin = getPlugin("PluginManagerBeanTestPlugin2");
+ plugin = getPlugin(PLUGIN_2);
assertNotNull(plugin);
- pluginDeployed("PluginManagerBeanTestPlugin2");
+ pluginDeployed(PLUGIN_2);
- plugin = getPlugin("PluginManagerBeanTestPlugin3");
+ plugin = getPlugin(PLUGIN_3);
assertNotNull(plugin);
- pluginDeployed("PluginManagerBeanTestPlugin3");
+ pluginDeployed(PLUGIN_3);
- plugin = getPlugin("PluginManagerBeanTestPlugin3.1");
+ plugin = getPlugin(PLUGIN_3_1);
assertNotNull(plugin);
- pluginDeployed("PluginManagerBeanTestPlugin3.1");
+ pluginDeployed(PLUGIN_3_1);
}
@Test(dependsOnMethods = { "registerPlugins" })
public void disablePlugin() throws Exception {
- Plugin plugin = getPlugin("PluginManagerBeanTestPlugin3");
+ Plugin plugin = getPlugin(PLUGIN_3);
assertTrue("Plugin should not already be disabled", plugin.isEnabled());
pluginMgr.disablePlugins(subjectMgr.getOverlord(), asList(plugin.getId()));
- plugin = pluginMgr.getPlugin("PluginManagerBeanTestPlugin3");
+ plugin = pluginMgr.getPlugin(PLUGIN_3);
assertNotNull(plugin);
assertFalse("Failed to disable plugin", plugin.isEnabled());
@@ -122,9 +153,9 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "registerPlugins" })
public void doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled() throws Exception {
- Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1");
+ Plugin plugin = getPlugin(PLUGIN_1);
assertTrue("Plugin should not already be disabled", plugin.isEnabled());
- Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
+ Plugin plugin2 = getPlugin(PLUGIN_2);
assertTrue("Plugin should not already be disabled", plugin.isEnabled());
Exception exception = null;
@@ -135,7 +166,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
exception = e;
}
- plugin = getPlugin("PluginManagerBeanTestPlugin1");
+ plugin = getPlugin(PLUGIN_1);
assertTrue("Plugin should not have been disabled", plugin.isEnabled());
assertNotNull("Expected exception to be thrown when trying to disable a plugin that has dependent plugins",
@@ -146,13 +177,13 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "doNotDisablePluginIfDependentPluginsAreNotAlsoDisabled" })
public void disablePluginAndDependentPlugins() throws Exception {
- Plugin plugin1 = getPlugin("PluginManagerBeanTestPlugin1");
- Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
+ Plugin plugin1 = getPlugin(PLUGIN_1);
+ Plugin plugin2 = getPlugin(PLUGIN_2);
pluginMgr.disablePlugins(subjectMgr.getOverlord(), asList(plugin1.getId(), plugin2.getId()));
- plugin1 = getPlugin("PluginManagerBeanTestPlugin1");
- plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
+ plugin1 = getPlugin(PLUGIN_1);
+ plugin2 = getPlugin(PLUGIN_2);
assertFalse("Failed to disable plugin", plugin1.isEnabled());
assertFalse("Failed to disable plugin", plugin2.isEnabled());
@@ -160,13 +191,13 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
@Test(groups = { "plugin.metadata", "PluginManagerBean" }, dependsOnMethods = { "disablePluginAndDependentPlugins" })
public void enablePlugins() throws Exception {
- Plugin plugin1 = getPlugin("PluginManagerBeanTestPlugin1");
- Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
+ Plugin plugin1 = getPlugin(PLUGIN_1);
+ Plugin plugin2 = getPlugin(PLUGIN_2);
pluginMgr.enablePlugins(subjectMgr.getOverlord(), asList(plugin1.getId(), plugin2.getId()));
- plugin1 = getPlugin("PluginManagerBeanTestPlugin1");
- plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
+ plugin1 = getPlugin(PLUGIN_1);
+ plugin2 = getPlugin(PLUGIN_2);
assertTrue("Failed to enable plugin", plugin1.isEnabled());
assertTrue("Failed to enable plugin", plugin2.isEnabled());
@@ -174,7 +205,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "enablePlugins" })
public void doNotDeletePluginIfDependentPluginIsNotAlsoDeleted() throws Exception {
- Plugin plugin = getPlugin("PluginManagerBeanTestPlugin1");
+ Plugin plugin = getPlugin(PLUGIN_1);
Exception exception = null;
try {
@@ -191,13 +222,13 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
@Test(dependsOnMethods = { "doNotDeletePluginIfDependentPluginIsNotAlsoDeleted" })
public void deletePlugins() throws Exception {
- Plugin plugin1 = getPlugin("PluginManagerBeanTestPlugin1");
- Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2");
+ Plugin plugin1 = getPlugin(PLUGIN_1);
+ Plugin plugin2 = getPlugin(PLUGIN_2);
pluginMgr.deletePlugins(subjectMgr.getOverlord(), asList(plugin1.getId(), plugin2.getId()));
- plugin1 = getPlugin("PluginManagerBeanTestPlugin1", "Deleting a plugin should not remove it from the database");
- plugin2 = getPlugin("PluginManagerBeanTestPlugin2", "Deleting a plugin should not remove it from the database");
+ plugin1 = getPlugin(PLUGIN_1, "Deleting a plugin should not remove it from the database");
+ plugin2 = getPlugin(PLUGIN_2, "Deleting a plugin should not remove it from the database");
assertTrue("Expected plugin status to be set to DELETED", plugin1.getStatus() == PluginStatusType.DELETED);
assertTrue("Expected plugin status to be set to DELETED", plugin2.getStatus() == PluginStatusType.DELETED);
@@ -208,7 +239,7 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
ResourceTypeManagerLocal resourceTypeManager = LookupUtil.getResourceTypeManager();
InventoryManagerLocal inventoryManager = LookupUtil.getInventoryManager();
- Plugin plugin = getDeletedPlugin("PluginManagerBeanTestPlugin1");
+ Plugin plugin = getDeletedPlugin(PLUGIN_1);
List<ResourceType> resourceTypes = resourceTypeManager.getResourceTypesByPlugin(plugin.getName());
List<ResourceType> deletedTypes = inventoryManager.getDeletedTypes();
@@ -236,15 +267,20 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
InventoryManagerLocal inventoryManager = LookupUtil.getInventoryManager();
ResourceTypeManagerLocal resourceTypeManager = LookupUtil.getResourceTypeManager();
- Plugin plugin3 = getPlugin("PluginManagerBeanTestPlugin3");
+ Plugin plugin3 = getPlugin(PLUGIN_3);
ResourceType resourceType = resourceTypeManager
.getResourceTypeByNameAndPlugin("TestServer3", plugin3.getName());
+ ResourceType resourceTypeIgnored = resourceTypeManager.getResourceTypeByNameAndPlugin("TestServer3Ignored",
+ plugin3.getName());
assertNotNull("Failed to find resource type. Did the resource type name in the plugin descriptor change?",
resourceType);
+ assertNotNull("Failed to find ignored resource type. Did the type name in the plugin descriptor change?",
+ resourceTypeIgnored);
pluginMgr.deletePlugins(subjectMgr.getOverlord(), asList(plugin3.getId()));
inventoryManager.purgeDeletedResourceType(resourceType);
+ inventoryManager.purgeDeletedResourceType(resourceTypeIgnored);
pluginMgr.markPluginsForPurge(subjectMgr.getOverlord(), asList(plugin3.getId()));
assertTrue("Expected " + plugin3 + " to be ready for purge since all its resource types have been purged "
@@ -253,9 +289,9 @@ public class PluginManagerBeanTest extends MetadataBeanTest {
@Test(enabled = false, dependsOnMethods = { "deletePlugins" })
public void purgePlugins() throws Exception {
- Plugin plugin1 = getPlugin("PluginManagerBeanTestPlugin1",
+ Plugin plugin1 = getPlugin(PLUGIN_1,
"Deleting a plugin should not remove it from the database");
- Plugin plugin2 = getPlugin("PluginManagerBeanTestPlugin2",
+ Plugin plugin2 = getPlugin(PLUGIN_2,
"Deleting a plugin should not remove it from the database");
pluginMgr.markPluginsForPurge(subjectMgr.getOverlord(), asList(plugin1.getId(), plugin2.getId()));
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
index a639a3b..bce14b0 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_1.xml
@@ -4,5 +4,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
+
<server name="TestServer1"/>
+ <server name="TestServer1Ignored"/> <!-- to be ignored in tests -->
+
</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
index e2c7b22..92eca14 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_2.xml
@@ -8,4 +8,6 @@
<depends plugin="PluginManagerBeanTestPlugin1" useClasses="true"/>
<server name="TestServer2"/>
+ <server name="TestServer2Ignored"/> <!-- to be ignored in tests -->
+
</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
index ec2aef1..9175013 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.1.xml
@@ -5,5 +5,7 @@
xmlns="urn:xmlns:rhq-plugin"
xmlns:c="urn:xmlns:rhq-configuration">
- <server name="TestServer3.1"/>
+ <server name="TestServer3.1"/>
+ <server name="TestServer3.1Ignored"/> <!-- to be ignored in tests -->
+
</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
index c2bde29..5448096 100644
--- a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest/plugin_3.xml
@@ -6,4 +6,6 @@
xmlns:c="urn:xmlns:rhq-configuration">
<server name="TestServer3"/>
+ <server name="TestServer3Ignored"/> <!-- to be ignored in tests -->
+
</plugin>
\ No newline at end of file
1
0
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java | 2
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java | 2
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java | 89 ++++++++--
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java | 2
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java | 2
5 files changed, 80 insertions(+), 17 deletions(-)
New commits:
commit f7ddb8faea10e44ae04b35a4659ff34c6fc81f8a
Merge: 564f896 1d605ed
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Apr 3 09:18:21 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 1d605edf14fde97c3986fd376e5f41d7e6194bae
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Apr 3 14:28:57 2013 +0200
[BZ 928971] - Return the same class pool for the same context classloader
so that the class cache of the class pool is consistent with what has
been defined using given classloader. This should prevent the possible
linkage errors when trying to define a single class multiple times in the
same classloader which could have happened before this change.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
index 63c96f0..fd85128 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
@@ -152,7 +152,7 @@ public class ResourceClientFactory {
private Class<?> defineCustomInterface(ResourceClientProxy proxy) {
try {
// define the dynamic class - do not put it in any known rhq package in case our jars are signed (see BZ-794503)
- ClassPool pool = ClassPoolFactory.newInstance();
+ ClassPool pool = ClassPoolFactory.getClassPoolForCurrentContextClassLoader();
CtClass customClass = pool.makeInterface("org.rhq.bindings.client.dynamic."
+ ResourceClientProxy.class.getSimpleName() + proxy.fingerprint);
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index fc5e610..e1502c1 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -412,7 +412,7 @@ public class ResourceClientProxy {
if (!LazyLoadScenario.isShouldLoad())
return null;
- ClassPool pool = ClassPoolFactory.newInstance();
+ ClassPool pool = ClassPoolFactory.getClassPoolForCurrentContextClassLoader();
Configuration parameters = ConfigurationClassBuilder.translateParametersToConfig(pool, definition
.getParametersConfigurationDefinition(), args);
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java
index 38397db..06211c5 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java
@@ -23,6 +23,9 @@
package org.rhq.bindings.util;
+import java.lang.ref.WeakReference;
+import java.util.WeakHashMap;
+
import javassist.ClassClassPath;
import javassist.ClassPool;
import javassist.LoaderClassPath;
@@ -31,12 +34,6 @@ import javassist.LoaderClassPath;
* This class is used to create Javassist's classpools usable in RHQ on both client and server side. This only exists to
* centralize the initialization code for the pools.
*
- * <p> Unlike the <code>ClassPool.getDefault()</code> method that only ever returns a single instance of the pool, this
- * factory returns a <b>new instance</b> every time. This is because it uses a "wider" class path, looking for classes
- * using the current thread context class loader but also using the default resource lookup of the <code>Class</code>
- * class, in addition to just the system class path as detected by Javassist (which is the only one used in the class
- * pool returned by <code>ClassPool.getDefault()</code>).
- *
* <p> This is to ensure that Javassist can locate the classes in various classloading "schemes" - the traditional
* application classloader used in the CLI client and the JBoss Modules classloading used on the server.
*
@@ -44,19 +41,85 @@ import javassist.LoaderClassPath;
*/
public class ClassPoolFactory {
+ /**
+ * A simple extension of a standard Javassist's class pool that makes sure that the classes are defined using a
+ * specified classloader.
+ *
+ * <p> The default implementation always defines a class in the current context classloader, which theoretically
+ * might not be the same as the classloader that we requested the class pool for in the {@link
+ * #getClassPoolForCurrentContextClassLoader()} method.
+ *
+ * <p>This class pool searches for classes using the provided class loader by default.
+ */
+ private static class ClassLoaderBoundClassPool extends ClassPool {
+
+ private WeakReference<ClassLoader> classLoader;
+
+ public ClassLoaderBoundClassPool(ClassLoader classLoader) {
+ this.classLoader = new WeakReference<ClassLoader>(classLoader);
+ this.insertClassPath(new LoaderClassPath(classLoader));
+ }
+
+ @Override
+ public ClassLoader getClassLoader() {
+ ClassLoader cl = classLoader.get();
+ if (cl == null) {
+ throw new IllegalStateException("The bound classloader has been garbage collected.");
+ }
+ return cl;
+ }
+ }
+
+ /**
+ * A cache of ClassPools, each for a classloader
+ */
+ private static final WeakHashMap<ClassLoader, ClassPool> CLASS_POOL_PER_CLASS_LOADER = new WeakHashMap<ClassLoader, ClassPool>();
+
private ClassPoolFactory() {
}
/**
- * @return the singleton class pool instance initialized according the {@link ClassPoolFactory rules}.
+ * Returns a class pool that uses the provided class loader as its source for the "class path". Each class loader
+ * will have exactly one class pool and the class pool will use the class loader to define the classes. This is to
+ * ensure that there exists a consistent correspondence between the classes cached by the class pool with the ones
+ * defined by the class loader and no linkage error can occur due to the possible attempts to define a single class
+ * multiple times using a single class loader.
+ *
+ * <p> If the provided class loader is null, a default instance is used.
+ *
+ * @param classLoader the class loader to return the class pool for
+ * @return
*/
- public static ClassPool newInstance() {
- ClassPool pool = new ClassPool(null);
- pool.appendClassPath(new LoaderClassPath(Thread.currentThread().getContextClassLoader()));
- pool.appendClassPath(new ClassClassPath(ClassPoolFactory.class));
- pool.appendSystemPath();
+ public static ClassPool getClassPool(ClassLoader classLoader) {
+ synchronized (CLASS_POOL_PER_CLASS_LOADER) {
+ ClassPool ret = CLASS_POOL_PER_CLASS_LOADER.get(classLoader);
+ if (ret == null) {
+ ret = classLoader == null ? new ClassPool() : new ClassLoaderBoundClassPool(classLoader);
+ initClassPool(ret);
+ CLASS_POOL_PER_CLASS_LOADER.put(classLoader, ret);
+ }
+
+ return ret;
+ }
+ }
+
+ /**
+ * Unlike the <code>ClassPool.getDefault()</code> method that only ever returns a single instance of the pool, this
+ * factory may return different instances depending on the context classloader of the current thread. The returned
+ * class pool is using the current thread context class loader to locate the classes but also is using the default
+ * resource lookup of the <code>Class</code> class, in addition to just the system class path as detected by
+ * Javassist (which is the only one used in the class pool returned by <code>ClassPool.getDefault()</code>).
+ *
+ * @return the class pool instance for the current context classloader
+ * @see #getClassPool(ClassLoader)
+ */
+ public static ClassPool getClassPoolForCurrentContextClassLoader() {
+ return getClassPool(Thread.currentThread().getContextClassLoader());
+ }
- return pool;
+ private static void initClassPool(ClassPool classPool) {
+ classPool.appendClassPath(new ClassClassPath(ClassPoolFactory.class));
+ classPool.appendSystemPath();
}
}
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
index d01ce14..9b0a85e 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
@@ -127,7 +127,7 @@ public class ConfigurationClassBuilder {
CtClass expectedReturn = translateConfiguration(cp, resultsConfigurationDefinition);
- if (expectedReturn.equals(ClassPoolFactory.newInstance().get(Configuration.class.getName()))) {
+ if (expectedReturn.equals(cp.get(Configuration.class.getName()))) {
return result;
} else {
//bail on translation if Configuration passed in is null
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java
index 640f8bf..5627cde 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java
@@ -142,7 +142,7 @@ public class InterfaceSimplifier {
public static Class<?> simplify(Class<?> intf) {
try {
- ClassPool classPool = ClassPoolFactory.newInstance();
+ ClassPool classPool = ClassPoolFactory.getClassPoolForCurrentContextClassLoader();
String simplifiedName = getSimplifiedName(intf);
LOG.debug("Simplifying " + intf + " (simplified interface name: " + simplifiedName + ")...");
1
0
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java | 2
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java | 2
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java | 89 ++++++++--
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java | 2
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java | 2
5 files changed, 80 insertions(+), 17 deletions(-)
New commits:
commit 1d605edf14fde97c3986fd376e5f41d7e6194bae
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Apr 3 14:28:57 2013 +0200
[BZ 928971] - Return the same class pool for the same context classloader
so that the class cache of the class pool is consistent with what has
been defined using given classloader. This should prevent the possible
linkage errors when trying to define a single class multiple times in the
same classloader which could have happened before this change.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
index 63c96f0..fd85128 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java
@@ -152,7 +152,7 @@ public class ResourceClientFactory {
private Class<?> defineCustomInterface(ResourceClientProxy proxy) {
try {
// define the dynamic class - do not put it in any known rhq package in case our jars are signed (see BZ-794503)
- ClassPool pool = ClassPoolFactory.newInstance();
+ ClassPool pool = ClassPoolFactory.getClassPoolForCurrentContextClassLoader();
CtClass customClass = pool.makeInterface("org.rhq.bindings.client.dynamic."
+ ResourceClientProxy.class.getSimpleName() + proxy.fingerprint);
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
index fc5e610..e1502c1 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java
@@ -412,7 +412,7 @@ public class ResourceClientProxy {
if (!LazyLoadScenario.isShouldLoad())
return null;
- ClassPool pool = ClassPoolFactory.newInstance();
+ ClassPool pool = ClassPoolFactory.getClassPoolForCurrentContextClassLoader();
Configuration parameters = ConfigurationClassBuilder.translateParametersToConfig(pool, definition
.getParametersConfigurationDefinition(), args);
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java
index 38397db..06211c5 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ClassPoolFactory.java
@@ -23,6 +23,9 @@
package org.rhq.bindings.util;
+import java.lang.ref.WeakReference;
+import java.util.WeakHashMap;
+
import javassist.ClassClassPath;
import javassist.ClassPool;
import javassist.LoaderClassPath;
@@ -31,12 +34,6 @@ import javassist.LoaderClassPath;
* This class is used to create Javassist's classpools usable in RHQ on both client and server side. This only exists to
* centralize the initialization code for the pools.
*
- * <p> Unlike the <code>ClassPool.getDefault()</code> method that only ever returns a single instance of the pool, this
- * factory returns a <b>new instance</b> every time. This is because it uses a "wider" class path, looking for classes
- * using the current thread context class loader but also using the default resource lookup of the <code>Class</code>
- * class, in addition to just the system class path as detected by Javassist (which is the only one used in the class
- * pool returned by <code>ClassPool.getDefault()</code>).
- *
* <p> This is to ensure that Javassist can locate the classes in various classloading "schemes" - the traditional
* application classloader used in the CLI client and the JBoss Modules classloading used on the server.
*
@@ -44,19 +41,85 @@ import javassist.LoaderClassPath;
*/
public class ClassPoolFactory {
+ /**
+ * A simple extension of a standard Javassist's class pool that makes sure that the classes are defined using a
+ * specified classloader.
+ *
+ * <p> The default implementation always defines a class in the current context classloader, which theoretically
+ * might not be the same as the classloader that we requested the class pool for in the {@link
+ * #getClassPoolForCurrentContextClassLoader()} method.
+ *
+ * <p>This class pool searches for classes using the provided class loader by default.
+ */
+ private static class ClassLoaderBoundClassPool extends ClassPool {
+
+ private WeakReference<ClassLoader> classLoader;
+
+ public ClassLoaderBoundClassPool(ClassLoader classLoader) {
+ this.classLoader = new WeakReference<ClassLoader>(classLoader);
+ this.insertClassPath(new LoaderClassPath(classLoader));
+ }
+
+ @Override
+ public ClassLoader getClassLoader() {
+ ClassLoader cl = classLoader.get();
+ if (cl == null) {
+ throw new IllegalStateException("The bound classloader has been garbage collected.");
+ }
+ return cl;
+ }
+ }
+
+ /**
+ * A cache of ClassPools, each for a classloader
+ */
+ private static final WeakHashMap<ClassLoader, ClassPool> CLASS_POOL_PER_CLASS_LOADER = new WeakHashMap<ClassLoader, ClassPool>();
+
private ClassPoolFactory() {
}
/**
- * @return the singleton class pool instance initialized according the {@link ClassPoolFactory rules}.
+ * Returns a class pool that uses the provided class loader as its source for the "class path". Each class loader
+ * will have exactly one class pool and the class pool will use the class loader to define the classes. This is to
+ * ensure that there exists a consistent correspondence between the classes cached by the class pool with the ones
+ * defined by the class loader and no linkage error can occur due to the possible attempts to define a single class
+ * multiple times using a single class loader.
+ *
+ * <p> If the provided class loader is null, a default instance is used.
+ *
+ * @param classLoader the class loader to return the class pool for
+ * @return
*/
- public static ClassPool newInstance() {
- ClassPool pool = new ClassPool(null);
- pool.appendClassPath(new LoaderClassPath(Thread.currentThread().getContextClassLoader()));
- pool.appendClassPath(new ClassClassPath(ClassPoolFactory.class));
- pool.appendSystemPath();
+ public static ClassPool getClassPool(ClassLoader classLoader) {
+ synchronized (CLASS_POOL_PER_CLASS_LOADER) {
+ ClassPool ret = CLASS_POOL_PER_CLASS_LOADER.get(classLoader);
+ if (ret == null) {
+ ret = classLoader == null ? new ClassPool() : new ClassLoaderBoundClassPool(classLoader);
+ initClassPool(ret);
+ CLASS_POOL_PER_CLASS_LOADER.put(classLoader, ret);
+ }
+
+ return ret;
+ }
+ }
+
+ /**
+ * Unlike the <code>ClassPool.getDefault()</code> method that only ever returns a single instance of the pool, this
+ * factory may return different instances depending on the context classloader of the current thread. The returned
+ * class pool is using the current thread context class loader to locate the classes but also is using the default
+ * resource lookup of the <code>Class</code> class, in addition to just the system class path as detected by
+ * Javassist (which is the only one used in the class pool returned by <code>ClassPool.getDefault()</code>).
+ *
+ * @return the class pool instance for the current context classloader
+ * @see #getClassPool(ClassLoader)
+ */
+ public static ClassPool getClassPoolForCurrentContextClassLoader() {
+ return getClassPool(Thread.currentThread().getContextClassLoader());
+ }
- return pool;
+ private static void initClassPool(ClassPool classPool) {
+ classPool.appendClassPath(new ClassClassPath(ClassPoolFactory.class));
+ classPool.appendSystemPath();
}
}
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
index d01ce14..9b0a85e 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
@@ -127,7 +127,7 @@ public class ConfigurationClassBuilder {
CtClass expectedReturn = translateConfiguration(cp, resultsConfigurationDefinition);
- if (expectedReturn.equals(ClassPoolFactory.newInstance().get(Configuration.class.getName()))) {
+ if (expectedReturn.equals(cp.get(Configuration.class.getName()))) {
return result;
} else {
//bail on translation if Configuration passed in is null
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java
index 640f8bf..5627cde 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java
@@ -142,7 +142,7 @@ public class InterfaceSimplifier {
public static Class<?> simplify(Class<?> intf) {
try {
- ClassPool classPool = ClassPoolFactory.newInstance();
+ ClassPool classPool = ClassPoolFactory.getClassPoolForCurrentContextClassLoader();
String simplifiedName = getSimplifiedName(intf);
LOG.debug("Simplifying " + intf + " (simplified interface name: " + simplifiedName + ")...");
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 41 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java | 299 ++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 57 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 363 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java | 1
modules/enterprise/gui/coregui/src/main/webapp/css/charts.css | 7
modules/enterprise/gui/coregui/src/main/webapp/js/d3.layout.min.js | 1
modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 4
15 files changed, 488 insertions(+), 373 deletions(-)
New commits:
commit 564f896a82a6fdc817d016e328323dbeb8f6e5e1
Merge: 0f7855d e190858
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Apr 2 23:14:34 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit e1908585971b08d84a8a3fd609e7d8e58af13805
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Apr 2 19:51:08 2013 -0700
[BZ 921022] - Small Width Dashboard charts. Create small dashboard charts with same 8 scale as full dashboard charts just truncated to 20 bars instead of 60.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
index 26ccfd21..992df3f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph;
+import com.google.gwt.user.client.Timer;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.TitleOrientation;
@@ -38,6 +39,8 @@ import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
@@ -47,27 +50,29 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricSt
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
+import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView implements CustomSettingsPortlet {
+public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceGroupMetricD3";
// A default displayed, persisted name for the portlet
- public static final String NAME = MSG.view_portlet_defaultName_groupMetric();
+ public static final String NAME = "d3-"+MSG.view_portlet_defaultName_groupMetric();
// set on initial configuration, the window for this portlet view.
private PortletWindow portletWindow;
+ private Timer refreshTimer;
public static final String CFG_RESOURCE_GROUP_ID = "resourceGroupId";
public static final String CFG_DEFINITION_ID = "definitionId";
public ResourceGroupD3GraphPortlet() {
- super(new MetricStackedBarGraph(new MetricGraphData()));
+ super(new MetricStackedBarGraph(MetricGraphData.createForDashboard()));
setOverflow(Overflow.HIDDEN);
}
@@ -76,6 +81,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
+ setMetricGraphData(MetricGraphData.createForDashboard());
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
@@ -122,11 +128,6 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
GroupCategory.COMPATIBLE, false);
resourceGroupSelector.setWidth(700);
resourceGroupSelector.setHeight(300);
- //TODO, would probaby be nice to find a way to seed assigned with the current group
- //ListGridRecord rec = new ListGridRecord();
- //rec.setAttribute("id", getEntityId());
- //rec.setAttribute("name", "current");
- //resourceGroupSelector.setAssigned(new ListGridRecord[] { rec });
final SelectItem metric = new SortedSelectItem(CFG_DEFINITION_ID, MSG.common_title_metric()) {
@Override
@@ -203,13 +204,35 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
drawGraph();
}
}
+ public void startRefreshCycle() {
+ refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer);
+ }
+
+ @Override
+ protected void onDestroy() {
+ AutoRefreshPortletUtil.onDestroy(this, refreshTimer);
+
+ super.onDestroy();
+ }
+
+ public boolean isRefreshing() {
+ return false;
+ }
+
+ //Custom refresh operation as we are not directly extending Table
+ @Override
+ public void refresh() {
+ if (isVisible() && !isRefreshing()) {
+ redraw();
+ }
+ }
public static final class Factory implements PortletViewFactory {
public static PortletViewFactory INSTANCE = new Factory();
public final Portlet getInstance(EntityContext context) {
- return new ResourceGroupGraphPortlet();
+ return new ResourceGroupD3GraphPortlet();
}
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
index 68bc34b..84c5c54 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
@@ -61,6 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
@@ -84,17 +85,19 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
public ResourceD3GraphPortlet() {
super();
setOverflow(Overflow.HIDDEN);
- setGraph(new MetricStackedBarGraph(new MetricGraphData()));
}
@Override
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
- Log.debug("\nResourceD3GraphPortlet Configure");
+ Log.debug("ResourceD3GraphPortlet Configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
+
+ setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard()));
+
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
@@ -154,7 +157,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
getJsniChart().setEntityName(resource.getName());
getJsniChart().setDefinition(def);
final long startTime = System.currentTimeMillis();
- //
+
GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(
resource.getId(), new int[] { def.getId() }, 8, MeasurementUtils.UNIT_HOURS,
60, new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
index eedbd30..251f5f9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
@@ -166,14 +166,6 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
graph.setMetricGraphData(metricGraphData);
}
- protected boolean supportsLiveGraphViewDialog() {
- return false;
- }
-
- protected void displayLiveGraphViewDialog() {
- return;
- }
-
@Override
public void destroy() {
super.destroy();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
index 84655ef..125a740 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
@@ -19,6 +19,8 @@
package org.rhq.enterprise.gui.coregui.client.inventory.common.charttype;
+import com.smartgwt.client.widgets.layout.VLayout;
+
import org.rhq.core.domain.measurement.MeasurementDefinition;
/**
@@ -31,7 +33,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition;
*
* @author Mike Thompson
*/
-public abstract class AbstractGraph implements HasD3MetricJsniChart {
+public abstract class AbstractGraph extends VLayout implements HasD3MetricJsniChart {
private MetricGraphData metricGraphData;
@@ -147,6 +149,10 @@ public abstract class AbstractGraph implements HasD3MetricJsniChart {
public String getChartTitle() {
return metricGraphData != null ? metricGraphData.getChartTitle() : "";
}
+ public boolean isPortalGraph(){
+ return metricGraphData.isPortalGraph();
+ }
+
public String getYAxisUnits() {
return metricGraphData.getYAxisUnits();
@@ -160,5 +166,9 @@ public abstract class AbstractGraph implements HasD3MetricJsniChart {
return metricGraphData.getJsonMetrics();
}
+ public Integer getWindowWidth() {
+ return metricGraphData.getWindowWidth();
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
index 969ba0f..b15edee 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
@@ -106,11 +106,9 @@ public class AvailabilityLineGraphType {
* The magic JSNI to draw the charts with d3.
*/
public native void drawJsniChart() /*-{
+ console.log("Draw Availability chart");
- console.groupCollapsed("AvailabilityChart");
- console.time("availabilityChart");
var global = this,
-
// tidy up all of our interactions with java (via JSNI) thru AvailChartContext class
// NOTE: rhq.js has the javascript object constructors in it.
availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartId()(),
@@ -126,129 +124,146 @@ public class AvailabilityLineGraphType {
);
- function draw(availChartContext) {
+ var availabilityGraph = function () {
"use strict";
+ // privates
var margin = {top: 5, right: 5, bottom: 5, left: 40},
- width = 750 - margin.left - margin.right,
+ barOffset = 10,
+ width = 750 - margin.left - margin.right + barOffset,
height = 20 - margin.top - margin.bottom,
pixelsOffHeight = 0,
- UP = 4, DOWN = 3, UNKNOWN = 2, DISABLED = 1, WARN = 0,
- xAxisMin = $wnd.d3.min(availChartContext.data, function (d) {
- return +d.availStart;
- }),
- xAxisMax = $wnd.d3.max(availChartContext.data, function (d) {
- return +d.availEnd;
- }),
-
- timeScale = $wnd.d3.time.scale()
- .range([0, width])
- .domain([xAxisMin, xAxisMax]),
-
- yScale = $wnd.d3.scale.linear()
- .clamp(true)
- .rangeRound([height, 0])
- .domain([0, 4]),
-
- svg = $wnd.d3.select(availChartContext.chartSelection).append("g")
- .attr("width", width + margin.left + margin.right)
- .attr("height", height + margin.top + margin.bottom)
- .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-
-
- // The gray bars at the bottom leading up
- svg.selectAll("rect.availBars")
- .data(availChartContext.data)
- .enter().append("rect")
- .attr("class", "availBars")
- .attr("x", function (d) {
- return timeScale(+d.availStart);
- })
- .attr("y", function (d) {
- return yScale(0);
- })
- .attr("height", function (d) {
- return height - yScale(4) - pixelsOffHeight;
- })
- .attr("width", function (d) {
- return timeScale(+d.availEnd) - timeScale(+d.availStart);
- })
-
- .attr("opacity", ".9")
- .attr("fill", function (d) {
- if (d.availType === 'DOWN') {
- return "#FF1919"; // red
- }
- else if (d.availType === 'DISABLED') {
- return "#FF9933"; // orange
- }
- else if (d.availType === 'UNKNOWN') {
- return "#CCC"; // gray
- }
- else if (d.availType === 'UP') {
- return "#198C19"; // green
- }
- else if (d.availType === 'WARN') {
- return "#FFFF00"; // yellow
- }
- else if (d.availType === 'EMPTY') {
- return "#CCC"; // gray
- }
- else {
- // should not ever happen, but...
- console.warn("AvailabilityType not valid.");
- return "#000"; //black
- }
- });
-
- createHovers();
+ svg;
+
+
+ function drawBars(availChartContext) {
+ var xAxisMin = $wnd.d3.min(availChartContext.data, function (d) {
+ return +d.availStart;
+ }),
+ xAxisMax = $wnd.d3.max(availChartContext.data, function (d) {
+ return +d.availEnd;
+ }),
+
+ timeScale = $wnd.d3.time.scale()
+ .range([0, width])
+ .domain([xAxisMin, xAxisMax]),
+
+ yScale = $wnd.d3.scale.linear()
+ .clamp(true)
+ .rangeRound([height, 0])
+ .domain([0, 4]),
+
+ svg = $wnd.d3.select(availChartContext.chartSelection).append("g")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top + margin.bottom)
+ .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+
+ // The gray bars at the bottom leading up
+ svg.selectAll("rect.availBars")
+ .data(availChartContext.data)
+ .enter().append("rect")
+ .attr("class", "availBars")
+ .attr("x", function (d) {
+ return timeScale(+d.availStart);
+ })
+ .attr("y", function (d) {
+ return yScale(0);
+ })
+ .attr("height", function (d) {
+ return height - yScale(4) - pixelsOffHeight;
+ })
+ .attr("width", function (d) {
+ return timeScale(+d.availEnd) - timeScale(+d.availStart);
+ })
+
+ .attr("opacity", ".9")
+ .attr("fill", function (d) {
+ if (d.availType === 'DOWN') {
+ return "#FF1919"; // red
+ }
+ else if (d.availType === 'DISABLED') {
+ return "#FF9933"; // orange
+ }
+ else if (d.availType === 'UNKNOWN') {
+ return "#CCC"; // gray
+ }
+ else if (d.availType === 'UP') {
+ return "#198C19"; // green
+ }
+ else if (d.availType === 'WARN') {
+ return "#FFFF00"; // yellow
+ }
+ else if (d.availType === 'EMPTY') {
+ return "#CCC"; // gray
+ }
+ else {
+ // should not ever happen, but...
+ console.warn("AvailabilityType not valid.");
+ return "#000"; //black
+ }
+ });
+ }
- }
+ function createHovers() {
+ $wnd.jQuery('svg rect.availBars').tipsy({
+ gravity: 'n',
+ html: true,
+ trigger: 'hover',
+ title: function () {
+ var d = this.__data__;
+ return formatHovers(d);
+ },
+ show: function (e, el) {
+ el.css({ 'z-index': '990000'})
+ }
+ });
+ }
+
+ function formatHovers(d) {
+ var hoverString,
+ timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat),
+ dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat),
+ availType = d.availType,
+ availStart = new Date(+d.availStart),
+ availEnd = new Date(+d.availEnd),
+ availDuration = d.availDuration;
+
+ hoverString =
+ '<div class="chartHoverEnclosingDiv">' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' +
+ '</div>';
+ return hoverString;
- function createHovers() {
- $wnd.jQuery('svg rect.availBars').tipsy({
- gravity: 'n',
- html: true,
- trigger: 'hover',
- title: function () {
- var d = this.__data__;
- return formatHovers(d);
- },
- show: function (e, el) {
- el.css({ 'z-index': '990000'})
+ }
+
+ return {
+ // Public API
+ draw: function (chartContext) {
+ "use strict";
+ console.groupCollapsed("AvailabilityChart");
+ console.time("availabilityChart");
+
+ drawBars(availChartContext);
+ createHovers();
+ console.timeEnd("availabilityChart");
+ console.groupEnd("AvailabilityChart");
}
- });
- }
+ }; // end public closure
- function formatHovers(d) {
- var hoverString,
- timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat),
- dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat),
- availType = d.availType,
- availStart = new Date(+d.availStart),
- availEnd = new Date(+d.availEnd),
- availDuration = d.availDuration;
-
- hoverString =
- '<div class="chartHoverEnclosingDiv">' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' +
- '</div>';
- return hoverString;
- }
+ }();
- if (availChartContext.data.length > 0) {
- draw(availChartContext);
+ if (availChartContext.data !== undefined && availChartContext.data.length > 0) {
+ availabilityGraph.draw(availChartContext);
}
- console.timeEnd("availabilityChart");
- console.groupEnd("AvailabilityChart");
- }-*/;
+ }-*/;
public String getChartId() {
return String.valueOf(entityId);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index 487d20c..b9222d0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -69,9 +69,19 @@ public class MetricGraphData implements JsonMetricProducer {
private PageList<MeasurementOOBComposite> measurementOOBCompositeList;
private MeasurementOOBComposite lastOOB;
private Integer chartHeight;
+ private Boolean isPortalGraph;
+ /**
+ * WindowWidth is used in determining what size graph to display in the dashboard portlets.
+ */
+ private Integer windowWidth;
- public MetricGraphData() {
+ private MetricGraphData() {
+ isPortalGraph = true;
+
+ }
+ public static MetricGraphData createForDashboard(){
+ return new MetricGraphData();
}
/**
@@ -81,23 +91,45 @@ public class MetricGraphData implements JsonMetricProducer {
* @param def
* @param metricData
*/
- public MetricGraphData(int entityId, String entityName, MeasurementDefinition def,
- List<MeasurementDataNumericHighLowComposite> metricData) {
+ private MetricGraphData(int entityId, String entityName, MeasurementDefinition def,
+ List<MeasurementDataNumericHighLowComposite> metricData, Integer windowWidth) {
this.entityName = entityName;
setEntityId(entityId);
setDefinitionId(def.getId());
this.definition = def;
this.metricData = metricData;
+ this.windowWidth = windowWidth;
+ this.isPortalGraph = false;
}
- public MetricGraphData(int entityId, String entityName, MeasurementDefinition measurementDef,
- List<MeasurementDataNumericHighLowComposite> metrics, PageList<MeasurementOOBComposite> measurementOOBCompositeList) {
+ public static MetricGraphData createForResourceGroup(int groupId, String groupName, MeasurementDefinition def,
+ List<MeasurementDataNumericHighLowComposite> metricData,
+ Integer windowWidth){
+ return new MetricGraphData(groupId,groupName,def, metricData, windowWidth);
+ }
+
+ private MetricGraphData(int entityId, String entityName, MeasurementDefinition measurementDef,
+ List<MeasurementDataNumericHighLowComposite> metrics,
+ PageList<MeasurementOOBComposite> measurementOOBCompositeList, Integer windowWidth) {
this.entityName = entityName;
setEntityId(entityId);
setDefinitionId(measurementDef.getId());
this.definition = measurementDef;
this.metricData = metrics;
this.measurementOOBCompositeList = measurementOOBCompositeList;
+ this.windowWidth = windowWidth;
+ this.isPortalGraph = false;
+ }
+
+ public static MetricGraphData createForResource(int resourceId, String resourceName, MeasurementDefinition measurementDef,
+ List<MeasurementDataNumericHighLowComposite> metrics,
+ PageList<MeasurementOOBComposite> measurementOOBCompositeList,
+ Integer windowWidth){
+ return new MetricGraphData(resourceId, resourceName,measurementDef, metrics, measurementOOBCompositeList, windowWidth);
+ }
+
+ public Integer getWindowWidth() {
+ return windowWidth;
}
public int getEntityId() {
@@ -133,7 +165,7 @@ public class MetricGraphData implements JsonMetricProducer {
}
public String getChartId() {
- return entityId + "-" + definitionId;
+ return entityId + "-" + definitionId;
}
@@ -211,6 +243,10 @@ public class MetricGraphData implements JsonMetricProducer {
this.chartHeight = chartHeight;
}
+ public Boolean isPortalGraph() {
+ return isPortalGraph;
+ }
+
public String getChartTitle() {
return (entityName == null) ? definition.getDisplayName() : entityName + " - "+definition.getDisplayName();
@@ -371,6 +407,8 @@ public class MetricGraphData implements JsonMetricProducer {
return returnValue;
}
+
+
/**
* If there is more than 2 days time window then return true so we can show day of week
* in axis labels. Function to switch the timescale to whichever is more appropriate hours
@@ -400,12 +438,13 @@ public class MetricGraphData implements JsonMetricProducer {
sb.append(", chartHoverEndLabel='").append(chartHoverEndLabel).append('\'');
sb.append(", chartHoverPeriodLabel='").append(chartHoverPeriodLabel).append('\'');
sb.append(", chartHoverBarLabel='").append(chartHoverBarLabel).append('\'');
+ sb.append(", chartHoverTimeFormat='").append(chartHoverTimeFormat).append('\'');
+ sb.append(", chartHoverDateFormat='").append(chartHoverDateFormat).append('\'');
sb.append(", entityId=").append(entityId);
sb.append(", entityName='").append(entityName).append('\'');
sb.append(", definitionId=").append(definitionId);
- sb.append(", adjustedMeasurementUnits=").append(adjustedMeasurementUnits);
- sb.append(", definition=").append(definition);
- sb.append(", chartHeight=").append(chartHeight);
+ sb.append(", isPortalGraph=").append(isPortalGraph);
+ sb.append(", windowWidth=").append(windowWidth);
sb.append('}');
return sb.toString();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 4154262..33e1279 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -46,27 +46,29 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// create a chartContext object (from rhq.js) with the data required to render to a chart
// this same data could be passed to different chart types
// This way, we are decoupled from the dependency on globals and JSNI and kept all the java interaction right here.
- chartContext = new $wnd.ChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartId()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHeight()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getJsonMetrics()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getXAxisTitle()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitle()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getYAxisUnits()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleMinLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleAvgLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitlePeakLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartDateLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTimeLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartDownLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartUnknownLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartNoDataLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverStartLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverEndLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverPeriodLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverBarLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverTimeFormat()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverDateFormat()()
- );
+ chartContext = new $wnd.ChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartId()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHeight()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getJsonMetrics()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getXAxisTitle()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitle()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getYAxisUnits()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleMinLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleAvgLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitlePeakLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartDateLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTimeLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartDownLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartUnknownLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartNoDataLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverStartLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverEndLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverPeriodLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverBarLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverTimeFormat()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverDateFormat()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::isPortalGraph()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getWindowWidth()()
+ );
// Define the Stacked Bar Graph function using the module pattern
@@ -78,79 +80,136 @@ public final class MetricStackedBarGraph extends AbstractGraph {
width = 750 - margin.left - margin.right,
adjustedChartHeight = chartContext.chartHeight - 50,
height = adjustedChartHeight - margin.top - margin.bottom,
+ smallChartThresholdInPixels = 600,
titleHeight = 30, titleSpace = 10,
barOffset = 2,
+ chartData,
interpolation = "basis",
- avg = $wnd.d3.mean(chartContext.data.map(function (d) {
- return d.y;
- })),
- peak = $wnd.d3.max(chartContext.data.map(function (d) {
- if(d.high != undefined){
- return d.high;
- }else {
- return 0;
- }
- })),
- min = $wnd.d3.min(chartContext.data.map(function (d) {
- if(d.low != undefined){
- return d.low;
- } else {
- return Number.MAX_VALUE;
- }
- })),
- timeScale = $wnd.d3.time.scale()
- .range([0, width])
- .domain($wnd.d3.extent(chartContext.data, function (d) {
- return d.x;
- })),
-
- // adjust the min scale so blue low line is not in axis
- determineLowBound = function (min, peak) {
- var newLow = min - ((peak - min) * 0.1);
- if (newLow < 0) {
- return 0;
- }
- else {
- return newLow;
- }
- },
- lowBound = determineLowBound(min, peak),
- highBound = peak + ((peak - min) * 0.1),
- calcBarWidth = function(){
- return (width / chartContext.data.length - barOffset )
- },
-
- yScale = $wnd.d3.scale.linear()
- .clamp(true)
- .rangeRound([height, 0])
- .domain([lowBound, highBound]),
+ avg, min, peak,
+ oobMax,
+ determineLowBound,
+ lowBound,
+ highBound,
+ calcBarWidth,
+ yScale,
+ yAxis,
+ timeScale,
+ xAxis,
+ chart,
+ svg;
+
+ function getChartWidth() {
+ return $wnd.jQuery(chartContext.chartSelection).width();
+ }
- xAxis = $wnd.d3.svg.axis()
- .scale(timeScale)
- .ticks(12)
- .tickSubdivide(5)
- .tickSize(4, 4, 0)
- .orient("bottom"),
+ function useSmallCharts() {
+ return getChartWidth() <= smallChartThresholdInPixels;
+ }
- yAxis = $wnd.d3.svg.axis()
- .scale(yScale)
- .tickSubdivide(1)
- .ticks(5)
- .tickSize(4, 4, 0)
- .orient("left"),
+ function determineScale() {
+ var xTicks, xTickSubDivide, numberOfBarsForSmallGraph = 20;
+ // if window is too small server up small chart
+ if (useSmallCharts()) {
+ console.info("Using Small Charts Profile");
+ width = 250;
+ xTicks = 3;
+ xTickSubDivide = 2;
+ chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1);
+ }
+ else {
+ console.info("Using Large Charts Profile");
+ // we use the width already defined above
+ xTicks = 12;
+ xTickSubDivide = 5;
+ chartData = chartContext.data;
+ }
- // create the actual chart group
- chart = $wnd.d3.select(chartContext.chartSelection),
+ avg = $wnd.d3.mean(chartContext.data.map(function (d) {
+ return d.y;
+ }));
+ peak = $wnd.d3.max(chartContext.data.map(function (d) {
+ if (d.high != undefined) {
+ return d.high;
+ }
+ else {
+ return 0;
+ }
+ }));
+ min = $wnd.d3.min(chartContext.data.map(function (d) {
+ if (d.low != undefined) {
+ return d.low;
+ }
+ else {
+ return Number.MAX_VALUE;
+ }
+ }));
+ // adjust the min scale so blue low line is not in axis
+ determineLowBound = function (min, peak) {
+ var newLow = min - ((peak - min) * 0.1);
+ if (newLow < 0) {
+ return 0;
+ }
+ else {
+ return newLow;
+ }
+ };
+ lowBound = determineLowBound(min, peak);
+ highBound = peak + ((peak - min) * 0.1);
+ oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
+ if (d.baselineMax == undefined) {
+ return 0;
+ }
+ else {
+ return +d.baselineMax;
+ }
+ }));
+ calcBarWidth = function () {
+ return (width / chartData.length - barOffset )
+ };
+
+ yScale = $wnd.d3.scale.linear()
+ .clamp(true)
+ .rangeRound([height, 0])
+ .domain([lowBound, highBound]);
+ yAxis = $wnd.d3.svg.axis()
+ .scale(yScale)
+ .tickSubdivide(1)
+ .ticks(5)
+ .tickSize(4, 4, 0)
+ .orient("left");
+
+
+ timeScale = $wnd.d3.time.scale()
+ .range([0, width])
+ .domain($wnd.d3.extent(chartData, function (d) {
+ return d.x;
+ }));
+
+ xAxis = $wnd.d3.svg.axis()
+ .scale(timeScale)
+ .ticks(xTicks)
+ .tickSubdivide(xTickSubDivide)
+ .tickSize(4, 4, 0)
+ .orient("bottom");
+
+ // create the actual chart group
+ chart = $wnd.d3.select(chartContext.chartSelection);
+
+ svg = chart.append("g")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom)
+ .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")");
+
+ if (!useSmallCharts()) {
+ createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits);
+ }
- svg = chart.append("g")
- .attr("width", width + margin.left + margin.right)
- .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom)
- .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")");
+ }
- function createMinAvgPeakSidePanel( minLabel, minValue, avgLabel, avgValue, highLabel, highValue, uom ){
- var xLabel = 772,
+ function createMinAvgPeakSidePanel(minLabel, minValue, avgLabel, avgValue, highLabel, highValue, uom) {
+ var xLabel = 772,
xValue = 820,
yBase = 100,
yInc = 25,
@@ -159,7 +218,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// title/header
chart.append("g").append("rect")
.attr("class", "rightSidePanel")
- .attr("x", xLabel -10)
+ .attr("x", xLabel - 10)
.attr("y", margin.top + 60)
.attr("height", 100)
.attr("width", 135)
@@ -177,7 +236,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("class", "highText")
.attr("x", xValue)
.attr("y", yBase)
- .text(highValue.toFixed(decimalPlaces) + " "+ uom);
+ .text(highValue.toFixed(decimalPlaces) + " " + uom);
//avg
@@ -191,8 +250,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("class", "avgText")
.attr("x", xValue)
.attr("y", yBase + yInc)
- .text(avgValue.toFixed(decimalPlaces) + " "+uom);
-
+ .text(avgValue.toFixed(decimalPlaces) + " " + uom);
// min
@@ -206,13 +264,13 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("class", "minText")
.attr("x", xValue)
.attr("y", yBase + 2 * yInc)
- .text(minValue.toFixed(decimalPlaces)+ " "+uom);
+ .text(minValue.toFixed(decimalPlaces) + " " + uom);
}
- function createHeader(titleName ){
- var title = chart.append("g").append("rect")
+ function createHeader(titleName) {
+ var title = chart.append("g").append("rect")
.attr("class", "title")
.attr("x", 10)
.attr("y", margin.top)
@@ -241,7 +299,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// The gray bars at the bottom leading up
svg.selectAll("rect.leaderBar")
- .data(chartContext.data)
+ .data(chartData)
.enter().append("rect")
.attr("class", "leaderBar")
.attr("x", function (d) {
@@ -280,7 +338,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// upper portion representing avg to high
svg.selectAll("rect.high")
- .data(chartContext.data)
+ .data(chartData)
.enter().append("rect")
.attr("class", "high")
.attr("x", function (d) {
@@ -300,7 +358,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("width", function () {
return calcBarWidth();
})
- .attr("data-rhq-value", function(d){
+ .attr("data-rhq-value", function (d) {
return d.y;
})
.attr("opacity", 0.9);
@@ -308,7 +366,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// lower portion representing avg to low
svg.selectAll("rect.low")
- .data(chartContext.data)
+ .data(chartData)
.enter().append("rect")
.attr("class", "low")
.attr("x", function (d) {
@@ -332,23 +390,24 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// if high == low put a "cap" on the bar to show non-aggregated bar
svg.selectAll("rect.singleValue")
- .data(chartContext.data)
+ .data(chartData)
.enter().append("rect")
.attr("class", "singleValue")
.attr("x", function (d) {
return timeScale(d.x);
})
.attr("y", function (d) {
- return isNaN(d.y) ? height : yScale(d.y)-2;
+ return isNaN(d.y) ? height : yScale(d.y) - 2;
})
.attr("height", function (d) {
if (d.down || d.unknown || d.nodata) {
return height - yScale(lowBound);
}
else {
- if(d.low === d.high ){
- return yScale(d.low) - yScale(d.y) +2;
- }else {
+ if (d.low === d.high) {
+ return yScale(d.low) - yScale(d.y) + 2;
+ }
+ else {
return yScale(d.low) - yScale(d.y);
}
}
@@ -358,11 +417,12 @@ public final class MetricStackedBarGraph extends AbstractGraph {
})
.attr("opacity", 0.9)
.attr("fill", function (d) {
- if(d.low === d.high ){
- return "#50505a";
- }else {
- return "#70c4e2";
- }
+ if (d.low === d.high) {
+ return "#50505a";
+ }
+ else {
+ return "#70c4e2";
+ }
});
console.timeEnd("stackedBars");
}
@@ -406,26 +466,27 @@ public final class MetricStackedBarGraph extends AbstractGraph {
function createAvgLines() {
console.time("drawAvgLine");
var showBarAvgTrendline =
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::showBarAvgTrendLine()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::showBarAvgTrendLine()(),
barAvgLine = $wnd.d3.svg.line()
.interpolate("linear")
- .defined(function(d){
- return !d.nodata ;
+ .defined(function (d) {
+ return !d.nodata;
})
.x(function (d) {
- return timeScale(d.x)+ ((width / chartContext.data.length - barOffset)/ 2);
+ return timeScale(d.x) + (calcBarWidth() / 2);
})
.y(function (d) {
- if(showBarAvgTrendline){
+ if (showBarAvgTrendline) {
return yScale(d.y);
- }else {
+ }
+ else {
return yScale(0);
}
});
// Bar avg line
svg.append("path")
- .datum(chartContext.data)
+ .datum(chartData)
.attr("class", "barAvgLine")
.attr("fill", "none")
.attr("stroke", "#2e376a")
@@ -436,28 +497,28 @@ public final class MetricStackedBarGraph extends AbstractGraph {
console.timeEnd("drawAvgLine");
}
- function createOOBLines(){
+ function createOOBLines() {
- var minBaselineLine = $wnd.d3.svg.line()
- .interpolate(interpolation)
- .x(function (d) {
- return timeScale(d.x);
- })
- .y(function (d) {
- return yScale(d.baselineMin);
- }),
- maxBaselineLine = $wnd.d3.svg.line()
- .interpolate(interpolation)
- .x(function (d) {
- return timeScale(d.x);
- })
- .y(function (d) {
- return yScale(d.baselineMax);
- });
+ var minBaselineLine = $wnd.d3.svg.line()
+ .interpolate(interpolation)
+ .x(function (d) {
+ return timeScale(d.x);
+ })
+ .y(function (d) {
+ return yScale(d.baselineMin);
+ }),
+ maxBaselineLine = $wnd.d3.svg.line()
+ .interpolate(interpolation)
+ .x(function (d) {
+ return timeScale(d.x);
+ })
+ .y(function (d) {
+ return yScale(d.baselineMax);
+ });
// min baseline Line
svg.append("path")
- .datum(chartContext.data)
+ .datum(chartData)
.attr("class", "minBaselineLine")
.attr("fill", "none")
.attr("stroke", "purple")
@@ -468,7 +529,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// max baseline Line
svg.append("path")
- .datum(chartContext.data)
+ .datum(chartData)
.attr("class", "maxBaselineLine")
.attr("fill", "none")
.attr("stroke", "orange")
@@ -486,19 +547,19 @@ public final class MetricStackedBarGraph extends AbstractGraph {
barDuration = d.barDuration,
timeFormatter = $wnd.d3.time.format(chartContext.chartHoverTimeFormat),
dateFormatter = $wnd.d3.time.format(chartContext.chartHoverDateFormat),
- highValue = d.high.toFixed(2),
- lowValue = d.low.toFixed(2),
- avgValue = d.y.toFixed(2);
+ highValue = d.high.toFixed(2),
+ lowValue = d.low.toFixed(2),
+ avgValue = d.y.toFixed(2);
// our special condition to indicate no data because avg lines dont like discontinuous data
- if (d.y === 0 && d.high === 0 && d.low === 0 ) {
+ if (d.y === 0 && d.high === 0 && d.low === 0) {
// no data
hoverString =
'<div class="chartHoverEnclosingDiv"><span class="chartHoverTimeLabel" >' + chartContext.timeLabel + ': </span>' + timeFormatter(date) +
'<div class="chartHoverAlignLeft"><span class="chartHoverDateLabel">' + chartContext.dateLabel + ': </span>' + dateFormatter(date) + '</div>' +
'<hr class="chartHoverDivider" ></hr>' +
- '<div class="chartHoverAlignRight"><span class="chartHoverLabelSpan">'+chartContext.noDataLabel+'</span></div>' +
+ '<div class="chartHoverAlignRight"><span class="chartHoverLabelSpan">' + chartContext.noDataLabel + '</span></div>' +
'</div>';
@@ -508,7 +569,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
hoverString =
'<div class="chartHoverEnclosingDiv"><span class="chartHoverTimeLabel">' + chartContext.timeLabel + ': </span><span style="width:50px;">' + timeFormatter(date) + '</span>' +
'<div class="chartHoverAlignLeft"><span class="chartHoverDateLabel">' + chartContext.dateLabel + ': </span><span style="width:50px;">' + dateFormatter(date) + '</span></div>' +
- '<div class="chartHoverAlignLeft"><span class="chartHoverLabelSpan">'+chartContext.hoverBarLabel+": "+ barDuration + '</span></div>' +
+ '<div class="chartHoverAlignLeft"><span class="chartHoverLabelSpan">' + chartContext.hoverBarLabel + ": " + barDuration + '</span></div>' +
'<hr class="chartHoverDivider"></hr>' +
'<div class="chartHoverAlignRight"><span id="chartHoverPeakValue" >' + chartContext.peakChartTitle + ': </span><span style="width:50px;">' + highValue + '</span></div>' +
'<div class="chartHoverAlignRight"><span id="chartHoverAvgValue" >' + chartContext.avgChartTitle + ': </span><span style="width:50px;">' + avgValue + '</span></div>' +
@@ -520,7 +581,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
function createHovers(chartContext) {
- //console.log("Create Hovers");
$wnd.jQuery('svg rect.leaderBar, svg rect.high, svg rect.low, svg rect.singleValue').tipsy({
gravity: 'w',
html: true,
@@ -529,9 +589,8 @@ public final class MetricStackedBarGraph extends AbstractGraph {
var d = this.__data__;
return formatHovers(chartContext, d);
},
- show: function (e, el)
- {
- el.css({ 'z-index':'990000'})
+ show: function (e, el) {
+ el.css({ 'z-index': '990000'})
}
});
}
@@ -540,25 +599,18 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// Public API
draw: function (chartContext) {
"use strict";
- console.group("Creating Chart: %s --> %s",chartContext.chartSelection, chartContext.chartTitle);
+ console.group("Creating Chart: %s --> %s", chartContext.chartSelection, chartContext.chartTitle);
console.time("chart");
- //console.log("Json Data:\n"+chartContext.data);
- var oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
- if(d.baselineMax == undefined){
- return 0;
- } else {
- return +d.baselineMax;
- }
- }));
+ determineScale();
createHeader(chartContext.chartTitle);
- createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits );
+
createYAxisGridLines();
createStackedBars();
createXandYAxes();
createAvgLines();
- if(oobMax > 0){
- console.info("Has OOB Data!");
+ if (oobMax > 0) {
+ console.info("OOB Data Exists!");
createOOBLines();
}
createHovers(chartContext);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
index 47b9c5d..d49b533 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
@@ -182,8 +182,8 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView {
private void buildIndividualGraph(MeasurementDefinition measurementDefinition,
List<MeasurementDataNumericHighLowComposite> data) {
- MetricGraphData metricGraphData = new MetricGraphData(resourceGroup.getId(), resourceGroup.getName(),
- measurementDefinition, data);
+ MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(),
+ resourceGroup.getName(), measurementDefinition, data, getWidth());
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
index fc082b8..815aeed 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
@@ -126,9 +126,6 @@ public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView {
graph.drawJsniChart();
}
- @Override
- protected boolean supportsLiveGraphViewDialog() {
- return false;
- }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
index 38c394a..2b6a2f2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
@@ -64,6 +64,8 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch;
public class D3GraphListView extends AbstractD3GraphListView {
private static int NUM_ASYNC_CALLS = 2; // wait for X async calls in Latch
+ private static int SINGLE_CHART_HEIGHT = 225;
+ private static int MULTI_CHART_HEIGHT = 195;
private Resource resource;
private Set<Integer> definitionIds = null;
@@ -339,7 +341,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
for (MeasurementDefinition measurementDefinition : measurementDefinitions) {
if (summaryIds.contains(measurementDefinition.getId())) {
buildSingleGraph(measurementOOBCompositeList, measurementDefinition,
- measurementData.get(i), 225);
+ measurementData.get(i), MULTI_CHART_HEIGHT);
}
i++;
}
@@ -358,11 +360,11 @@ public class D3GraphListView extends AbstractD3GraphListView {
if (null != selectedDefinitionId) {
// single graph case
if (measurementId == selectedDefinitionId) {
- buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, 225);
+ buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, SINGLE_CHART_HEIGHT);
}
} else {
// multiple graph case
- buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, 225);
+ buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, MULTI_CHART_HEIGHT);
}
}
i++;
@@ -375,8 +377,8 @@ public class D3GraphListView extends AbstractD3GraphListView {
private void buildSingleGraph(PageList<MeasurementOOBComposite> measurementOOBCompositeList,
MeasurementDefinition measurementDefinition, List<MeasurementDataNumericHighLowComposite> data, int height) {
- MetricGraphData metricGraphData = new MetricGraphData(resource.getId(), resource.getName(),
- measurementDefinition, data, measurementOOBCompositeList);
+ MetricGraphData metricGraphData = MetricGraphData.createForResource(resource.getId(), resource.getName(),
+ measurementDefinition, data, measurementOOBCompositeList, getWidth());
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
index b56f907..036237b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
@@ -23,7 +23,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.Abstract
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
/**
- * A D3 graph implementation for graphing metrics.
+ * A D3 graph implementation for graphing Resource metrics.
*/
public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
@@ -40,10 +40,7 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
super(graph);
}
- @Override
- protected boolean supportsLiveGraphViewDialog() {
- return true;
- }
+
@Override
/**
@@ -58,8 +55,5 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
return graph;
}
- @Override
- protected void displayLiveGraphViewDialog() {
- LiveGraphD3View.displayAsDialog(graph.getEntityId(), graph.getDefinition());
- }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java
index b7c0d05..fbbdc9d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java
@@ -51,4 +51,5 @@ public class BrowserUtility {
}
return false;
}-*/;
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
index 5156136..f863ab0 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
@@ -9,7 +9,7 @@
* A ChartContext can be passed to multiple chart renders to display different chart types
* of that data.
*/
-var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat)
+var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, windowWidth )
{
"use strict";
if(!(this instanceof ChartContext)){
@@ -37,6 +37,8 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, char
this.hoverBarLabel = hoverBarLabel;
this.chartHoverTimeFormat = chartHoverTimeFormat;
this.chartHoverDateFormat = chartHoverDateFormat;
+ this.isPortalGraph = isPortalGraph;
+ this.windowWidth = windowWidth;
},
AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverEndLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat) {
commit a2a52b67443775c534d40781cfd62c47e2849049
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed Mar 20 15:45:31 2013 -0700
[BZ 921022] - Small Width Dashboard charts overflow.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
index 4b54ae9..68bc34b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
@@ -89,7 +89,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
@Override
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
- Log.debug("\nResourceD3GraphPortlet Configure !!");
+ Log.debug("\nResourceD3GraphPortlet Configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
@@ -272,7 +272,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
@Override
public void redraw() {
- Log.debug("Redraw Portlet Graph and set data");
+ Log.debug("Redraw Portlet Graph and set data, width: "+portletWindow.getWidth());
DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
PropertySimple simple = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_ID);
@@ -284,7 +284,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
graph.getMetricGraphData().setEntityId(simple.getIntegerValue());
PropertySimple simpleDefId = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
graph.getMetricGraphData().setDefinitionId(simpleDefId.getIntegerValue());
- Log.debug(" *** Redraw Portlet for entityId: " + simple.getIntegerValue() + "-"
+ Log.debug("Redraw Portlet for entityId: " + simple.getIntegerValue() + "-"
+ simpleDefId.getIntegerValue());
drawGraph();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
index 83bda53..eedbd30 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
@@ -20,11 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common;
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.widgets.HTMLFlow;
-import com.smartgwt.client.widgets.Img;
-import com.smartgwt.client.widgets.events.ClickEvent;
-import com.smartgwt.client.widgets.events.ClickHandler;
-import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -40,9 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
*/
public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
- //protected HTMLFlow resourceTitle;
protected AbstractGraph graph;
- private Integer chartHeight;
private int entityId;
private int definitionId;
private HTMLFlow graphDiv = null;
@@ -145,7 +139,6 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
new Timer() {
@Override
public void run() {
- Log.debug("Scheduling Graph Rendering");
//@todo: this is a hack around timing issue of jsni not seeing the DOM
drawJsniChart();
}
@@ -158,26 +151,11 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
public abstract void drawJsniChart();
- private Img createLiveGraphImage() {
- Img liveGraph = new Img(IconEnum.RECENT_MEASUREMENTS.getIcon16x16Path(), 16, 16);
- liveGraph.setTooltip(MSG.view_resource_monitor_graph_live_tooltip());
-
- liveGraph.addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent clickEvent) {
- displayLiveGraphViewDialog();
- }
- });
- return liveGraph;
- }
public Integer getChartHeight() {
return graph.getMetricGraphData().getChartHeight();
}
- public void setChartHeight(Integer height) {
- graph.getMetricGraphData().setChartHeight(height);
- }
/**
* This is only necessary to set this for the ResourceGraphPortlet case where
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
index ba13f7e..969ba0f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
@@ -107,147 +107,147 @@ public class AvailabilityLineGraphType {
*/
public native void drawJsniChart() /*-{
- console.groupCollapsed("AvailabilityChart");
- console.time("availabilityChart");
- var global = this,
-
- // tidy up all of our interactions with java (via JSNI) thru AvailChartContext class
- // NOTE: rhq.js has the javascript object constructors in it.
- availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartId()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getAvailabilityJson()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartDateLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartTimeLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverStartLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverEndLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverBarLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverAvailabilityLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverTimeFormat()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverDateFormat()()
- );
-
-
- function draw(availChartContext) {
- "use strict";
-
- var margin = {top: 5, right: 5, bottom: 5, left: 40},
- width = 750 - margin.left - margin.right,
- height = 20 - margin.top - margin.bottom,
- pixelsOffHeight = 0,
- UP = 4, DOWN = 3, UNKNOWN = 2, DISABLED = 1, WARN = 0,
- xAxisMin = $wnd.d3.min(availChartContext.data, function (d) {
- return +d.availStart;
- }),
- xAxisMax = $wnd.d3.max(availChartContext.data, function (d) {
- return +d.availEnd;
- }),
-
- timeScale = $wnd.d3.time.scale()
- .range([0, width])
- .domain([xAxisMin, xAxisMax]),
-
- yScale = $wnd.d3.scale.linear()
- .clamp(true)
- .rangeRound([height, 0])
- .domain([0, 4]),
-
- svg = $wnd.d3.select(availChartContext.chartSelection).append("g")
- .attr("width", width + margin.left + margin.right)
- .attr("height", height + margin.top + margin.bottom)
- .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-
-
- // The gray bars at the bottom leading up
- svg.selectAll("rect.availBars")
- .data(availChartContext.data)
- .enter().append("rect")
- .attr("class", "availBars")
- .attr("x", function (d) {
- return timeScale(+d.availStart);
- })
- .attr("y", function (d) {
- return yScale(0);
- })
- .attr("height", function (d) {
- return height - yScale(4) - pixelsOffHeight;
- })
- .attr("width", function (d) {
- return timeScale(+d.availEnd) - timeScale(+d.availStart);
- })
-
- .attr("opacity", ".9")
- .attr("fill", function (d) {
- if (d.availType === 'DOWN') {
- return "#FF1919"; // red
- }
- else if (d.availType === 'DISABLED') {
- return "#FF9933"; // orange
- }
- else if (d.availType === 'UNKNOWN') {
- return "#CCC"; // gray
- }
- else if (d.availType === 'UP') {
- return "#198C19"; // green
- }
- else if (d.availType === 'WARN') {
- return "#FFFF00"; // yellow
- }
- else if (d.availType === 'EMPTY') {
- return "#CCC"; // gray
- }
- else {
- // should not ever happen, but...
- console.warn("AvailabilityType not valid.");
- return "#000"; //black
- }
- });
-
- createHovers();
-
- }
-
- function createHovers() {
- $wnd.jQuery('svg rect.availBars').tipsy({
- gravity: 'n',
- html: true,
- trigger: 'hover',
- title: function () {
- var d = this.__data__;
- return formatHovers(d);
- },
- show: function (e, el) {
- el.css({ 'z-index': '990000'})
- }
- });
- }
-
- function formatHovers(d) {
- var hoverString,
- timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat),
- dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat),
- availType = d.availType,
- availStart = new Date(+d.availStart),
- availEnd = new Date(+d.availEnd),
- availDuration = d.availDuration;
-
- hoverString =
- '<div class="chartHoverEnclosingDiv">' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' +
- '</div>';
- return hoverString;
-
- }
-
- if (availChartContext.data.length > 0) {
- draw(availChartContext);
- }
-
- console.timeEnd("availabilityChart");
- console.groupEnd("AvailabilityChart");
+ console.groupCollapsed("AvailabilityChart");
+ console.time("availabilityChart");
+ var global = this,
+
+ // tidy up all of our interactions with java (via JSNI) thru AvailChartContext class
+ // NOTE: rhq.js has the javascript object constructors in it.
+ availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartId()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getAvailabilityJson()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartDateLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartTimeLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverStartLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverEndLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverBarLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverAvailabilityLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverTimeFormat()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverDateFormat()()
+ );
+
+
+ function draw(availChartContext) {
+ "use strict";
+
+ var margin = {top: 5, right: 5, bottom: 5, left: 40},
+ width = 750 - margin.left - margin.right,
+ height = 20 - margin.top - margin.bottom,
+ pixelsOffHeight = 0,
+ UP = 4, DOWN = 3, UNKNOWN = 2, DISABLED = 1, WARN = 0,
+ xAxisMin = $wnd.d3.min(availChartContext.data, function (d) {
+ return +d.availStart;
+ }),
+ xAxisMax = $wnd.d3.max(availChartContext.data, function (d) {
+ return +d.availEnd;
+ }),
+
+ timeScale = $wnd.d3.time.scale()
+ .range([0, width])
+ .domain([xAxisMin, xAxisMax]),
+
+ yScale = $wnd.d3.scale.linear()
+ .clamp(true)
+ .rangeRound([height, 0])
+ .domain([0, 4]),
+
+ svg = $wnd.d3.select(availChartContext.chartSelection).append("g")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top + margin.bottom)
+ .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+
+ // The gray bars at the bottom leading up
+ svg.selectAll("rect.availBars")
+ .data(availChartContext.data)
+ .enter().append("rect")
+ .attr("class", "availBars")
+ .attr("x", function (d) {
+ return timeScale(+d.availStart);
+ })
+ .attr("y", function (d) {
+ return yScale(0);
+ })
+ .attr("height", function (d) {
+ return height - yScale(4) - pixelsOffHeight;
+ })
+ .attr("width", function (d) {
+ return timeScale(+d.availEnd) - timeScale(+d.availStart);
+ })
+
+ .attr("opacity", ".9")
+ .attr("fill", function (d) {
+ if (d.availType === 'DOWN') {
+ return "#FF1919"; // red
+ }
+ else if (d.availType === 'DISABLED') {
+ return "#FF9933"; // orange
+ }
+ else if (d.availType === 'UNKNOWN') {
+ return "#CCC"; // gray
+ }
+ else if (d.availType === 'UP') {
+ return "#198C19"; // green
+ }
+ else if (d.availType === 'WARN') {
+ return "#FFFF00"; // yellow
+ }
+ else if (d.availType === 'EMPTY') {
+ return "#CCC"; // gray
+ }
+ else {
+ // should not ever happen, but...
+ console.warn("AvailabilityType not valid.");
+ return "#000"; //black
+ }
+ });
+
+ createHovers();
+
+ }
+
+ function createHovers() {
+ $wnd.jQuery('svg rect.availBars').tipsy({
+ gravity: 'n',
+ html: true,
+ trigger: 'hover',
+ title: function () {
+ var d = this.__data__;
+ return formatHovers(d);
+ },
+ show: function (e, el) {
+ el.css({ 'z-index': '990000'})
+ }
+ });
+ }
+
+ function formatHovers(d) {
+ var hoverString,
+ timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat),
+ dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat),
+ availType = d.availType,
+ availStart = new Date(+d.availStart),
+ availEnd = new Date(+d.availEnd),
+ availDuration = d.availDuration;
+
+ hoverString =
+ '<div class="chartHoverEnclosingDiv">' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' +
+ '</div>';
+ return hoverString;
+
+ }
+
+ if (availChartContext.data.length > 0) {
+ draw(availChartContext);
+ }
+
+ console.timeEnd("availabilityChart");
+ console.groupEnd("AvailabilityChart");
}-*/;
public String getChartId() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 35f2932..4154262 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -116,6 +116,9 @@ public final class MetricStackedBarGraph extends AbstractGraph {
},
lowBound = determineLowBound(min, peak),
highBound = peak + ((peak - min) * 0.1),
+ calcBarWidth = function(){
+ return (width / chartContext.data.length - barOffset )
+ },
yScale = $wnd.d3.scale.linear()
.clamp(true)
@@ -261,7 +264,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
})
.attr("width", function () {
- return (width / chartContext.data.length - barOffset );
+ return calcBarWidth();
})
.attr("opacity", ".9")
@@ -295,7 +298,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
})
.attr("width", function () {
- return (width / chartContext.data.length - barOffset );
+ return calcBarWidth();
})
.attr("data-rhq-value", function(d){
return d.y;
@@ -323,7 +326,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
})
.attr("width", function () {
- return (width / chartContext.data.length - barOffset );
+ return calcBarWidth();
})
.attr("opacity", 0.9);
@@ -351,7 +354,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
})
.attr("width", function () {
- return (width / chartContext.data.length - barOffset );
+ return calcBarWidth();
})
.attr("opacity", 0.9)
.attr("fill", function (d) {
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
index df50d39..9a3404d 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
@@ -62,10 +62,15 @@
text-rendering: optimize-legibility;
}
-.titleName {
+.chartTitleName {
font-family: Arial, Verdana, sans-serif;
font-size: 12px;
font-weight: bold;
+ fill: #003168;
+}
+.chartTitleBox {
+ fill:none;
+
}
rect.high {
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/d3.layout.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/d3.layout.min.js
deleted file mode 100644
index 6704ca9..0000000
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/d3.layout.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){function a(a){var b=a.source,d=a.target,e=c(b,d),f=[b];while(b!==e)b=b.parent,f.push(b);var g=f.length;while(d!==e)f.splice(g,0,d),d=d.parent;return f}function b(a){var b=[],c=a.parent;while(c!=null)b.push(a),a=c,c=c.parent;return b.push(a),b}function c(a,c){if(a===c)return a;var d=b(a),e=b(c),f=d.pop(),g=e.pop(),h=null;while(f===g)h=f,f=d.pop(),g=e.pop();return h}function g(a){a.fixed|=2}function h(a){a!==f&&(a.fixed&=1)}function i(){j(),f.fixed&=1,e=f=null}function j(){f.px+=d3.event.dx,f.py+=d3.event.dy,e.resume()}function k(a,b,c){var d=0,e=0;a.charge=0;if(!a.leaf){var f=a.nodes,g=f.length,h=-1,i;while(++h<g){i=f[h];if(i==null)continue;k(i,b,c),a.charge+=i.charge,d+=i.charge*i.cx,e+=i.charge*i.cy}}if(a.point){a.leaf||(a.point.x+=Math.random()-.5,a.point.y+=Math.random()-.5);var j=b*c[a.point.index];a.charge+=a.pointCharge=j,d+=j*a.point.x,e+=j*a.point.y}a.cx=d/a.charge,a.cy=e/a.charge}function l(a){return 20}function m(a){return 1}function o(a){return a.x}fun
ction p(a){return a.y}function q(a,b,c){a.y0=b,a.y=c}function t(a){var b=1,c=0,d=a[0][1],e,f=a.length;for(;b<f;++b)(e=a[b][1])>d&&(c=b,d=e);return c}function u(a){return a.reduce(v,0)}function v(a,b){return a+b[1]}function w(a,b){return x(a,Math.ceil(Math.log(b.length)/Math.LN2+1))}function x(a,b){var c=-1,d=+a[0],e=(a[1]-d)/b,f=[];while(++c<=b)f[c]=e*c+d;return f}function y(a){return[d3.min(a),d3.max(a)]}function z(a,b){return a.sort=d3.rebind(a,b.sort),a.children=d3.rebind(a,b.children),a.links=D,a.value=d3.rebind(a,b.value),a.nodes=function(b){return E=!0,(a.nodes=a)(b)},a}function A(a){return a.children}function B(a){return a.value}function C(a,b){return b.value-a.value}function D(a){return d3.merge(a.map(function(a){return(a.children||[]).map(function(b){return{source:a,target:b}})}))}function F(a,b){return a.value-b.value}function G(a,b){var c=a._pack_next;a._pack_next=b,b._pack_prev=a,b._pack_next=c,c._pack_prev=b}function H(a,b){a._pack_next=b,b._pack_prev=a}function
I(a,b){var c=b.x-a.x,d=b.y-a.y,e=a.r+b.r;return e*e-c*c-d*d>.001}function J(a){function l(a){b=Math.min(a.x-a.r,b),c=Math.max(a.x+a.r,c),d=Math.min(a.y-a.r,d),e=Math.max(a.y+a.r,e)}var b=Infinity,c=-Infinity,d=Infinity,e=-Infinity,f=a.length,g,h,i,j,k;a.forEach(K),g=a[0],g.x=-g.r,g.y=0,l(g);if(f>1){h=a[1],h.x=h.r,h.y=0,l(h);if(f>2){i=a[2],O(g,h,i),l(i),G(g,i),g._pack_prev=i,G(i,h),h=g._pack_next;for(var m=3;m<f;m++){O(g,h,i=a[m]);var n=0,o=1,p=1;for(j=h._pack_next;j!==h;j=j._pack_next,o++)if(I(j,i)){n=1;break}if(n==1)for(k=g._pack_prev;k!==j._pack_prev;k=k._pack_prev,p++)if(I(k,i)){p<o&&(n=-1,j=k);break}n==0?(G(g,i),h=i,l(i)):n>0?(H(g,j),h=j,m--):(H(j,h),g=j,m--)}}}var q=(b+c)/2,r=(d+e)/2,s=0;for(var m=0;m<f;m++){var t=a[m];t.x-=q,t.y-=r,s=Math.max(s,t.r+Math.sqrt(t.x*t.x+t.y*t.y))}return a.forEach(L),s}function K(a){a._pack_next=a._pack_prev=a}function L(a){delete a._pack_next,delete a._pack_prev}function M(a){var b=a.children;b&&b.length?(b.forEach(M),a.r=J(b)):a.r=Math.s
qrt(a.value)}function N(a,b,c,d){var e=a.children;a.x=b+=d*a.x,a.y=c+=d*a.y,a.r*=d;if(e){var f=-1,g=e.length;while(++f<g)N(e[f],b,c,d)}}function O(a,b,c){var d=a.r+c.r,e=b.x-a.x,f=b.y-a.y;if(d&&(e||f)){var g=b.r+c.r,h=Math.sqrt(e*e+f*f),i=Math.max(-1,Math.min(1,(d*d+h*h-g*g)/(2*d*h))),j=Math.acos(i),k=i*(d/=h),l=Math.sin(j)*d;c.x=a.x+k*e+l*f,c.y=a.y+k*f-l*e}else c.x=a.x+d,c.y=a.y}function P(a){return 1+d3.max(a,function(a){return a.y})}function Q(a){return a.reduce(function(a,b){return a+b.x},0)/a.length}function R(a){var b=a.children;return b&&b.length?R(b[0]):a}function S(a){var b=a.children,c;return b&&(c=b.length)?S(b[c-1]):a}function T(a,b){return a.parent==b.parent?1:2}function U(a){var b=a.children;return b&&b.length?b[0]:a._tree.thread}function V(a){var b=a.children,c;return b&&(c=b.length)?b[c-1]:a._tree.thread}function W(a,b){var c=a.children;if(c&&(e=c.length)){var d,e,f=-1;while(++f<e)b(d=W(c[f],b),a)>0&&(a=d)}return a}function X(a,b){return a.x-b.x}function Y(a,
b){return b.x-a.x}function Z(a,b){return a.depth-b.depth}function $(a,b){function c(a,d){var e=a.children;if(e&&(i=e.length)){var f,g=null,h=-1,i;while(++h<i)f=e[h],c(f,g),g=f}b(a,d)}c(a,null)}function _(a){var b=0,c=0,d=a.children,e=d.length,f;while(--e>=0)f=d[e]._tree,f.prelim+=b,f.mod+=b,b+=f.shift+(c+=f.change)}function ba(a,b,c){a=a._tree,b=b._tree;var d=c/(b.number-a.number);a.change+=d,b.change-=d,b.shift+=c,b.prelim+=c,b.mod+=c}function bb(a,b,c){return a._tree.ancestor.parent==b.parent?a._tree.ancestor:c}function bc(a){return{x:a.x,y:a.y,dx:a.dx,dy:a.dy}}function bd(a,b){var c=a.x+b[3],d=a.y+b[0],e=a.dx-b[1]-b[3],f=a.dy-b[0]-b[2];return e<0&&(c+=e/2,e=0),f<0&&(d+=f/2,f=0),{x:c,y:d,dx:e,dy:f}}d3.layout={},d3.layout.bundle=function(){return function(b){var c=[],d=-1,e=b.length;while(++d<e)c.push(a(b[d]));return c}},d3.layout.chord=function(){function j(){var a={},j=[],l=d3.range(e),m=[],n,o,p,q,r;b=[],c=[],n=0,q=-1;while(++q<e){o=0,r=-1;while(++r<e)o+=d[q][r];j.push(o
),m.push(d3.range(e)),n+=o}g&&l.sort(function(a,b){return g(j[a],j[b])}),h&&m.forEach(function(a,b){a.sort(function(a,c){return h(d[b][a],d[b][c])})}),n=(2*Math.PI-f*e)/n,o=0,q=-1;while(++q<e){p=o,r=-1;while(++r<e){var s=l[q],t=m[s][r],u=d[s][t],v=o,w=o+=u*n;a[s+"-"+t]={index:s,subindex:t,startAngle:v,endAngle:w,value:u}}c.push({index:s,startAngle:p,endAngle:o,value:(o-p)/n}),o+=f}q=-1;while(++q<e){r=q-1;while(++r<e){var x=a[q+"-"+r],y=a[r+"-"+q];(x.value||y.value)&&b.push(x.value<y.value?{source:y,target:x}:{source:x,target:y})}}i&&k()}function k(){b.sort(function(a,b){return i((a.source.value+a.target.value)/2,(b.source.value+b.target.value)/2)})}var a={},b,c,d,e,f=0,g,h,i;return a.matrix=function(f){return arguments.length?(e=(d=f)&&d.length,b=c=null,a):d},a.padding=function(d){return arguments.length?(f=d,b=c=null,a):f},a.sortGroups=function(d){return arguments.length?(g=d,b=c=null,a):g},a.sortSubgroups=function(c){return arguments.length?(h=c,b=null,a):h},a.sortChords=f
unction(c){return arguments.length?(i=c,b&&k(),a):i},a.chords=function(){return b||j(),b},a.groups=function(){return c||j(),c},a},d3.layout.force=function(){function A(a){return function(b,c,d,e,f){if(b.point!==a){var g=b.cx-a.x,h=b.cy-a.y,i=1/Math.sqrt(g*g+h*h);if((e-c)*i<t){var j=b.charge*i*i;return a.px-=g*j,a.py-=h*j,!0}if(b.point&&isFinite(i)){var j=b.pointCharge*i*i;a.px-=g*j,a.py-=h*j}}return!b.charge}}function B(){var a=v.length,d=w.length,e,f,g,h,i,j,l,m,p;for(f=0;f<d;++f){g=w[f],h=g.source,i=g.target,m=i.x-h.x,p=i.y-h.y;if(j=m*m+p*p)j=n*y[f]*((j=Math.sqrt(j))-x[f])/j,m*=j,p*=j,i.x-=m*(l=h.weight/(i.weight+h.weight)),i.y-=p*l,h.x+=m*(l=1-l),h.y+=p*l}if(l=n*s){m=c[0]/2,p=c[1]/2,f=-1;if(l)while(++f<a)g=v[f],g.x+=(m-g.x)*l,g.y+=(p-g.y)*l}if(r){k(e=d3.geom.quadtree(v),n,z),f=-1;while(++f<a)(g=v[f]).fixed||e.visit(A(g))}f=-1;while(++f<a)g=v[f],g.fixed?(g.x=g.px,g.y=g.py):(g.x-=(g.px-(g.px=g.x))*o,g.y-=(g.py-(g.py=g.y))*o);return b.tick({type:"tick",alpha:n}),(n*=.99)<.00
5}function C(b){g(f=b),e=a}var a={},b=d3.dispatch("tick"),c=[1,1],d,n,o=.9,p=l,q=m,r=-30,s=.1,t=.8,u,v=[],w=[],x,y,z;return a.on=function(c,d){return b.on(c,d),a},a.nodes=function(b){return arguments.length?(v=b,a):v},a.links=function(b){return arguments.length?(w=b,a):w},a.size=function(b){return arguments.length?(c=b,a):c},a.linkDistance=function(b){return arguments.length?(p=d3.functor(b),a):p},a.distance=a.linkDistance,a.linkStrength=function(b){return arguments.length?(q=d3.functor(b),a):q},a.friction=function(b){return arguments.length?(o=b,a):o},a.charge=function(b){return arguments.length?(r=typeof b=="function"?b:+b,a):r},a.gravity=function(b){return arguments.length?(s=b,a):s},a.theta=function(b){return arguments.length?(t=b,a):t},a.start=function(){function k(a,c){var d=l(b),e=-1,f=d.length,g;while(++e<f)if(!isNaN(g=d[e][a]))return g;return Math.random()*c}function l(){if(!i){i=[];for(d=0;d<e;++d)i[d]=[];for(d=0;d<f;++d){var a=w[d];i[a.source.index].push(a.target)
,i[a.target.index].push(a.source)}}return i[b]}var b,d,e=v.length,f=w.length,g=c[0],h=c[1],i,j;for(b=0;b<e;++b)(j=v[b]).index=b,j.weight=0;x=[],y=[];for(b=0;b<f;++b)j=w[b],typeof j.source=="number"&&(j.source=v[j.source]),typeof j.target=="number"&&(j.target=v[j.target]),x[b]=p.call(this,j,b),y[b]=q.call(this,j,b),++j.source.weight,++j.target.weight;for(b=0;b<e;++b)j=v[b],isNaN(j.x)&&(j.x=k("x",g)),isNaN(j.y)&&(j.y=k("y",h)),isNaN(j.px)&&(j.px=j.x),isNaN(j.py)&&(j.py=j.y);z=[];if(typeof r=="function")for(b=0;b<e;++b)z[b]=+r.call(this,v[b],b);else for(b=0;b<e;++b)z[b]=r;return a.resume()},a.resume=function(){return n=.1,d3.timer(B),a},a.stop=function(){return n=0,a},a.drag=function(){d||(d=d3.behavior.drag().on("dragstart",C).on("drag",j).on("dragend",i)),this.on("mouseover.force",g).on("mouseout.force",h).call(d)},a};var e,f;d3.layout.partition=function(){function c(a,b,d,e){var f=a.children;a.x=b,a.y=a.depth*e,a.dx=d,a.dy=e;if(f&&(h=f.length)){var g=-1,h,i,j;d=a.value?d/a.v
alue:0;while(++g<h)c(i=f[g],b,j=i.value*d,e),b+=j}}function d(a){var b=a.children,c=0;if(b&&(f=b.length)){var e=-1,f;while(++e<f)c=Math.max(c,d(b[e]))}return 1+c}function e(e,f){var g=a.call(this,e,f);return c(g[0],0,b[0],b[1]/d(g[0])),g}var a=d3.layout.hierarchy(),b=[1,1];return e.size=function(a){return arguments.length?(b=a,e):b},z(e,a)},d3.layout.pie=function(){function f(g,h){var i=g.map(function(b,c){return+a.call(f,b,c)}),j=+(typeof c=="function"?c.apply(this,arguments):c),k=((typeof e=="function"?e.apply(this,arguments):e)-c)/d3.sum(i),l=d3.range(g.length);b!=null&&l.sort(b===n?function(a,b){return i[b]-i[a]}:function(a,c){return b(g[a],g[c])});var m=l.map(function(a){return{data:g[a],value:d=i[a],startAngle:j,endAngle:j+=d*k}});return g.map(function(a,b){return m[l[b]]})}var a=Number,b=n,c=0,e=2*Math.PI;return f.value=function(b){return arguments.length?(a=b,f):a},f.sort=function(a){return arguments.length?(b=a,f):b},f.startAngle=function(a){return arguments.length?
(c=a,f):c},f.endAngle=function(a){return arguments.length?(e=a,f):e},f};var n={};d3.layout.stack=function(){function g(h,i){var j=h.map(function(b,c){return a.call(g,b,c)}),k=j.map(function(a,b){return a.map(function(a,b){return[e.call(g,a,b),f.call(g,a,b)]})}),l=b.call(g,k,i);j=d3.permute(j,l),k=d3.permute(k,l);var m=c.call(g,k,i),n=j.length,o=j[0].length,p,q,r;for(q=0;q<o;++q){d.call(g,j[0][q],r=m[q],k[0][q][1]);for(p=1;p<n;++p)d.call(g,j[p][q],r+=k[p-1][q][1],k[p][q][1])}return h}var a=Object,b=r["default"],c=s.zero,d=q,e=o,f=p;return g.values=function(b){return arguments.length?(a=b,g):a},g.order=function(a){return arguments.length?(b=typeof a=="function"?a:r[a],g):b},g.offset=function(a){return arguments.length?(c=typeof a=="function"?a:s[a],g):c},g.x=function(a){return arguments.length?(e=a,g):e},g.y=function(a){return arguments.length?(f=a,g):f},g.out=function(a){return arguments.length?(d=a,g):d},g};var r={"inside-out":function(a){var b=a.length,c,d,e=a.map(t),f=a.ma
p(u),g=d3.range(b).sort(function(a,b){return e[a]-e[b]}),h=0,i=0,j=[],k=[];for(c=0;c<b;++c)d=g[c],h<i?(h+=f[d],j.push(d)):(i+=f[d],k.push(d));return k.reverse().concat(j)},reverse:function(a){return d3.range(a.length).reverse()},"default":function(a){return d3.range(a.length)}},s={silhouette:function(a){var b=a.length,c=a[0].length,d=[],e=0,f,g,h,i=[];for(g=0;g<c;++g){for(f=0,h=0;f<b;f++)h+=a[f][g][1];h>e&&(e=h),d.push(h)}for(g=0;g<c;++g)i[g]=(e-d[g])/2;return i},wiggle:function(a){var b=a.length,c=a[0],d=c.length,e=0,f,g,h,i,j,k,l,m,n,o=[];o[0]=m=n=0;for(g=1;g<d;++g){for(f=0,i=0;f<b;++f)i+=a[f][g][1];for(f=0,j=0,l=c[g][0]-c[g-1][0];f<b;++f){for(h=0,k=(a[f][g][1]-a[f][g-1][1])/(2*l);h<f;++h)k+=(a[h][g][1]-a[h][g-1][1])/l;j+=k*a[f][g][1]}o[g]=m-=i?j/i*l:0,m<n&&(n=m)}for(g=0;g<d;++g)o[g]-=n;return o},expand:function(a){var b=a.length,c=a[0].length,d=1/b,e,f,g,h=[];for(f=0;f<c;++f){for(e=0,g=0;e<b;e++)g+=a[e][f][1];if(g)for(e=0;e<b;e++)a[e][f][1]/=g;else for(e=0;e<b;e++)a[e][f]
[1]=d}for(f=0;f<c;++f)h[f]=0;return h},zero:function(a){var b=-1,c=a[0].length,d=[];while(++b<c)d[b]=0;return d}};d3.layout.histogram=function(){function e(e,f){var g=[],h=e.map(b,this),i=c.call(this,h,f),j=d.call(this,i,h,f),k,f=-1,l=h.length,m=j.length-1,n=a?1:1/l,o;while(++f<m)k=g[f]=[],k.dx=j[f+1]-(k.x=j[f]),k.y=0;f=-1;while(++f<l)o=h[f],o>=i[0]&&o<=i[1]&&(k=g[d3.bisect(j,o,1,m)-1],k.y+=n,k.push(e[f]));return g}var a=!0,b=Number,c=y,d=w;return e.value=function(a){return arguments.length?(b=a,e):b},e.range=function(a){return arguments.length?(c=d3.functor(a),e):c},e.bins=function(a){return arguments.length?(d=typeof a=="number"?function(b){return x(b,a)}:d3.functor(a),e):d},e.frequency=function(b){return arguments.length?(a=!!b,e):a},e},d3.layout.hierarchy=function(){function e(f,h,i){var j=b.call(g,f,h),k=E?f:{data:f};k.depth=h,i.push(k);if(j&&(m=j.length)){var l=-1,m,n=k.children=[],o=0,p=h+1;while(++l<m)d=e(j[l],p,i),d.parent=k,n.push(d),o+=d.value;a&&n.sort(a),c&&(k.v
alue=o)}else c&&(k.value=+c.call(g,f,h)||0);return k}function f(a,b){var d=a.children,e=0;if(d&&(i=d.length)){var h=-1,i,j=b+1;while(++h<i)e+=f(d[h],j)}else c&&(e=+c.call(g,E?a:a.data,b)||0);return c&&(a.value=e),e}function g(a){var b=[];return e(a,0,b),b}var a=C,b=A,c=B;return g.sort=function(b){return arguments.length?(a=b,g):a},g.children=function(a){return arguments.length?(b=a,g):b},g.value=function(a){return arguments.length?(c=a,g):c},g.revalue=function(a){return f(a,0),a},g};var E=!1;d3.layout.pack=function(){function c(c,d){var e=a.call(this,c,d),f=e[0];f.x=0,f.y=0,M(f);var g=b[0],h=b[1],i=1/Math.max(2*f.r/g,2*f.r/h);return N(f,g/2,h/2,i),e}var a=d3.layout.hierarchy().sort(F),b=[1,1];return c.size=function(a){return arguments.length?(b=a,c):b},z(c,a)},d3.layout.cluster=function(){function d(d,e){var f=a.call(this,d,e),g=f[0],h,i=0,j,k;$(g,function(a){var c=a.children;c&&c.length?(a.x=Q(c),a.y=P(c)):(a.x=h?i+=b(a,h):0,a.y=0,h=a)});var l=R(g),m=S(g),n=l.x-b(l,m)/2,o=m
.x+b(m,l)/2;return $(g,function(a){a.x=(a.x-n)/(o-n)*c[0],a.y=(1-a.y/g.y)*c[1]}),f}var a=d3.layout.hierarchy().sort(null).value(null),b=T,c=[1,1];return d.separation=function(a){return arguments.length?(b=a,d):b},d.size=function(a){return arguments.length?(c=a,d):c},z(d,a)},d3.layout.tree=function(){function d(d,e){function h(a,c){var d=a.children,e=a._tree;if(d&&(f=d.length)){var f,g=d[0],i,k=g,l,m=-1;while(++m<f)l=d[m],h(l,i),k=j(l,i,k),i=l;_(a);var n=.5*(g._tree.prelim+l._tree.prelim);c?(e.prelim=c._tree.prelim+b(a,c),e.mod=e.prelim-n):e.prelim=n}else c&&(e.prelim=c._tree.prelim+b(a,c))}function i(a,b){a.x=a._tree.prelim+b;var c=a.children;if(c&&(e=c.length)){var d=-1,e;b+=a._tree.mod;while(++d<e)i(c[d],b)}}function j(a,c,d){if(c){var e=a,f=a,g=c,h=a.parent.children[0],i=e._tree.mod,j=f._tree.mod,k=g._tree.mod,l=h._tree.mod,m;while(g=V(g),e=U(e),g&&e)h=U(h),f=V(f),f._tree.ancestor=a,m=g._tree.prelim+k-e._tree.prelim-i+b(g,e),m>0&&(ba(bb(g,a,d),a,m),i+=m,j+=m),k+=g._tree.m
od,i+=e._tree.mod,l+=h._tree.mod,j+=f._tree.mod;g&&!V(f)&&(f._tree.thread=g,f._tree.mod+=k-j),e&&!U(h)&&(h._tree.thread=e,h._tree.mod+=i-l,d=a)}return d}var f=a.call(this,d,e),g=f[0];$(g,function(a,b){a._tree={ancestor:a,prelim:0,mod:0,change:0,shift:0,number:b?b._tree.number+1:0}}),h(g),i(g,-g._tree.prelim);var k=W(g,Y),l=W(g,X),m=W(g,Z),n=k.x-b(k,l)/2,o=l.x+b(l,k)/2,p=m.depth||1;return $(g,function(a){a.x=(a.x-n)/(o-n)*c[0],a.y=a.depth/p*c[1],delete a._tree}),f}var a=d3.layout.hierarchy().sort(null).value(null),b=T,c=[1,1];return d.separation=function(a){return arguments.length?(b=a,d):b},d.size=function(a){return arguments.length?(c=a,d):c},z(d,a)},d3.layout.treemap=function(){function i(a,b){var c=-1,d=a.length,e,f;while(++c<d)f=(e=a[c]).value*(b<0?0:b),e.area=isNaN(f)||f<=0?0:f}function j(a){var b=a.children;if(b&&b.length){var c=e(a),d=[],f=b.slice(),g,h=Infinity,k,n=Math.min(c.dx,c.dy),o;i(f,c.dx*c.dy/a.value),d.area=0;while((o=f.length)>0)d.push(g=f[o-1]),d.area+=g.a
rea,(k=l(d,n))<=h?(f.pop(),h=k):(d.area-=d.pop().area,m(d,n,c,!1),n=Math.min(c.dx,c.dy),d.length=d.area=0,h=Infinity);d.length&&(m(d,n,c,!0),d.length=d.area=0),b.forEach(j)}}function k(a){var b=a.children;if(b&&b.length){var c=e(a),d=b.slice(),f,g=[];i(d,c.dx*c.dy/a.value),g.area=0;while(f=d.pop())g.push(f),g.area+=f.area,f.z!=null&&(m(g,f.z?c.dx:c.dy,c,!d.length),g.length=g.area=0);b.forEach(k)}}function l(a,b){var c=a.area,d,e=0,f=Infinity,g=-1,i=a.length;while(++g<i){if(!(d=a[g].area))continue;d<f&&(f=d),d>e&&(e=d)}return c*=c,b*=b,c?Math.max(b*e*h/c,c/(b*f*h)):Infinity}function m(a,c,d,e){var f=-1,g=a.length,h=d.x,i=d.y,j=c?b(a.area/c):0,k;if(c==d.dx){if(e||j>d.dy)j=j?d.dy:0;while(++f<g)k=a[f],k.x=h,k.y=i,k.dy=j,h+=k.dx=j?b(k.area/j):0;k.z=!0,k.dx+=d.x+d.dx-h,d.y+=j,d.dy-=j}else{if(e||j>d.dx)j=j?d.dx:0;while(++f<g)k=a[f],k.x=h,k.y=i,k.dx=j,i+=k.dy=j?b(k.area/j):0;k.z=!1,k.dy+=d.y+d.dy-i,d.x+=j,d.dx-=j}}function n(b){var d=g||a(b),e=d[0];return e.x=0,e.y=0,e.dx=c[0],e.dy=
c[1],g&&a.revalue(e),i([e],e.dx*e.dy/e.value),(g?k:j)(e),f&&(g=d),d}var a=d3.layout.hierarchy(),b=Math.round,c=[1,1],d=null,e=bc,f=!1,g,h=.5*(1+Math.sqrt(5));return n.size=function(a){return arguments.length?(c=a,n):c},n.padding=function(a){function b(b){var c=a.call(n,b,b.depth);return c==null?bc(b):bd(b,typeof c=="number"?[c,c,c,c]:c)}function c(b){return bd(b,a)}if(!arguments.length)return d;var f;return e=(d=a)==null?bc:(f=typeof a)==="function"?b:f==="number"?(a=[a,a,a,a],c):c,n},n.round=function(a){return arguments.length?(b=a?Math.round:Number,n):b!=Number},n.sticky=function(a){return arguments.length?(f=a,g=null,n):f},n.ratio=function(a){return arguments.length?(h=a,n):h},z(n,a)}})();
\ No newline at end of file
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java | 41 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java | 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java | 299 ++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java | 57 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java | 363 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java | 1
modules/enterprise/gui/coregui/src/main/webapp/css/charts.css | 7
modules/enterprise/gui/coregui/src/main/webapp/js/d3.layout.min.js | 1
modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 4
15 files changed, 488 insertions(+), 373 deletions(-)
New commits:
commit e1908585971b08d84a8a3fd609e7d8e58af13805
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Tue Apr 2 19:51:08 2013 -0700
[BZ 921022] - Small Width Dashboard charts. Create small dashboard charts with same 8 scale as full dashboard charts just truncated to 20 bars instead of 60.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
index 26ccfd21..992df3f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/groups/graph/ResourceGroupD3GraphPortlet.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.inventory.groups.graph;
+import com.google.gwt.user.client.Timer;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.TitleOrientation;
@@ -38,6 +39,8 @@ import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedEvent;
import org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortlet;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshPortletUtil;
import org.rhq.enterprise.gui.coregui.client.dashboard.CustomSettingsPortlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
@@ -47,27 +50,29 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricSt
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.ResourceGroupMetricD3GraphView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourceGroupSelector;
+import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
* @author Mike Thompson
*/
-public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView implements CustomSettingsPortlet {
+public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView implements AutoRefreshPortlet, CustomSettingsPortlet {
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "ResourceGroupMetricD3";
// A default displayed, persisted name for the portlet
- public static final String NAME = MSG.view_portlet_defaultName_groupMetric();
+ public static final String NAME = "d3-"+MSG.view_portlet_defaultName_groupMetric();
// set on initial configuration, the window for this portlet view.
private PortletWindow portletWindow;
+ private Timer refreshTimer;
public static final String CFG_RESOURCE_GROUP_ID = "resourceGroupId";
public static final String CFG_DEFINITION_ID = "definitionId";
public ResourceGroupD3GraphPortlet() {
- super(new MetricStackedBarGraph(new MetricGraphData()));
+ super(new MetricStackedBarGraph(MetricGraphData.createForDashboard()));
setOverflow(Overflow.HIDDEN);
}
@@ -76,6 +81,7 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
+ setMetricGraphData(MetricGraphData.createForDashboard());
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
@@ -122,11 +128,6 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
GroupCategory.COMPATIBLE, false);
resourceGroupSelector.setWidth(700);
resourceGroupSelector.setHeight(300);
- //TODO, would probaby be nice to find a way to seed assigned with the current group
- //ListGridRecord rec = new ListGridRecord();
- //rec.setAttribute("id", getEntityId());
- //rec.setAttribute("name", "current");
- //resourceGroupSelector.setAssigned(new ListGridRecord[] { rec });
final SelectItem metric = new SortedSelectItem(CFG_DEFINITION_ID, MSG.common_title_metric()) {
@Override
@@ -203,13 +204,35 @@ public class ResourceGroupD3GraphPortlet extends ResourceGroupMetricD3GraphView
drawGraph();
}
}
+ public void startRefreshCycle() {
+ refreshTimer = AutoRefreshPortletUtil.startRefreshCycle(this, this, refreshTimer);
+ }
+
+ @Override
+ protected void onDestroy() {
+ AutoRefreshPortletUtil.onDestroy(this, refreshTimer);
+
+ super.onDestroy();
+ }
+
+ public boolean isRefreshing() {
+ return false;
+ }
+
+ //Custom refresh operation as we are not directly extending Table
+ @Override
+ public void refresh() {
+ if (isVisible() && !isRefreshing()) {
+ redraw();
+ }
+ }
public static final class Factory implements PortletViewFactory {
public static PortletViewFactory INSTANCE = new Factory();
public final Portlet getInstance(EntityContext context) {
- return new ResourceGroupGraphPortlet();
+ return new ResourceGroupD3GraphPortlet();
}
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
index 68bc34b..84c5c54 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
@@ -61,6 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceMetricD3Graph;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.ResourceScheduledMetricDatasource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
@@ -84,17 +85,19 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
public ResourceD3GraphPortlet() {
super();
setOverflow(Overflow.HIDDEN);
- setGraph(new MetricStackedBarGraph(new MetricGraphData()));
}
@Override
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
- Log.debug("\nResourceD3GraphPortlet Configure");
+ Log.debug("ResourceD3GraphPortlet Configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
}
+
+ setGraph(new MetricStackedBarGraph(MetricGraphData.createForDashboard()));
+
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
@@ -154,7 +157,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
getJsniChart().setEntityName(resource.getName());
getJsniChart().setDefinition(def);
final long startTime = System.currentTimeMillis();
- //
+
GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(
resource.getId(), new int[] { def.getId() }, 8, MeasurementUtils.UNIT_HOURS,
60, new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
index eedbd30..251f5f9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
@@ -166,14 +166,6 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
graph.setMetricGraphData(metricGraphData);
}
- protected boolean supportsLiveGraphViewDialog() {
- return false;
- }
-
- protected void displayLiveGraphViewDialog() {
- return;
- }
-
@Override
public void destroy() {
super.destroy();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
index 84655ef..125a740 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AbstractGraph.java
@@ -19,6 +19,8 @@
package org.rhq.enterprise.gui.coregui.client.inventory.common.charttype;
+import com.smartgwt.client.widgets.layout.VLayout;
+
import org.rhq.core.domain.measurement.MeasurementDefinition;
/**
@@ -31,7 +33,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition;
*
* @author Mike Thompson
*/
-public abstract class AbstractGraph implements HasD3MetricJsniChart {
+public abstract class AbstractGraph extends VLayout implements HasD3MetricJsniChart {
private MetricGraphData metricGraphData;
@@ -147,6 +149,10 @@ public abstract class AbstractGraph implements HasD3MetricJsniChart {
public String getChartTitle() {
return metricGraphData != null ? metricGraphData.getChartTitle() : "";
}
+ public boolean isPortalGraph(){
+ return metricGraphData.isPortalGraph();
+ }
+
public String getYAxisUnits() {
return metricGraphData.getYAxisUnits();
@@ -160,5 +166,9 @@ public abstract class AbstractGraph implements HasD3MetricJsniChart {
return metricGraphData.getJsonMetrics();
}
+ public Integer getWindowWidth() {
+ return metricGraphData.getWindowWidth();
+ }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
index 969ba0f..b15edee 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
@@ -106,11 +106,9 @@ public class AvailabilityLineGraphType {
* The magic JSNI to draw the charts with d3.
*/
public native void drawJsniChart() /*-{
+ console.log("Draw Availability chart");
- console.groupCollapsed("AvailabilityChart");
- console.time("availabilityChart");
var global = this,
-
// tidy up all of our interactions with java (via JSNI) thru AvailChartContext class
// NOTE: rhq.js has the javascript object constructors in it.
availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartId()(),
@@ -126,129 +124,146 @@ public class AvailabilityLineGraphType {
);
- function draw(availChartContext) {
+ var availabilityGraph = function () {
"use strict";
+ // privates
var margin = {top: 5, right: 5, bottom: 5, left: 40},
- width = 750 - margin.left - margin.right,
+ barOffset = 10,
+ width = 750 - margin.left - margin.right + barOffset,
height = 20 - margin.top - margin.bottom,
pixelsOffHeight = 0,
- UP = 4, DOWN = 3, UNKNOWN = 2, DISABLED = 1, WARN = 0,
- xAxisMin = $wnd.d3.min(availChartContext.data, function (d) {
- return +d.availStart;
- }),
- xAxisMax = $wnd.d3.max(availChartContext.data, function (d) {
- return +d.availEnd;
- }),
-
- timeScale = $wnd.d3.time.scale()
- .range([0, width])
- .domain([xAxisMin, xAxisMax]),
-
- yScale = $wnd.d3.scale.linear()
- .clamp(true)
- .rangeRound([height, 0])
- .domain([0, 4]),
-
- svg = $wnd.d3.select(availChartContext.chartSelection).append("g")
- .attr("width", width + margin.left + margin.right)
- .attr("height", height + margin.top + margin.bottom)
- .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-
-
- // The gray bars at the bottom leading up
- svg.selectAll("rect.availBars")
- .data(availChartContext.data)
- .enter().append("rect")
- .attr("class", "availBars")
- .attr("x", function (d) {
- return timeScale(+d.availStart);
- })
- .attr("y", function (d) {
- return yScale(0);
- })
- .attr("height", function (d) {
- return height - yScale(4) - pixelsOffHeight;
- })
- .attr("width", function (d) {
- return timeScale(+d.availEnd) - timeScale(+d.availStart);
- })
-
- .attr("opacity", ".9")
- .attr("fill", function (d) {
- if (d.availType === 'DOWN') {
- return "#FF1919"; // red
- }
- else if (d.availType === 'DISABLED') {
- return "#FF9933"; // orange
- }
- else if (d.availType === 'UNKNOWN') {
- return "#CCC"; // gray
- }
- else if (d.availType === 'UP') {
- return "#198C19"; // green
- }
- else if (d.availType === 'WARN') {
- return "#FFFF00"; // yellow
- }
- else if (d.availType === 'EMPTY') {
- return "#CCC"; // gray
- }
- else {
- // should not ever happen, but...
- console.warn("AvailabilityType not valid.");
- return "#000"; //black
- }
- });
-
- createHovers();
+ svg;
+
+
+ function drawBars(availChartContext) {
+ var xAxisMin = $wnd.d3.min(availChartContext.data, function (d) {
+ return +d.availStart;
+ }),
+ xAxisMax = $wnd.d3.max(availChartContext.data, function (d) {
+ return +d.availEnd;
+ }),
+
+ timeScale = $wnd.d3.time.scale()
+ .range([0, width])
+ .domain([xAxisMin, xAxisMax]),
+
+ yScale = $wnd.d3.scale.linear()
+ .clamp(true)
+ .rangeRound([height, 0])
+ .domain([0, 4]),
+
+ svg = $wnd.d3.select(availChartContext.chartSelection).append("g")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top + margin.bottom)
+ .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+
+ // The gray bars at the bottom leading up
+ svg.selectAll("rect.availBars")
+ .data(availChartContext.data)
+ .enter().append("rect")
+ .attr("class", "availBars")
+ .attr("x", function (d) {
+ return timeScale(+d.availStart);
+ })
+ .attr("y", function (d) {
+ return yScale(0);
+ })
+ .attr("height", function (d) {
+ return height - yScale(4) - pixelsOffHeight;
+ })
+ .attr("width", function (d) {
+ return timeScale(+d.availEnd) - timeScale(+d.availStart);
+ })
+
+ .attr("opacity", ".9")
+ .attr("fill", function (d) {
+ if (d.availType === 'DOWN') {
+ return "#FF1919"; // red
+ }
+ else if (d.availType === 'DISABLED') {
+ return "#FF9933"; // orange
+ }
+ else if (d.availType === 'UNKNOWN') {
+ return "#CCC"; // gray
+ }
+ else if (d.availType === 'UP') {
+ return "#198C19"; // green
+ }
+ else if (d.availType === 'WARN') {
+ return "#FFFF00"; // yellow
+ }
+ else if (d.availType === 'EMPTY') {
+ return "#CCC"; // gray
+ }
+ else {
+ // should not ever happen, but...
+ console.warn("AvailabilityType not valid.");
+ return "#000"; //black
+ }
+ });
+ }
- }
+ function createHovers() {
+ $wnd.jQuery('svg rect.availBars').tipsy({
+ gravity: 'n',
+ html: true,
+ trigger: 'hover',
+ title: function () {
+ var d = this.__data__;
+ return formatHovers(d);
+ },
+ show: function (e, el) {
+ el.css({ 'z-index': '990000'})
+ }
+ });
+ }
+
+ function formatHovers(d) {
+ var hoverString,
+ timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat),
+ dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat),
+ availType = d.availType,
+ availStart = new Date(+d.availStart),
+ availEnd = new Date(+d.availEnd),
+ availDuration = d.availDuration;
+
+ hoverString =
+ '<div class="chartHoverEnclosingDiv">' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' +
+ '</div>';
+ return hoverString;
- function createHovers() {
- $wnd.jQuery('svg rect.availBars').tipsy({
- gravity: 'n',
- html: true,
- trigger: 'hover',
- title: function () {
- var d = this.__data__;
- return formatHovers(d);
- },
- show: function (e, el) {
- el.css({ 'z-index': '990000'})
+ }
+
+ return {
+ // Public API
+ draw: function (chartContext) {
+ "use strict";
+ console.groupCollapsed("AvailabilityChart");
+ console.time("availabilityChart");
+
+ drawBars(availChartContext);
+ createHovers();
+ console.timeEnd("availabilityChart");
+ console.groupEnd("AvailabilityChart");
}
- });
- }
+ }; // end public closure
- function formatHovers(d) {
- var hoverString,
- timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat),
- dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat),
- availType = d.availType,
- availStart = new Date(+d.availStart),
- availEnd = new Date(+d.availEnd),
- availDuration = d.availDuration;
-
- hoverString =
- '<div class="chartHoverEnclosingDiv">' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' +
- '</div>';
- return hoverString;
- }
+ }();
- if (availChartContext.data.length > 0) {
- draw(availChartContext);
+ if (availChartContext.data !== undefined && availChartContext.data.length > 0) {
+ availabilityGraph.draw(availChartContext);
}
- console.timeEnd("availabilityChart");
- console.groupEnd("AvailabilityChart");
- }-*/;
+ }-*/;
public String getChartId() {
return String.valueOf(entityId);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
index 487d20c..b9222d0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricGraphData.java
@@ -69,9 +69,19 @@ public class MetricGraphData implements JsonMetricProducer {
private PageList<MeasurementOOBComposite> measurementOOBCompositeList;
private MeasurementOOBComposite lastOOB;
private Integer chartHeight;
+ private Boolean isPortalGraph;
+ /**
+ * WindowWidth is used in determining what size graph to display in the dashboard portlets.
+ */
+ private Integer windowWidth;
- public MetricGraphData() {
+ private MetricGraphData() {
+ isPortalGraph = true;
+
+ }
+ public static MetricGraphData createForDashboard(){
+ return new MetricGraphData();
}
/**
@@ -81,23 +91,45 @@ public class MetricGraphData implements JsonMetricProducer {
* @param def
* @param metricData
*/
- public MetricGraphData(int entityId, String entityName, MeasurementDefinition def,
- List<MeasurementDataNumericHighLowComposite> metricData) {
+ private MetricGraphData(int entityId, String entityName, MeasurementDefinition def,
+ List<MeasurementDataNumericHighLowComposite> metricData, Integer windowWidth) {
this.entityName = entityName;
setEntityId(entityId);
setDefinitionId(def.getId());
this.definition = def;
this.metricData = metricData;
+ this.windowWidth = windowWidth;
+ this.isPortalGraph = false;
}
- public MetricGraphData(int entityId, String entityName, MeasurementDefinition measurementDef,
- List<MeasurementDataNumericHighLowComposite> metrics, PageList<MeasurementOOBComposite> measurementOOBCompositeList) {
+ public static MetricGraphData createForResourceGroup(int groupId, String groupName, MeasurementDefinition def,
+ List<MeasurementDataNumericHighLowComposite> metricData,
+ Integer windowWidth){
+ return new MetricGraphData(groupId,groupName,def, metricData, windowWidth);
+ }
+
+ private MetricGraphData(int entityId, String entityName, MeasurementDefinition measurementDef,
+ List<MeasurementDataNumericHighLowComposite> metrics,
+ PageList<MeasurementOOBComposite> measurementOOBCompositeList, Integer windowWidth) {
this.entityName = entityName;
setEntityId(entityId);
setDefinitionId(measurementDef.getId());
this.definition = measurementDef;
this.metricData = metrics;
this.measurementOOBCompositeList = measurementOOBCompositeList;
+ this.windowWidth = windowWidth;
+ this.isPortalGraph = false;
+ }
+
+ public static MetricGraphData createForResource(int resourceId, String resourceName, MeasurementDefinition measurementDef,
+ List<MeasurementDataNumericHighLowComposite> metrics,
+ PageList<MeasurementOOBComposite> measurementOOBCompositeList,
+ Integer windowWidth){
+ return new MetricGraphData(resourceId, resourceName,measurementDef, metrics, measurementOOBCompositeList, windowWidth);
+ }
+
+ public Integer getWindowWidth() {
+ return windowWidth;
}
public int getEntityId() {
@@ -133,7 +165,7 @@ public class MetricGraphData implements JsonMetricProducer {
}
public String getChartId() {
- return entityId + "-" + definitionId;
+ return entityId + "-" + definitionId;
}
@@ -211,6 +243,10 @@ public class MetricGraphData implements JsonMetricProducer {
this.chartHeight = chartHeight;
}
+ public Boolean isPortalGraph() {
+ return isPortalGraph;
+ }
+
public String getChartTitle() {
return (entityName == null) ? definition.getDisplayName() : entityName + " - "+definition.getDisplayName();
@@ -371,6 +407,8 @@ public class MetricGraphData implements JsonMetricProducer {
return returnValue;
}
+
+
/**
* If there is more than 2 days time window then return true so we can show day of week
* in axis labels. Function to switch the timescale to whichever is more appropriate hours
@@ -400,12 +438,13 @@ public class MetricGraphData implements JsonMetricProducer {
sb.append(", chartHoverEndLabel='").append(chartHoverEndLabel).append('\'');
sb.append(", chartHoverPeriodLabel='").append(chartHoverPeriodLabel).append('\'');
sb.append(", chartHoverBarLabel='").append(chartHoverBarLabel).append('\'');
+ sb.append(", chartHoverTimeFormat='").append(chartHoverTimeFormat).append('\'');
+ sb.append(", chartHoverDateFormat='").append(chartHoverDateFormat).append('\'');
sb.append(", entityId=").append(entityId);
sb.append(", entityName='").append(entityName).append('\'');
sb.append(", definitionId=").append(definitionId);
- sb.append(", adjustedMeasurementUnits=").append(adjustedMeasurementUnits);
- sb.append(", definition=").append(definition);
- sb.append(", chartHeight=").append(chartHeight);
+ sb.append(", isPortalGraph=").append(isPortalGraph);
+ sb.append(", windowWidth=").append(windowWidth);
sb.append('}');
return sb.toString();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 4154262..33e1279 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -46,27 +46,29 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// create a chartContext object (from rhq.js) with the data required to render to a chart
// this same data could be passed to different chart types
// This way, we are decoupled from the dependency on globals and JSNI and kept all the java interaction right here.
- chartContext = new $wnd.ChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartId()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHeight()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getJsonMetrics()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getXAxisTitle()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitle()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getYAxisUnits()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleMinLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleAvgLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitlePeakLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartDateLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTimeLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartDownLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartUnknownLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartNoDataLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverStartLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverEndLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverPeriodLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverBarLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverTimeFormat()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverDateFormat()()
- );
+ chartContext = new $wnd.ChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartId()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHeight()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getJsonMetrics()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getXAxisTitle()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitle()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getYAxisUnits()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleMinLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitleAvgLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTitlePeakLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartDateLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartTimeLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartDownLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartUnknownLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartNoDataLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverStartLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverEndLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverPeriodLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverBarLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverTimeFormat()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getChartHoverDateFormat()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::isPortalGraph()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::getWindowWidth()()
+ );
// Define the Stacked Bar Graph function using the module pattern
@@ -78,79 +80,136 @@ public final class MetricStackedBarGraph extends AbstractGraph {
width = 750 - margin.left - margin.right,
adjustedChartHeight = chartContext.chartHeight - 50,
height = adjustedChartHeight - margin.top - margin.bottom,
+ smallChartThresholdInPixels = 600,
titleHeight = 30, titleSpace = 10,
barOffset = 2,
+ chartData,
interpolation = "basis",
- avg = $wnd.d3.mean(chartContext.data.map(function (d) {
- return d.y;
- })),
- peak = $wnd.d3.max(chartContext.data.map(function (d) {
- if(d.high != undefined){
- return d.high;
- }else {
- return 0;
- }
- })),
- min = $wnd.d3.min(chartContext.data.map(function (d) {
- if(d.low != undefined){
- return d.low;
- } else {
- return Number.MAX_VALUE;
- }
- })),
- timeScale = $wnd.d3.time.scale()
- .range([0, width])
- .domain($wnd.d3.extent(chartContext.data, function (d) {
- return d.x;
- })),
-
- // adjust the min scale so blue low line is not in axis
- determineLowBound = function (min, peak) {
- var newLow = min - ((peak - min) * 0.1);
- if (newLow < 0) {
- return 0;
- }
- else {
- return newLow;
- }
- },
- lowBound = determineLowBound(min, peak),
- highBound = peak + ((peak - min) * 0.1),
- calcBarWidth = function(){
- return (width / chartContext.data.length - barOffset )
- },
-
- yScale = $wnd.d3.scale.linear()
- .clamp(true)
- .rangeRound([height, 0])
- .domain([lowBound, highBound]),
+ avg, min, peak,
+ oobMax,
+ determineLowBound,
+ lowBound,
+ highBound,
+ calcBarWidth,
+ yScale,
+ yAxis,
+ timeScale,
+ xAxis,
+ chart,
+ svg;
+
+ function getChartWidth() {
+ return $wnd.jQuery(chartContext.chartSelection).width();
+ }
- xAxis = $wnd.d3.svg.axis()
- .scale(timeScale)
- .ticks(12)
- .tickSubdivide(5)
- .tickSize(4, 4, 0)
- .orient("bottom"),
+ function useSmallCharts() {
+ return getChartWidth() <= smallChartThresholdInPixels;
+ }
- yAxis = $wnd.d3.svg.axis()
- .scale(yScale)
- .tickSubdivide(1)
- .ticks(5)
- .tickSize(4, 4, 0)
- .orient("left"),
+ function determineScale() {
+ var xTicks, xTickSubDivide, numberOfBarsForSmallGraph = 20;
+ // if window is too small server up small chart
+ if (useSmallCharts()) {
+ console.info("Using Small Charts Profile");
+ width = 250;
+ xTicks = 3;
+ xTickSubDivide = 2;
+ chartData = chartContext.data.slice(chartContext.data.length - numberOfBarsForSmallGraph, chartContext.data.length - 1);
+ }
+ else {
+ console.info("Using Large Charts Profile");
+ // we use the width already defined above
+ xTicks = 12;
+ xTickSubDivide = 5;
+ chartData = chartContext.data;
+ }
- // create the actual chart group
- chart = $wnd.d3.select(chartContext.chartSelection),
+ avg = $wnd.d3.mean(chartContext.data.map(function (d) {
+ return d.y;
+ }));
+ peak = $wnd.d3.max(chartContext.data.map(function (d) {
+ if (d.high != undefined) {
+ return d.high;
+ }
+ else {
+ return 0;
+ }
+ }));
+ min = $wnd.d3.min(chartContext.data.map(function (d) {
+ if (d.low != undefined) {
+ return d.low;
+ }
+ else {
+ return Number.MAX_VALUE;
+ }
+ }));
+ // adjust the min scale so blue low line is not in axis
+ determineLowBound = function (min, peak) {
+ var newLow = min - ((peak - min) * 0.1);
+ if (newLow < 0) {
+ return 0;
+ }
+ else {
+ return newLow;
+ }
+ };
+ lowBound = determineLowBound(min, peak);
+ highBound = peak + ((peak - min) * 0.1);
+ oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
+ if (d.baselineMax == undefined) {
+ return 0;
+ }
+ else {
+ return +d.baselineMax;
+ }
+ }));
+ calcBarWidth = function () {
+ return (width / chartData.length - barOffset )
+ };
+
+ yScale = $wnd.d3.scale.linear()
+ .clamp(true)
+ .rangeRound([height, 0])
+ .domain([lowBound, highBound]);
+ yAxis = $wnd.d3.svg.axis()
+ .scale(yScale)
+ .tickSubdivide(1)
+ .ticks(5)
+ .tickSize(4, 4, 0)
+ .orient("left");
+
+
+ timeScale = $wnd.d3.time.scale()
+ .range([0, width])
+ .domain($wnd.d3.extent(chartData, function (d) {
+ return d.x;
+ }));
+
+ xAxis = $wnd.d3.svg.axis()
+ .scale(timeScale)
+ .ticks(xTicks)
+ .tickSubdivide(xTickSubDivide)
+ .tickSize(4, 4, 0)
+ .orient("bottom");
+
+ // create the actual chart group
+ chart = $wnd.d3.select(chartContext.chartSelection);
+
+ svg = chart.append("g")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom)
+ .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")");
+
+ if (!useSmallCharts()) {
+ createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits);
+ }
- svg = chart.append("g")
- .attr("width", width + margin.left + margin.right)
- .attr("height", height + margin.top - titleHeight - titleSpace + margin.bottom)
- .attr("transform", "translate(" + margin.left + "," + (+titleHeight + titleSpace + margin.top) + ")");
+ }
- function createMinAvgPeakSidePanel( minLabel, minValue, avgLabel, avgValue, highLabel, highValue, uom ){
- var xLabel = 772,
+ function createMinAvgPeakSidePanel(minLabel, minValue, avgLabel, avgValue, highLabel, highValue, uom) {
+ var xLabel = 772,
xValue = 820,
yBase = 100,
yInc = 25,
@@ -159,7 +218,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// title/header
chart.append("g").append("rect")
.attr("class", "rightSidePanel")
- .attr("x", xLabel -10)
+ .attr("x", xLabel - 10)
.attr("y", margin.top + 60)
.attr("height", 100)
.attr("width", 135)
@@ -177,7 +236,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("class", "highText")
.attr("x", xValue)
.attr("y", yBase)
- .text(highValue.toFixed(decimalPlaces) + " "+ uom);
+ .text(highValue.toFixed(decimalPlaces) + " " + uom);
//avg
@@ -191,8 +250,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("class", "avgText")
.attr("x", xValue)
.attr("y", yBase + yInc)
- .text(avgValue.toFixed(decimalPlaces) + " "+uom);
-
+ .text(avgValue.toFixed(decimalPlaces) + " " + uom);
// min
@@ -206,13 +264,13 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("class", "minText")
.attr("x", xValue)
.attr("y", yBase + 2 * yInc)
- .text(minValue.toFixed(decimalPlaces)+ " "+uom);
+ .text(minValue.toFixed(decimalPlaces) + " " + uom);
}
- function createHeader(titleName ){
- var title = chart.append("g").append("rect")
+ function createHeader(titleName) {
+ var title = chart.append("g").append("rect")
.attr("class", "title")
.attr("x", 10)
.attr("y", margin.top)
@@ -241,7 +299,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// The gray bars at the bottom leading up
svg.selectAll("rect.leaderBar")
- .data(chartContext.data)
+ .data(chartData)
.enter().append("rect")
.attr("class", "leaderBar")
.attr("x", function (d) {
@@ -280,7 +338,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// upper portion representing avg to high
svg.selectAll("rect.high")
- .data(chartContext.data)
+ .data(chartData)
.enter().append("rect")
.attr("class", "high")
.attr("x", function (d) {
@@ -300,7 +358,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
.attr("width", function () {
return calcBarWidth();
})
- .attr("data-rhq-value", function(d){
+ .attr("data-rhq-value", function (d) {
return d.y;
})
.attr("opacity", 0.9);
@@ -308,7 +366,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// lower portion representing avg to low
svg.selectAll("rect.low")
- .data(chartContext.data)
+ .data(chartData)
.enter().append("rect")
.attr("class", "low")
.attr("x", function (d) {
@@ -332,23 +390,24 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// if high == low put a "cap" on the bar to show non-aggregated bar
svg.selectAll("rect.singleValue")
- .data(chartContext.data)
+ .data(chartData)
.enter().append("rect")
.attr("class", "singleValue")
.attr("x", function (d) {
return timeScale(d.x);
})
.attr("y", function (d) {
- return isNaN(d.y) ? height : yScale(d.y)-2;
+ return isNaN(d.y) ? height : yScale(d.y) - 2;
})
.attr("height", function (d) {
if (d.down || d.unknown || d.nodata) {
return height - yScale(lowBound);
}
else {
- if(d.low === d.high ){
- return yScale(d.low) - yScale(d.y) +2;
- }else {
+ if (d.low === d.high) {
+ return yScale(d.low) - yScale(d.y) + 2;
+ }
+ else {
return yScale(d.low) - yScale(d.y);
}
}
@@ -358,11 +417,12 @@ public final class MetricStackedBarGraph extends AbstractGraph {
})
.attr("opacity", 0.9)
.attr("fill", function (d) {
- if(d.low === d.high ){
- return "#50505a";
- }else {
- return "#70c4e2";
- }
+ if (d.low === d.high) {
+ return "#50505a";
+ }
+ else {
+ return "#70c4e2";
+ }
});
console.timeEnd("stackedBars");
}
@@ -406,26 +466,27 @@ public final class MetricStackedBarGraph extends AbstractGraph {
function createAvgLines() {
console.time("drawAvgLine");
var showBarAvgTrendline =
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::showBarAvgTrendLine()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph::showBarAvgTrendLine()(),
barAvgLine = $wnd.d3.svg.line()
.interpolate("linear")
- .defined(function(d){
- return !d.nodata ;
+ .defined(function (d) {
+ return !d.nodata;
})
.x(function (d) {
- return timeScale(d.x)+ ((width / chartContext.data.length - barOffset)/ 2);
+ return timeScale(d.x) + (calcBarWidth() / 2);
})
.y(function (d) {
- if(showBarAvgTrendline){
+ if (showBarAvgTrendline) {
return yScale(d.y);
- }else {
+ }
+ else {
return yScale(0);
}
});
// Bar avg line
svg.append("path")
- .datum(chartContext.data)
+ .datum(chartData)
.attr("class", "barAvgLine")
.attr("fill", "none")
.attr("stroke", "#2e376a")
@@ -436,28 +497,28 @@ public final class MetricStackedBarGraph extends AbstractGraph {
console.timeEnd("drawAvgLine");
}
- function createOOBLines(){
+ function createOOBLines() {
- var minBaselineLine = $wnd.d3.svg.line()
- .interpolate(interpolation)
- .x(function (d) {
- return timeScale(d.x);
- })
- .y(function (d) {
- return yScale(d.baselineMin);
- }),
- maxBaselineLine = $wnd.d3.svg.line()
- .interpolate(interpolation)
- .x(function (d) {
- return timeScale(d.x);
- })
- .y(function (d) {
- return yScale(d.baselineMax);
- });
+ var minBaselineLine = $wnd.d3.svg.line()
+ .interpolate(interpolation)
+ .x(function (d) {
+ return timeScale(d.x);
+ })
+ .y(function (d) {
+ return yScale(d.baselineMin);
+ }),
+ maxBaselineLine = $wnd.d3.svg.line()
+ .interpolate(interpolation)
+ .x(function (d) {
+ return timeScale(d.x);
+ })
+ .y(function (d) {
+ return yScale(d.baselineMax);
+ });
// min baseline Line
svg.append("path")
- .datum(chartContext.data)
+ .datum(chartData)
.attr("class", "minBaselineLine")
.attr("fill", "none")
.attr("stroke", "purple")
@@ -468,7 +529,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// max baseline Line
svg.append("path")
- .datum(chartContext.data)
+ .datum(chartData)
.attr("class", "maxBaselineLine")
.attr("fill", "none")
.attr("stroke", "orange")
@@ -486,19 +547,19 @@ public final class MetricStackedBarGraph extends AbstractGraph {
barDuration = d.barDuration,
timeFormatter = $wnd.d3.time.format(chartContext.chartHoverTimeFormat),
dateFormatter = $wnd.d3.time.format(chartContext.chartHoverDateFormat),
- highValue = d.high.toFixed(2),
- lowValue = d.low.toFixed(2),
- avgValue = d.y.toFixed(2);
+ highValue = d.high.toFixed(2),
+ lowValue = d.low.toFixed(2),
+ avgValue = d.y.toFixed(2);
// our special condition to indicate no data because avg lines dont like discontinuous data
- if (d.y === 0 && d.high === 0 && d.low === 0 ) {
+ if (d.y === 0 && d.high === 0 && d.low === 0) {
// no data
hoverString =
'<div class="chartHoverEnclosingDiv"><span class="chartHoverTimeLabel" >' + chartContext.timeLabel + ': </span>' + timeFormatter(date) +
'<div class="chartHoverAlignLeft"><span class="chartHoverDateLabel">' + chartContext.dateLabel + ': </span>' + dateFormatter(date) + '</div>' +
'<hr class="chartHoverDivider" ></hr>' +
- '<div class="chartHoverAlignRight"><span class="chartHoverLabelSpan">'+chartContext.noDataLabel+'</span></div>' +
+ '<div class="chartHoverAlignRight"><span class="chartHoverLabelSpan">' + chartContext.noDataLabel + '</span></div>' +
'</div>';
@@ -508,7 +569,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
hoverString =
'<div class="chartHoverEnclosingDiv"><span class="chartHoverTimeLabel">' + chartContext.timeLabel + ': </span><span style="width:50px;">' + timeFormatter(date) + '</span>' +
'<div class="chartHoverAlignLeft"><span class="chartHoverDateLabel">' + chartContext.dateLabel + ': </span><span style="width:50px;">' + dateFormatter(date) + '</span></div>' +
- '<div class="chartHoverAlignLeft"><span class="chartHoverLabelSpan">'+chartContext.hoverBarLabel+": "+ barDuration + '</span></div>' +
+ '<div class="chartHoverAlignLeft"><span class="chartHoverLabelSpan">' + chartContext.hoverBarLabel + ": " + barDuration + '</span></div>' +
'<hr class="chartHoverDivider"></hr>' +
'<div class="chartHoverAlignRight"><span id="chartHoverPeakValue" >' + chartContext.peakChartTitle + ': </span><span style="width:50px;">' + highValue + '</span></div>' +
'<div class="chartHoverAlignRight"><span id="chartHoverAvgValue" >' + chartContext.avgChartTitle + ': </span><span style="width:50px;">' + avgValue + '</span></div>' +
@@ -520,7 +581,6 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
function createHovers(chartContext) {
- //console.log("Create Hovers");
$wnd.jQuery('svg rect.leaderBar, svg rect.high, svg rect.low, svg rect.singleValue').tipsy({
gravity: 'w',
html: true,
@@ -529,9 +589,8 @@ public final class MetricStackedBarGraph extends AbstractGraph {
var d = this.__data__;
return formatHovers(chartContext, d);
},
- show: function (e, el)
- {
- el.css({ 'z-index':'990000'})
+ show: function (e, el) {
+ el.css({ 'z-index': '990000'})
}
});
}
@@ -540,25 +599,18 @@ public final class MetricStackedBarGraph extends AbstractGraph {
// Public API
draw: function (chartContext) {
"use strict";
- console.group("Creating Chart: %s --> %s",chartContext.chartSelection, chartContext.chartTitle);
+ console.group("Creating Chart: %s --> %s", chartContext.chartSelection, chartContext.chartTitle);
console.time("chart");
- //console.log("Json Data:\n"+chartContext.data);
- var oobMax = $wnd.d3.max(chartContext.data.map(function (d) {
- if(d.baselineMax == undefined){
- return 0;
- } else {
- return +d.baselineMax;
- }
- }));
+ determineScale();
createHeader(chartContext.chartTitle);
- createMinAvgPeakSidePanel(chartContext.minChartTitle, min, chartContext.avgChartTitle, avg, chartContext.peakChartTitle, peak, chartContext.yAxisUnits );
+
createYAxisGridLines();
createStackedBars();
createXandYAxes();
createAvgLines();
- if(oobMax > 0){
- console.info("Has OOB Data!");
+ if (oobMax > 0) {
+ console.info("OOB Data Exists!");
createOOBLines();
}
createHovers(chartContext);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
index 47b9c5d..d49b533 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
@@ -182,8 +182,8 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView {
private void buildIndividualGraph(MeasurementDefinition measurementDefinition,
List<MeasurementDataNumericHighLowComposite> data) {
- MetricGraphData metricGraphData = new MetricGraphData(resourceGroup.getId(), resourceGroup.getName(),
- measurementDefinition, data);
+ MetricGraphData metricGraphData = MetricGraphData.createForResourceGroup(resourceGroup.getId(),
+ resourceGroup.getName(), measurementDefinition, data, getWidth());
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
index fc082b8..815aeed 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricD3GraphView.java
@@ -126,9 +126,6 @@ public class ResourceGroupMetricD3GraphView extends AbstractMetricD3GraphView {
graph.drawJsniChart();
}
- @Override
- protected boolean supportsLiveGraphViewDialog() {
- return false;
- }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
index 38c394a..2b6a2f2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
@@ -64,6 +64,8 @@ import org.rhq.enterprise.gui.coregui.client.util.async.CountDownLatch;
public class D3GraphListView extends AbstractD3GraphListView {
private static int NUM_ASYNC_CALLS = 2; // wait for X async calls in Latch
+ private static int SINGLE_CHART_HEIGHT = 225;
+ private static int MULTI_CHART_HEIGHT = 195;
private Resource resource;
private Set<Integer> definitionIds = null;
@@ -339,7 +341,7 @@ public class D3GraphListView extends AbstractD3GraphListView {
for (MeasurementDefinition measurementDefinition : measurementDefinitions) {
if (summaryIds.contains(measurementDefinition.getId())) {
buildSingleGraph(measurementOOBCompositeList, measurementDefinition,
- measurementData.get(i), 225);
+ measurementData.get(i), MULTI_CHART_HEIGHT);
}
i++;
}
@@ -358,11 +360,11 @@ public class D3GraphListView extends AbstractD3GraphListView {
if (null != selectedDefinitionId) {
// single graph case
if (measurementId == selectedDefinitionId) {
- buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, 225);
+ buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, SINGLE_CHART_HEIGHT);
}
} else {
// multiple graph case
- buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, 225);
+ buildSingleGraph(measurementOOBCompositeList, measurementDefinition, metric, MULTI_CHART_HEIGHT);
}
}
i++;
@@ -375,8 +377,8 @@ public class D3GraphListView extends AbstractD3GraphListView {
private void buildSingleGraph(PageList<MeasurementOOBComposite> measurementOOBCompositeList,
MeasurementDefinition measurementDefinition, List<MeasurementDataNumericHighLowComposite> data, int height) {
- MetricGraphData metricGraphData = new MetricGraphData(resource.getId(), resource.getName(),
- measurementDefinition, data, measurementOOBCompositeList);
+ MetricGraphData metricGraphData = MetricGraphData.createForResource(resource.getId(), resource.getName(),
+ measurementDefinition, data, measurementOOBCompositeList, getWidth());
MetricStackedBarGraph graph = new MetricStackedBarGraph(metricGraphData);
ResourceMetricD3Graph graphView = new ResourceMetricD3Graph(graph);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
index b56f907..036237b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricD3Graph.java
@@ -23,7 +23,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.Abstract
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.HasD3MetricJsniChart;
/**
- * A D3 graph implementation for graphing metrics.
+ * A D3 graph implementation for graphing Resource metrics.
*/
public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
@@ -40,10 +40,7 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
super(graph);
}
- @Override
- protected boolean supportsLiveGraphViewDialog() {
- return true;
- }
+
@Override
/**
@@ -58,8 +55,5 @@ public class ResourceMetricD3Graph extends AbstractMetricD3GraphView {
return graph;
}
- @Override
- protected void displayLiveGraphViewDialog() {
- LiveGraphD3View.displayAsDialog(graph.getEntityId(), graph.getDefinition());
- }
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java
index b7c0d05..fbbdc9d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java
@@ -51,4 +51,5 @@ public class BrowserUtility {
}
return false;
}-*/;
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
index 5156136..f863ab0 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js
@@ -9,7 +9,7 @@
* A ChartContext can be passed to multiple chart renders to display different chart types
* of that data.
*/
-var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat)
+var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel,hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, windowWidth )
{
"use strict";
if(!(this instanceof ChartContext)){
@@ -37,6 +37,8 @@ var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, char
this.hoverBarLabel = hoverBarLabel;
this.chartHoverTimeFormat = chartHoverTimeFormat;
this.chartHoverDateFormat = chartHoverDateFormat;
+ this.isPortalGraph = isPortalGraph;
+ this.windowWidth = windowWidth;
},
AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverEndLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat) {
commit a2a52b67443775c534d40781cfd62c47e2849049
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Wed Mar 20 15:45:31 2013 -0700
[BZ 921022] - Small Width Dashboard charts overflow.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
index 4b54ae9..68bc34b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/resource/graph/ResourceD3GraphPortlet.java
@@ -89,7 +89,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
@Override
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
- Log.debug("\nResourceD3GraphPortlet Configure !!");
+ Log.debug("\nResourceD3GraphPortlet Configure");
if (null == this.portletWindow && null != portletWindow) {
this.portletWindow = portletWindow;
@@ -272,7 +272,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
@Override
public void redraw() {
- Log.debug("Redraw Portlet Graph and set data");
+ Log.debug("Redraw Portlet Graph and set data, width: "+portletWindow.getWidth());
DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
PropertySimple simple = storedPortlet.getConfiguration().getSimple(CFG_RESOURCE_ID);
@@ -284,7 +284,7 @@ public class ResourceD3GraphPortlet extends ResourceMetricD3Graph implements Aut
graph.getMetricGraphData().setEntityId(simple.getIntegerValue());
PropertySimple simpleDefId = storedPortlet.getConfiguration().getSimple(CFG_DEFINITION_ID);
graph.getMetricGraphData().setDefinitionId(simpleDefId.getIntegerValue());
- Log.debug(" *** Redraw Portlet for entityId: " + simple.getIntegerValue() + "-"
+ Log.debug("Redraw Portlet for entityId: " + simple.getIntegerValue() + "-"
+ simpleDefId.getIntegerValue());
drawGraph();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
index 83bda53..eedbd30 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricD3GraphView.java
@@ -20,11 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.common;
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.widgets.HTMLFlow;
-import com.smartgwt.client.widgets.Img;
-import com.smartgwt.client.widgets.events.ClickEvent;
-import com.smartgwt.client.widgets.events.ClickHandler;
-import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AbstractGraph;
import org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.MetricGraphData;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -40,9 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
*/
public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
- //protected HTMLFlow resourceTitle;
protected AbstractGraph graph;
- private Integer chartHeight;
private int entityId;
private int definitionId;
private HTMLFlow graphDiv = null;
@@ -145,7 +139,6 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
new Timer() {
@Override
public void run() {
- Log.debug("Scheduling Graph Rendering");
//@todo: this is a hack around timing issue of jsni not seeing the DOM
drawJsniChart();
}
@@ -158,26 +151,11 @@ public abstract class AbstractMetricD3GraphView extends EnhancedVLayout {
public abstract void drawJsniChart();
- private Img createLiveGraphImage() {
- Img liveGraph = new Img(IconEnum.RECENT_MEASUREMENTS.getIcon16x16Path(), 16, 16);
- liveGraph.setTooltip(MSG.view_resource_monitor_graph_live_tooltip());
-
- liveGraph.addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent clickEvent) {
- displayLiveGraphViewDialog();
- }
- });
- return liveGraph;
- }
public Integer getChartHeight() {
return graph.getMetricGraphData().getChartHeight();
}
- public void setChartHeight(Integer height) {
- graph.getMetricGraphData().setChartHeight(height);
- }
/**
* This is only necessary to set this for the ResourceGraphPortlet case where
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
index ba13f7e..969ba0f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/AvailabilityLineGraphType.java
@@ -107,147 +107,147 @@ public class AvailabilityLineGraphType {
*/
public native void drawJsniChart() /*-{
- console.groupCollapsed("AvailabilityChart");
- console.time("availabilityChart");
- var global = this,
-
- // tidy up all of our interactions with java (via JSNI) thru AvailChartContext class
- // NOTE: rhq.js has the javascript object constructors in it.
- availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartId()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getAvailabilityJson()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartDateLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartTimeLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverStartLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverEndLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverBarLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverAvailabilityLabel()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverTimeFormat()(),
- global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverDateFormat()()
- );
-
-
- function draw(availChartContext) {
- "use strict";
-
- var margin = {top: 5, right: 5, bottom: 5, left: 40},
- width = 750 - margin.left - margin.right,
- height = 20 - margin.top - margin.bottom,
- pixelsOffHeight = 0,
- UP = 4, DOWN = 3, UNKNOWN = 2, DISABLED = 1, WARN = 0,
- xAxisMin = $wnd.d3.min(availChartContext.data, function (d) {
- return +d.availStart;
- }),
- xAxisMax = $wnd.d3.max(availChartContext.data, function (d) {
- return +d.availEnd;
- }),
-
- timeScale = $wnd.d3.time.scale()
- .range([0, width])
- .domain([xAxisMin, xAxisMax]),
-
- yScale = $wnd.d3.scale.linear()
- .clamp(true)
- .rangeRound([height, 0])
- .domain([0, 4]),
-
- svg = $wnd.d3.select(availChartContext.chartSelection).append("g")
- .attr("width", width + margin.left + margin.right)
- .attr("height", height + margin.top + margin.bottom)
- .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
-
-
- // The gray bars at the bottom leading up
- svg.selectAll("rect.availBars")
- .data(availChartContext.data)
- .enter().append("rect")
- .attr("class", "availBars")
- .attr("x", function (d) {
- return timeScale(+d.availStart);
- })
- .attr("y", function (d) {
- return yScale(0);
- })
- .attr("height", function (d) {
- return height - yScale(4) - pixelsOffHeight;
- })
- .attr("width", function (d) {
- return timeScale(+d.availEnd) - timeScale(+d.availStart);
- })
-
- .attr("opacity", ".9")
- .attr("fill", function (d) {
- if (d.availType === 'DOWN') {
- return "#FF1919"; // red
- }
- else if (d.availType === 'DISABLED') {
- return "#FF9933"; // orange
- }
- else if (d.availType === 'UNKNOWN') {
- return "#CCC"; // gray
- }
- else if (d.availType === 'UP') {
- return "#198C19"; // green
- }
- else if (d.availType === 'WARN') {
- return "#FFFF00"; // yellow
- }
- else if (d.availType === 'EMPTY') {
- return "#CCC"; // gray
- }
- else {
- // should not ever happen, but...
- console.warn("AvailabilityType not valid.");
- return "#000"; //black
- }
- });
-
- createHovers();
-
- }
-
- function createHovers() {
- $wnd.jQuery('svg rect.availBars').tipsy({
- gravity: 'n',
- html: true,
- trigger: 'hover',
- title: function () {
- var d = this.__data__;
- return formatHovers(d);
- },
- show: function (e, el) {
- el.css({ 'z-index': '990000'})
- }
- });
- }
-
- function formatHovers(d) {
- var hoverString,
- timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat),
- dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat),
- availType = d.availType,
- availStart = new Date(+d.availStart),
- availEnd = new Date(+d.availEnd),
- availDuration = d.availDuration;
-
- hoverString =
- '<div class="chartHoverEnclosingDiv">' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' +
- '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' +
- '</div>';
- return hoverString;
-
- }
-
- if (availChartContext.data.length > 0) {
- draw(availChartContext);
- }
-
- console.timeEnd("availabilityChart");
- console.groupEnd("AvailabilityChart");
+ console.groupCollapsed("AvailabilityChart");
+ console.time("availabilityChart");
+ var global = this,
+
+ // tidy up all of our interactions with java (via JSNI) thru AvailChartContext class
+ // NOTE: rhq.js has the javascript object constructors in it.
+ availChartContext = new $wnd.AvailChartContext(global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartId()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getAvailabilityJson()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartDateLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartTimeLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverStartLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverEndLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverBarLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverAvailabilityLabel()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverTimeFormat()(),
+ global.@org.rhq.enterprise.gui.coregui.client.inventory.common.charttype.AvailabilityLineGraphType::getChartHoverDateFormat()()
+ );
+
+
+ function draw(availChartContext) {
+ "use strict";
+
+ var margin = {top: 5, right: 5, bottom: 5, left: 40},
+ width = 750 - margin.left - margin.right,
+ height = 20 - margin.top - margin.bottom,
+ pixelsOffHeight = 0,
+ UP = 4, DOWN = 3, UNKNOWN = 2, DISABLED = 1, WARN = 0,
+ xAxisMin = $wnd.d3.min(availChartContext.data, function (d) {
+ return +d.availStart;
+ }),
+ xAxisMax = $wnd.d3.max(availChartContext.data, function (d) {
+ return +d.availEnd;
+ }),
+
+ timeScale = $wnd.d3.time.scale()
+ .range([0, width])
+ .domain([xAxisMin, xAxisMax]),
+
+ yScale = $wnd.d3.scale.linear()
+ .clamp(true)
+ .rangeRound([height, 0])
+ .domain([0, 4]),
+
+ svg = $wnd.d3.select(availChartContext.chartSelection).append("g")
+ .attr("width", width + margin.left + margin.right)
+ .attr("height", height + margin.top + margin.bottom)
+ .attr("transform", "translate(" + margin.left + "," + margin.top + ")");
+
+
+ // The gray bars at the bottom leading up
+ svg.selectAll("rect.availBars")
+ .data(availChartContext.data)
+ .enter().append("rect")
+ .attr("class", "availBars")
+ .attr("x", function (d) {
+ return timeScale(+d.availStart);
+ })
+ .attr("y", function (d) {
+ return yScale(0);
+ })
+ .attr("height", function (d) {
+ return height - yScale(4) - pixelsOffHeight;
+ })
+ .attr("width", function (d) {
+ return timeScale(+d.availEnd) - timeScale(+d.availStart);
+ })
+
+ .attr("opacity", ".9")
+ .attr("fill", function (d) {
+ if (d.availType === 'DOWN') {
+ return "#FF1919"; // red
+ }
+ else if (d.availType === 'DISABLED') {
+ return "#FF9933"; // orange
+ }
+ else if (d.availType === 'UNKNOWN') {
+ return "#CCC"; // gray
+ }
+ else if (d.availType === 'UP') {
+ return "#198C19"; // green
+ }
+ else if (d.availType === 'WARN') {
+ return "#FFFF00"; // yellow
+ }
+ else if (d.availType === 'EMPTY') {
+ return "#CCC"; // gray
+ }
+ else {
+ // should not ever happen, but...
+ console.warn("AvailabilityType not valid.");
+ return "#000"; //black
+ }
+ });
+
+ createHovers();
+
+ }
+
+ function createHovers() {
+ $wnd.jQuery('svg rect.availBars').tipsy({
+ gravity: 'n',
+ html: true,
+ trigger: 'hover',
+ title: function () {
+ var d = this.__data__;
+ return formatHovers(d);
+ },
+ show: function (e, el) {
+ el.css({ 'z-index': '990000'})
+ }
+ });
+ }
+
+ function formatHovers(d) {
+ var hoverString,
+ timeFormatter = $wnd.d3.time.format(availChartContext.chartHoverTimeFormat),
+ dateFormatter = $wnd.d3.time.format(availChartContext.chartHoverDateFormat),
+ availType = d.availType,
+ availStart = new Date(+d.availStart),
+ availEnd = new Date(+d.availEnd),
+ availDuration = d.availDuration;
+
+ hoverString =
+ '<div class="chartHoverEnclosingDiv">' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarAvailabilityLabel + ': </span><span style="width:50px;">' + availType + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverStartLabel + ': </span><span style="width:50px;">' + timeFormatter(availStart) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availStart) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverEndLabel + ': </span><span style="width:50px;">' + timeFormatter(availEnd) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + ' </span><span style="width:50px;">' + dateFormatter(availEnd) + '</span></div>' +
+ '<div class="chartHoverAlignRight"><span >' + availChartContext.hoverBarLabel + ': </span><span style="width:50px;">' + availDuration + '</span></div>' +
+ '</div>';
+ return hoverString;
+
+ }
+
+ if (availChartContext.data.length > 0) {
+ draw(availChartContext);
+ }
+
+ console.timeEnd("availabilityChart");
+ console.groupEnd("AvailabilityChart");
}-*/;
public String getChartId() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
index 35f2932..4154262 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/charttype/MetricStackedBarGraph.java
@@ -116,6 +116,9 @@ public final class MetricStackedBarGraph extends AbstractGraph {
},
lowBound = determineLowBound(min, peak),
highBound = peak + ((peak - min) * 0.1),
+ calcBarWidth = function(){
+ return (width / chartContext.data.length - barOffset )
+ },
yScale = $wnd.d3.scale.linear()
.clamp(true)
@@ -261,7 +264,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
})
.attr("width", function () {
- return (width / chartContext.data.length - barOffset );
+ return calcBarWidth();
})
.attr("opacity", ".9")
@@ -295,7 +298,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
})
.attr("width", function () {
- return (width / chartContext.data.length - barOffset );
+ return calcBarWidth();
})
.attr("data-rhq-value", function(d){
return d.y;
@@ -323,7 +326,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
})
.attr("width", function () {
- return (width / chartContext.data.length - barOffset );
+ return calcBarWidth();
})
.attr("opacity", 0.9);
@@ -351,7 +354,7 @@ public final class MetricStackedBarGraph extends AbstractGraph {
}
})
.attr("width", function () {
- return (width / chartContext.data.length - barOffset );
+ return calcBarWidth();
})
.attr("opacity", 0.9)
.attr("fill", function (d) {
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
index df50d39..9a3404d 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
@@ -62,10 +62,15 @@
text-rendering: optimize-legibility;
}
-.titleName {
+.chartTitleName {
font-family: Arial, Verdana, sans-serif;
font-size: 12px;
font-weight: bold;
+ fill: #003168;
+}
+.chartTitleBox {
+ fill:none;
+
}
rect.high {
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/d3.layout.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/d3.layout.min.js
deleted file mode 100644
index 6704ca9..0000000
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/d3.layout.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){function a(a){var b=a.source,d=a.target,e=c(b,d),f=[b];while(b!==e)b=b.parent,f.push(b);var g=f.length;while(d!==e)f.splice(g,0,d),d=d.parent;return f}function b(a){var b=[],c=a.parent;while(c!=null)b.push(a),a=c,c=c.parent;return b.push(a),b}function c(a,c){if(a===c)return a;var d=b(a),e=b(c),f=d.pop(),g=e.pop(),h=null;while(f===g)h=f,f=d.pop(),g=e.pop();return h}function g(a){a.fixed|=2}function h(a){a!==f&&(a.fixed&=1)}function i(){j(),f.fixed&=1,e=f=null}function j(){f.px+=d3.event.dx,f.py+=d3.event.dy,e.resume()}function k(a,b,c){var d=0,e=0;a.charge=0;if(!a.leaf){var f=a.nodes,g=f.length,h=-1,i;while(++h<g){i=f[h];if(i==null)continue;k(i,b,c),a.charge+=i.charge,d+=i.charge*i.cx,e+=i.charge*i.cy}}if(a.point){a.leaf||(a.point.x+=Math.random()-.5,a.point.y+=Math.random()-.5);var j=b*c[a.point.index];a.charge+=a.pointCharge=j,d+=j*a.point.x,e+=j*a.point.y}a.cx=d/a.charge,a.cy=e/a.charge}function l(a){return 20}function m(a){return 1}function o(a){return a.x}fun
ction p(a){return a.y}function q(a,b,c){a.y0=b,a.y=c}function t(a){var b=1,c=0,d=a[0][1],e,f=a.length;for(;b<f;++b)(e=a[b][1])>d&&(c=b,d=e);return c}function u(a){return a.reduce(v,0)}function v(a,b){return a+b[1]}function w(a,b){return x(a,Math.ceil(Math.log(b.length)/Math.LN2+1))}function x(a,b){var c=-1,d=+a[0],e=(a[1]-d)/b,f=[];while(++c<=b)f[c]=e*c+d;return f}function y(a){return[d3.min(a),d3.max(a)]}function z(a,b){return a.sort=d3.rebind(a,b.sort),a.children=d3.rebind(a,b.children),a.links=D,a.value=d3.rebind(a,b.value),a.nodes=function(b){return E=!0,(a.nodes=a)(b)},a}function A(a){return a.children}function B(a){return a.value}function C(a,b){return b.value-a.value}function D(a){return d3.merge(a.map(function(a){return(a.children||[]).map(function(b){return{source:a,target:b}})}))}function F(a,b){return a.value-b.value}function G(a,b){var c=a._pack_next;a._pack_next=b,b._pack_prev=a,b._pack_next=c,c._pack_prev=b}function H(a,b){a._pack_next=b,b._pack_prev=a}function
I(a,b){var c=b.x-a.x,d=b.y-a.y,e=a.r+b.r;return e*e-c*c-d*d>.001}function J(a){function l(a){b=Math.min(a.x-a.r,b),c=Math.max(a.x+a.r,c),d=Math.min(a.y-a.r,d),e=Math.max(a.y+a.r,e)}var b=Infinity,c=-Infinity,d=Infinity,e=-Infinity,f=a.length,g,h,i,j,k;a.forEach(K),g=a[0],g.x=-g.r,g.y=0,l(g);if(f>1){h=a[1],h.x=h.r,h.y=0,l(h);if(f>2){i=a[2],O(g,h,i),l(i),G(g,i),g._pack_prev=i,G(i,h),h=g._pack_next;for(var m=3;m<f;m++){O(g,h,i=a[m]);var n=0,o=1,p=1;for(j=h._pack_next;j!==h;j=j._pack_next,o++)if(I(j,i)){n=1;break}if(n==1)for(k=g._pack_prev;k!==j._pack_prev;k=k._pack_prev,p++)if(I(k,i)){p<o&&(n=-1,j=k);break}n==0?(G(g,i),h=i,l(i)):n>0?(H(g,j),h=j,m--):(H(j,h),g=j,m--)}}}var q=(b+c)/2,r=(d+e)/2,s=0;for(var m=0;m<f;m++){var t=a[m];t.x-=q,t.y-=r,s=Math.max(s,t.r+Math.sqrt(t.x*t.x+t.y*t.y))}return a.forEach(L),s}function K(a){a._pack_next=a._pack_prev=a}function L(a){delete a._pack_next,delete a._pack_prev}function M(a){var b=a.children;b&&b.length?(b.forEach(M),a.r=J(b)):a.r=Math.s
qrt(a.value)}function N(a,b,c,d){var e=a.children;a.x=b+=d*a.x,a.y=c+=d*a.y,a.r*=d;if(e){var f=-1,g=e.length;while(++f<g)N(e[f],b,c,d)}}function O(a,b,c){var d=a.r+c.r,e=b.x-a.x,f=b.y-a.y;if(d&&(e||f)){var g=b.r+c.r,h=Math.sqrt(e*e+f*f),i=Math.max(-1,Math.min(1,(d*d+h*h-g*g)/(2*d*h))),j=Math.acos(i),k=i*(d/=h),l=Math.sin(j)*d;c.x=a.x+k*e+l*f,c.y=a.y+k*f-l*e}else c.x=a.x+d,c.y=a.y}function P(a){return 1+d3.max(a,function(a){return a.y})}function Q(a){return a.reduce(function(a,b){return a+b.x},0)/a.length}function R(a){var b=a.children;return b&&b.length?R(b[0]):a}function S(a){var b=a.children,c;return b&&(c=b.length)?S(b[c-1]):a}function T(a,b){return a.parent==b.parent?1:2}function U(a){var b=a.children;return b&&b.length?b[0]:a._tree.thread}function V(a){var b=a.children,c;return b&&(c=b.length)?b[c-1]:a._tree.thread}function W(a,b){var c=a.children;if(c&&(e=c.length)){var d,e,f=-1;while(++f<e)b(d=W(c[f],b),a)>0&&(a=d)}return a}function X(a,b){return a.x-b.x}function Y(a,
b){return b.x-a.x}function Z(a,b){return a.depth-b.depth}function $(a,b){function c(a,d){var e=a.children;if(e&&(i=e.length)){var f,g=null,h=-1,i;while(++h<i)f=e[h],c(f,g),g=f}b(a,d)}c(a,null)}function _(a){var b=0,c=0,d=a.children,e=d.length,f;while(--e>=0)f=d[e]._tree,f.prelim+=b,f.mod+=b,b+=f.shift+(c+=f.change)}function ba(a,b,c){a=a._tree,b=b._tree;var d=c/(b.number-a.number);a.change+=d,b.change-=d,b.shift+=c,b.prelim+=c,b.mod+=c}function bb(a,b,c){return a._tree.ancestor.parent==b.parent?a._tree.ancestor:c}function bc(a){return{x:a.x,y:a.y,dx:a.dx,dy:a.dy}}function bd(a,b){var c=a.x+b[3],d=a.y+b[0],e=a.dx-b[1]-b[3],f=a.dy-b[0]-b[2];return e<0&&(c+=e/2,e=0),f<0&&(d+=f/2,f=0),{x:c,y:d,dx:e,dy:f}}d3.layout={},d3.layout.bundle=function(){return function(b){var c=[],d=-1,e=b.length;while(++d<e)c.push(a(b[d]));return c}},d3.layout.chord=function(){function j(){var a={},j=[],l=d3.range(e),m=[],n,o,p,q,r;b=[],c=[],n=0,q=-1;while(++q<e){o=0,r=-1;while(++r<e)o+=d[q][r];j.push(o
),m.push(d3.range(e)),n+=o}g&&l.sort(function(a,b){return g(j[a],j[b])}),h&&m.forEach(function(a,b){a.sort(function(a,c){return h(d[b][a],d[b][c])})}),n=(2*Math.PI-f*e)/n,o=0,q=-1;while(++q<e){p=o,r=-1;while(++r<e){var s=l[q],t=m[s][r],u=d[s][t],v=o,w=o+=u*n;a[s+"-"+t]={index:s,subindex:t,startAngle:v,endAngle:w,value:u}}c.push({index:s,startAngle:p,endAngle:o,value:(o-p)/n}),o+=f}q=-1;while(++q<e){r=q-1;while(++r<e){var x=a[q+"-"+r],y=a[r+"-"+q];(x.value||y.value)&&b.push(x.value<y.value?{source:y,target:x}:{source:x,target:y})}}i&&k()}function k(){b.sort(function(a,b){return i((a.source.value+a.target.value)/2,(b.source.value+b.target.value)/2)})}var a={},b,c,d,e,f=0,g,h,i;return a.matrix=function(f){return arguments.length?(e=(d=f)&&d.length,b=c=null,a):d},a.padding=function(d){return arguments.length?(f=d,b=c=null,a):f},a.sortGroups=function(d){return arguments.length?(g=d,b=c=null,a):g},a.sortSubgroups=function(c){return arguments.length?(h=c,b=null,a):h},a.sortChords=f
unction(c){return arguments.length?(i=c,b&&k(),a):i},a.chords=function(){return b||j(),b},a.groups=function(){return c||j(),c},a},d3.layout.force=function(){function A(a){return function(b,c,d,e,f){if(b.point!==a){var g=b.cx-a.x,h=b.cy-a.y,i=1/Math.sqrt(g*g+h*h);if((e-c)*i<t){var j=b.charge*i*i;return a.px-=g*j,a.py-=h*j,!0}if(b.point&&isFinite(i)){var j=b.pointCharge*i*i;a.px-=g*j,a.py-=h*j}}return!b.charge}}function B(){var a=v.length,d=w.length,e,f,g,h,i,j,l,m,p;for(f=0;f<d;++f){g=w[f],h=g.source,i=g.target,m=i.x-h.x,p=i.y-h.y;if(j=m*m+p*p)j=n*y[f]*((j=Math.sqrt(j))-x[f])/j,m*=j,p*=j,i.x-=m*(l=h.weight/(i.weight+h.weight)),i.y-=p*l,h.x+=m*(l=1-l),h.y+=p*l}if(l=n*s){m=c[0]/2,p=c[1]/2,f=-1;if(l)while(++f<a)g=v[f],g.x+=(m-g.x)*l,g.y+=(p-g.y)*l}if(r){k(e=d3.geom.quadtree(v),n,z),f=-1;while(++f<a)(g=v[f]).fixed||e.visit(A(g))}f=-1;while(++f<a)g=v[f],g.fixed?(g.x=g.px,g.y=g.py):(g.x-=(g.px-(g.px=g.x))*o,g.y-=(g.py-(g.py=g.y))*o);return b.tick({type:"tick",alpha:n}),(n*=.99)<.00
5}function C(b){g(f=b),e=a}var a={},b=d3.dispatch("tick"),c=[1,1],d,n,o=.9,p=l,q=m,r=-30,s=.1,t=.8,u,v=[],w=[],x,y,z;return a.on=function(c,d){return b.on(c,d),a},a.nodes=function(b){return arguments.length?(v=b,a):v},a.links=function(b){return arguments.length?(w=b,a):w},a.size=function(b){return arguments.length?(c=b,a):c},a.linkDistance=function(b){return arguments.length?(p=d3.functor(b),a):p},a.distance=a.linkDistance,a.linkStrength=function(b){return arguments.length?(q=d3.functor(b),a):q},a.friction=function(b){return arguments.length?(o=b,a):o},a.charge=function(b){return arguments.length?(r=typeof b=="function"?b:+b,a):r},a.gravity=function(b){return arguments.length?(s=b,a):s},a.theta=function(b){return arguments.length?(t=b,a):t},a.start=function(){function k(a,c){var d=l(b),e=-1,f=d.length,g;while(++e<f)if(!isNaN(g=d[e][a]))return g;return Math.random()*c}function l(){if(!i){i=[];for(d=0;d<e;++d)i[d]=[];for(d=0;d<f;++d){var a=w[d];i[a.source.index].push(a.target)
,i[a.target.index].push(a.source)}}return i[b]}var b,d,e=v.length,f=w.length,g=c[0],h=c[1],i,j;for(b=0;b<e;++b)(j=v[b]).index=b,j.weight=0;x=[],y=[];for(b=0;b<f;++b)j=w[b],typeof j.source=="number"&&(j.source=v[j.source]),typeof j.target=="number"&&(j.target=v[j.target]),x[b]=p.call(this,j,b),y[b]=q.call(this,j,b),++j.source.weight,++j.target.weight;for(b=0;b<e;++b)j=v[b],isNaN(j.x)&&(j.x=k("x",g)),isNaN(j.y)&&(j.y=k("y",h)),isNaN(j.px)&&(j.px=j.x),isNaN(j.py)&&(j.py=j.y);z=[];if(typeof r=="function")for(b=0;b<e;++b)z[b]=+r.call(this,v[b],b);else for(b=0;b<e;++b)z[b]=r;return a.resume()},a.resume=function(){return n=.1,d3.timer(B),a},a.stop=function(){return n=0,a},a.drag=function(){d||(d=d3.behavior.drag().on("dragstart",C).on("drag",j).on("dragend",i)),this.on("mouseover.force",g).on("mouseout.force",h).call(d)},a};var e,f;d3.layout.partition=function(){function c(a,b,d,e){var f=a.children;a.x=b,a.y=a.depth*e,a.dx=d,a.dy=e;if(f&&(h=f.length)){var g=-1,h,i,j;d=a.value?d/a.v
alue:0;while(++g<h)c(i=f[g],b,j=i.value*d,e),b+=j}}function d(a){var b=a.children,c=0;if(b&&(f=b.length)){var e=-1,f;while(++e<f)c=Math.max(c,d(b[e]))}return 1+c}function e(e,f){var g=a.call(this,e,f);return c(g[0],0,b[0],b[1]/d(g[0])),g}var a=d3.layout.hierarchy(),b=[1,1];return e.size=function(a){return arguments.length?(b=a,e):b},z(e,a)},d3.layout.pie=function(){function f(g,h){var i=g.map(function(b,c){return+a.call(f,b,c)}),j=+(typeof c=="function"?c.apply(this,arguments):c),k=((typeof e=="function"?e.apply(this,arguments):e)-c)/d3.sum(i),l=d3.range(g.length);b!=null&&l.sort(b===n?function(a,b){return i[b]-i[a]}:function(a,c){return b(g[a],g[c])});var m=l.map(function(a){return{data:g[a],value:d=i[a],startAngle:j,endAngle:j+=d*k}});return g.map(function(a,b){return m[l[b]]})}var a=Number,b=n,c=0,e=2*Math.PI;return f.value=function(b){return arguments.length?(a=b,f):a},f.sort=function(a){return arguments.length?(b=a,f):b},f.startAngle=function(a){return arguments.length?
(c=a,f):c},f.endAngle=function(a){return arguments.length?(e=a,f):e},f};var n={};d3.layout.stack=function(){function g(h,i){var j=h.map(function(b,c){return a.call(g,b,c)}),k=j.map(function(a,b){return a.map(function(a,b){return[e.call(g,a,b),f.call(g,a,b)]})}),l=b.call(g,k,i);j=d3.permute(j,l),k=d3.permute(k,l);var m=c.call(g,k,i),n=j.length,o=j[0].length,p,q,r;for(q=0;q<o;++q){d.call(g,j[0][q],r=m[q],k[0][q][1]);for(p=1;p<n;++p)d.call(g,j[p][q],r+=k[p-1][q][1],k[p][q][1])}return h}var a=Object,b=r["default"],c=s.zero,d=q,e=o,f=p;return g.values=function(b){return arguments.length?(a=b,g):a},g.order=function(a){return arguments.length?(b=typeof a=="function"?a:r[a],g):b},g.offset=function(a){return arguments.length?(c=typeof a=="function"?a:s[a],g):c},g.x=function(a){return arguments.length?(e=a,g):e},g.y=function(a){return arguments.length?(f=a,g):f},g.out=function(a){return arguments.length?(d=a,g):d},g};var r={"inside-out":function(a){var b=a.length,c,d,e=a.map(t),f=a.ma
p(u),g=d3.range(b).sort(function(a,b){return e[a]-e[b]}),h=0,i=0,j=[],k=[];for(c=0;c<b;++c)d=g[c],h<i?(h+=f[d],j.push(d)):(i+=f[d],k.push(d));return k.reverse().concat(j)},reverse:function(a){return d3.range(a.length).reverse()},"default":function(a){return d3.range(a.length)}},s={silhouette:function(a){var b=a.length,c=a[0].length,d=[],e=0,f,g,h,i=[];for(g=0;g<c;++g){for(f=0,h=0;f<b;f++)h+=a[f][g][1];h>e&&(e=h),d.push(h)}for(g=0;g<c;++g)i[g]=(e-d[g])/2;return i},wiggle:function(a){var b=a.length,c=a[0],d=c.length,e=0,f,g,h,i,j,k,l,m,n,o=[];o[0]=m=n=0;for(g=1;g<d;++g){for(f=0,i=0;f<b;++f)i+=a[f][g][1];for(f=0,j=0,l=c[g][0]-c[g-1][0];f<b;++f){for(h=0,k=(a[f][g][1]-a[f][g-1][1])/(2*l);h<f;++h)k+=(a[h][g][1]-a[h][g-1][1])/l;j+=k*a[f][g][1]}o[g]=m-=i?j/i*l:0,m<n&&(n=m)}for(g=0;g<d;++g)o[g]-=n;return o},expand:function(a){var b=a.length,c=a[0].length,d=1/b,e,f,g,h=[];for(f=0;f<c;++f){for(e=0,g=0;e<b;e++)g+=a[e][f][1];if(g)for(e=0;e<b;e++)a[e][f][1]/=g;else for(e=0;e<b;e++)a[e][f]
[1]=d}for(f=0;f<c;++f)h[f]=0;return h},zero:function(a){var b=-1,c=a[0].length,d=[];while(++b<c)d[b]=0;return d}};d3.layout.histogram=function(){function e(e,f){var g=[],h=e.map(b,this),i=c.call(this,h,f),j=d.call(this,i,h,f),k,f=-1,l=h.length,m=j.length-1,n=a?1:1/l,o;while(++f<m)k=g[f]=[],k.dx=j[f+1]-(k.x=j[f]),k.y=0;f=-1;while(++f<l)o=h[f],o>=i[0]&&o<=i[1]&&(k=g[d3.bisect(j,o,1,m)-1],k.y+=n,k.push(e[f]));return g}var a=!0,b=Number,c=y,d=w;return e.value=function(a){return arguments.length?(b=a,e):b},e.range=function(a){return arguments.length?(c=d3.functor(a),e):c},e.bins=function(a){return arguments.length?(d=typeof a=="number"?function(b){return x(b,a)}:d3.functor(a),e):d},e.frequency=function(b){return arguments.length?(a=!!b,e):a},e},d3.layout.hierarchy=function(){function e(f,h,i){var j=b.call(g,f,h),k=E?f:{data:f};k.depth=h,i.push(k);if(j&&(m=j.length)){var l=-1,m,n=k.children=[],o=0,p=h+1;while(++l<m)d=e(j[l],p,i),d.parent=k,n.push(d),o+=d.value;a&&n.sort(a),c&&(k.v
alue=o)}else c&&(k.value=+c.call(g,f,h)||0);return k}function f(a,b){var d=a.children,e=0;if(d&&(i=d.length)){var h=-1,i,j=b+1;while(++h<i)e+=f(d[h],j)}else c&&(e=+c.call(g,E?a:a.data,b)||0);return c&&(a.value=e),e}function g(a){var b=[];return e(a,0,b),b}var a=C,b=A,c=B;return g.sort=function(b){return arguments.length?(a=b,g):a},g.children=function(a){return arguments.length?(b=a,g):b},g.value=function(a){return arguments.length?(c=a,g):c},g.revalue=function(a){return f(a,0),a},g};var E=!1;d3.layout.pack=function(){function c(c,d){var e=a.call(this,c,d),f=e[0];f.x=0,f.y=0,M(f);var g=b[0],h=b[1],i=1/Math.max(2*f.r/g,2*f.r/h);return N(f,g/2,h/2,i),e}var a=d3.layout.hierarchy().sort(F),b=[1,1];return c.size=function(a){return arguments.length?(b=a,c):b},z(c,a)},d3.layout.cluster=function(){function d(d,e){var f=a.call(this,d,e),g=f[0],h,i=0,j,k;$(g,function(a){var c=a.children;c&&c.length?(a.x=Q(c),a.y=P(c)):(a.x=h?i+=b(a,h):0,a.y=0,h=a)});var l=R(g),m=S(g),n=l.x-b(l,m)/2,o=m
.x+b(m,l)/2;return $(g,function(a){a.x=(a.x-n)/(o-n)*c[0],a.y=(1-a.y/g.y)*c[1]}),f}var a=d3.layout.hierarchy().sort(null).value(null),b=T,c=[1,1];return d.separation=function(a){return arguments.length?(b=a,d):b},d.size=function(a){return arguments.length?(c=a,d):c},z(d,a)},d3.layout.tree=function(){function d(d,e){function h(a,c){var d=a.children,e=a._tree;if(d&&(f=d.length)){var f,g=d[0],i,k=g,l,m=-1;while(++m<f)l=d[m],h(l,i),k=j(l,i,k),i=l;_(a);var n=.5*(g._tree.prelim+l._tree.prelim);c?(e.prelim=c._tree.prelim+b(a,c),e.mod=e.prelim-n):e.prelim=n}else c&&(e.prelim=c._tree.prelim+b(a,c))}function i(a,b){a.x=a._tree.prelim+b;var c=a.children;if(c&&(e=c.length)){var d=-1,e;b+=a._tree.mod;while(++d<e)i(c[d],b)}}function j(a,c,d){if(c){var e=a,f=a,g=c,h=a.parent.children[0],i=e._tree.mod,j=f._tree.mod,k=g._tree.mod,l=h._tree.mod,m;while(g=V(g),e=U(e),g&&e)h=U(h),f=V(f),f._tree.ancestor=a,m=g._tree.prelim+k-e._tree.prelim-i+b(g,e),m>0&&(ba(bb(g,a,d),a,m),i+=m,j+=m),k+=g._tree.m
od,i+=e._tree.mod,l+=h._tree.mod,j+=f._tree.mod;g&&!V(f)&&(f._tree.thread=g,f._tree.mod+=k-j),e&&!U(h)&&(h._tree.thread=e,h._tree.mod+=i-l,d=a)}return d}var f=a.call(this,d,e),g=f[0];$(g,function(a,b){a._tree={ancestor:a,prelim:0,mod:0,change:0,shift:0,number:b?b._tree.number+1:0}}),h(g),i(g,-g._tree.prelim);var k=W(g,Y),l=W(g,X),m=W(g,Z),n=k.x-b(k,l)/2,o=l.x+b(l,k)/2,p=m.depth||1;return $(g,function(a){a.x=(a.x-n)/(o-n)*c[0],a.y=a.depth/p*c[1],delete a._tree}),f}var a=d3.layout.hierarchy().sort(null).value(null),b=T,c=[1,1];return d.separation=function(a){return arguments.length?(b=a,d):b},d.size=function(a){return arguments.length?(c=a,d):c},z(d,a)},d3.layout.treemap=function(){function i(a,b){var c=-1,d=a.length,e,f;while(++c<d)f=(e=a[c]).value*(b<0?0:b),e.area=isNaN(f)||f<=0?0:f}function j(a){var b=a.children;if(b&&b.length){var c=e(a),d=[],f=b.slice(),g,h=Infinity,k,n=Math.min(c.dx,c.dy),o;i(f,c.dx*c.dy/a.value),d.area=0;while((o=f.length)>0)d.push(g=f[o-1]),d.area+=g.a
rea,(k=l(d,n))<=h?(f.pop(),h=k):(d.area-=d.pop().area,m(d,n,c,!1),n=Math.min(c.dx,c.dy),d.length=d.area=0,h=Infinity);d.length&&(m(d,n,c,!0),d.length=d.area=0),b.forEach(j)}}function k(a){var b=a.children;if(b&&b.length){var c=e(a),d=b.slice(),f,g=[];i(d,c.dx*c.dy/a.value),g.area=0;while(f=d.pop())g.push(f),g.area+=f.area,f.z!=null&&(m(g,f.z?c.dx:c.dy,c,!d.length),g.length=g.area=0);b.forEach(k)}}function l(a,b){var c=a.area,d,e=0,f=Infinity,g=-1,i=a.length;while(++g<i){if(!(d=a[g].area))continue;d<f&&(f=d),d>e&&(e=d)}return c*=c,b*=b,c?Math.max(b*e*h/c,c/(b*f*h)):Infinity}function m(a,c,d,e){var f=-1,g=a.length,h=d.x,i=d.y,j=c?b(a.area/c):0,k;if(c==d.dx){if(e||j>d.dy)j=j?d.dy:0;while(++f<g)k=a[f],k.x=h,k.y=i,k.dy=j,h+=k.dx=j?b(k.area/j):0;k.z=!0,k.dx+=d.x+d.dx-h,d.y+=j,d.dy-=j}else{if(e||j>d.dx)j=j?d.dx:0;while(++f<g)k=a[f],k.x=h,k.y=i,k.dx=j,i+=k.dy=j?b(k.area/j):0;k.z=!1,k.dy+=d.y+d.dy-i,d.x+=j,d.dx-=j}}function n(b){var d=g||a(b),e=d[0];return e.x=0,e.y=0,e.dx=c[0],e.dy=
c[1],g&&a.revalue(e),i([e],e.dx*e.dy/e.value),(g?k:j)(e),f&&(g=d),d}var a=d3.layout.hierarchy(),b=Math.round,c=[1,1],d=null,e=bc,f=!1,g,h=.5*(1+Math.sqrt(5));return n.size=function(a){return arguments.length?(c=a,n):c},n.padding=function(a){function b(b){var c=a.call(n,b,b.depth);return c==null?bc(b):bd(b,typeof c=="number"?[c,c,c,c]:c)}function c(b){return bd(b,a)}if(!arguments.length)return d;var f;return e=(d=a)==null?bc:(f=typeof a)==="function"?b:f==="number"?(a=[a,a,a,a],c):c,n},n.round=function(a){return arguments.length?(b=a?Math.round:Number,n):b!=Number},n.sticky=function(a){return arguments.length?(f=a,g=null,n):f},n.ratio=function(a){return arguments.length?(h=a,n):h},z(n,a)}})();
\ No newline at end of file
1
0
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest.java | 89 ++++++++++
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 1
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 4
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v1.xml | 22 ++
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v2.xml | 19 ++
5 files changed, 135 insertions(+)
New commits:
commit 0f7855df9a889910d6ef76f678b838fafbf76804
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Apr 2 22:05:06 2013 -0400
BZ 535289 - itest to see that plugin metadata update and plugin delete works if types are ignored
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest.java
new file mode 100644
index 0000000..5d51a2a
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest.java
@@ -0,0 +1,89 @@
+package org.rhq.enterprise.server.resource.metadata;
+
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
+import org.rhq.enterprise.server.util.LookupUtil;
+
+@Test(groups = { "plugin.metadata.ignoretypes" })
+public class MetadataUpdateWithIgnoredTypesTest extends MetadataBeanTest {
+
+ private static final String PLUGIN_NAME = "RemoveIgnoredTypesPlugin";
+
+ @Test
+ public void upgradePluginWithIgnoredTypes() throws Exception {
+ performTest(true);
+ }
+
+ // required cleanup
+ @Test(priority = 10, alwaysRun = true)
+ public void afterClassWorkTest() throws Exception {
+ afterClassWork();
+ }
+
+ private void performTest(boolean ignoreTypes) throws Exception {
+ createPlugin("remove-types-plugin", "1.0", "remove_types_v1.xml");
+
+ ignoreAndGetPersistedType("ServerA", ignoreTypes);
+ ignoreAndGetPersistedType("ServerA.Child1", ignoreTypes);
+ ignoreAndGetPersistedType("ServerB", ignoreTypes);
+ ignoreAndGetPersistedType("ServerB.Child1", ignoreTypes);
+ ignoreAndGetPersistedType("ServerB.GrandChild1", ignoreTypes);
+ ignoreAndGetPersistedType("ServerC", ignoreTypes);
+ ignoreAndGetPersistedType("ServerC.Child1", ignoreTypes);
+ ignoreAndGetPersistedType("ServerD", ignoreTypes);
+
+ createPlugin("remove-types-plugin", "2.0", "remove_types_v2.xml");
+
+ final String newDescription = "v2";
+ ResourceType serverA = getPersistedTypeAndAssert("ServerA", newDescription, ignoreTypes);
+ ResourceType serverA_Child1 = getPersistedTypeAndAssert("ServerA.Child1", newDescription, ignoreTypes);
+ ResourceType serverB = getPersistedTypeAndAssert("ServerB", newDescription, ignoreTypes);
+ assertTypeDeleted("ServerB.Child1");
+ ResourceType serverB_GrandChild1 = getPersistedTypeAndAssert("ServerB.GrandChild1", newDescription, ignoreTypes);
+ ResourceType serverC = getPersistedTypeAndAssert("ServerC", newDescription, ignoreTypes);
+ assertTypeDeleted("ServerC.Child1");
+ assertTypeDeleted("ServerD");
+ }
+
+ private ResourceType getPersistedTypeAndAssert(String typeName, String description, boolean isIgnored) {
+ ResourceType rt = ignoreAndGetPersistedType(typeName, false);
+ assertEquals(description, rt.getDescription());
+ assertEquals(isIgnored, rt.isIgnored());
+ return rt;
+ }
+
+ // this will ignore the resource type if "ignore" is true - if ignore is false, this just returns the type
+ private ResourceType ignoreAndGetPersistedType(String typeName, boolean ignore) {
+ ResourceTypeManagerLocal typeMgr = LookupUtil.getResourceTypeManager();
+
+ ResourceType rt = typeMgr.getResourceTypeByNameAndPlugin(typeName, PLUGIN_NAME);
+ if (rt == null) {
+ fail("The following type was not found: " + typeName);
+ }
+
+ if (ignore) {
+ SubjectManagerLocal subjectMgr = LookupUtil.getSubjectManager();
+ typeMgr.setResourceTypeIgnoreFlagAndUninventoryResources(subjectMgr.getOverlord(), rt.getId(), true);
+ rt = typeMgr.getResourceTypeByNameAndPlugin(typeName, PLUGIN_NAME);
+ if (rt == null) {
+ fail("Failed to reload type after ignoring it: " + typeName);
+ }
+ assert rt.isIgnored() : "Somehow the type didn't get ignored: " + rt;
+ }
+
+ return rt;
+ }
+
+ private void assertTypeDeleted(String typeName) {
+ ResourceTypeManagerLocal resourceTypeMgr = LookupUtil.getResourceTypeManager();
+ ResourceType rt = resourceTypeMgr.getResourceTypeByNameAndPlugin(typeName, PLUGIN_NAME);
+ if (rt != null) {
+ fail("The following type was supposed to be deleted: " + typeName);
+ }
+ return;
+ }
+
+}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
index 23e8efe..ac4ba79 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java
@@ -111,6 +111,7 @@ public class UpdatePluginMetadataTestBase extends AbstractEJB3Test {
ResourceTypeCriteria resourceTypeCriteria = new ResourceTypeCriteria();
resourceTypeCriteria.setStrict(true);
+ resourceTypeCriteria.addFilterIgnored(null);
resourceTypeCriteria.addFilterName(typeName);
resourceTypeCriteria.addFilterPluginName(pluginName);
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index 41acc0d..2b88ea8 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -217,6 +217,10 @@ public abstract class AbstractEJB3Test extends Arquillian {
.addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v1.xml");
testClassesJar
.addAsResource("org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_types_v2.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v1.xml");
+ testClassesJar
+ .addAsResource("org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v2.xml");
testClassesJar.addAsResource("perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip");
testClassesJar.addAsResource("serverplugins/simple-generic-serverplugin.xml");
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v1.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v1.xml
new file mode 100644
index 0000000..a58eb36
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v1.xml
@@ -0,0 +1,22 @@
+<plugin name="RemoveIgnoredTypesPlugin" displayName="Remove Ignored Types Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ServerA">
+ <service name="ServerA.Child1" />
+ </server>
+
+ <server name="ServerB">
+ <service name="ServerB.Child1">
+ <service name="ServerB.GrandChild1"/>
+ </service>
+ </server>
+
+ <server name="ServerC">
+ <service name="ServerC.Child1" />
+ </server>
+
+ <server name="ServerD" />
+
+</plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v2.xml b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v2.xml
new file mode 100644
index 0000000..becc9c1
--- /dev/null
+++ b/modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/MetadataUpdateWithIgnoredTypesTest/remove_types_v2.xml
@@ -0,0 +1,19 @@
+<plugin name="RemoveIgnoredTypesPlugin" displayName="Remove Ignored Types Plugin" package="org.rhq.plugins.test"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="urn:xmlns:rhq-plugin"
+ xmlns:c="urn:xmlns:rhq-configuration">
+
+ <server name="ServerA" description="v2">
+ <service name="ServerA.Child1" description="v2" />
+ </server>
+
+ <server name="ServerB" description="v2">
+ <service name="ServerB.GrandChild1" description="v2" /> <!-- moved up a level from v1 of the plugin .xml -->
+ </server>
+
+ <server name="ServerC" description="v2">
+ <!-- <service name="ServerC.Child1" /> --> <!-- removed from v1 of plugin .xml -->
+ </server>
+
+ <!-- <server name="ServerD" /> --> <!-- removed from v1 of plugin .xml -->
+</plugin>
\ No newline at end of file
1
0
modules/enterprise/server/jar/pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 365ca71c18082aed7433a4010fa196d0b9fdedb4
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Apr 2 16:58:28 2013 -0400
fixing ear build
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index b5189df..f3bfd7d 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -92,14 +92,14 @@
<dependency>
<groupId>org.rhq</groupId>
- <artifactId>rhq-cassandra-ccm-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
<artifactId>rhq-server-metrics</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hyperic</groupId>
+ <artifactId>sigar-dist</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
1
0
02 Apr '13
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java | 22
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 27 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java | 101 +---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java | 232 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java | 63 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 17
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 17
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 17
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 17
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 16
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 17
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 14
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 17
modules/enterprise/gui/coregui/src/main/webapp/css/charts.css | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 20
35 files changed, 431 insertions(+), 281 deletions(-)
New commits:
commit f2267c01565ac564f3bfde854d1b18491401cecc
Merge: 2aa0750 0e4fbbb
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Apr 2 16:19:45 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 2aa0750aee320537fc179a382195b4b27cd86f9b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Apr 2 16:19:21 2013 -0400
BZ 535289 - the default ignored filter in ResourceTypeCriteria is now "false" (as opposed to null).
This checkin adds explicit calls addFilterIgnored in places where it makes it more obvious what we want,
rather than rely on default behavior.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
index 07cd683..8553d08 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceTypeCriteria.java
@@ -55,10 +55,8 @@ public class ResourceTypeCriteria extends Criteria {
private Boolean filterSupportsManualAdd;
private String filterPluginName; // needs overrides
private Integer filterBundleTypeId; // needs overrides
- // by default, we don't want to fetch resource types that
- // are marked deleted
- private Boolean filterDeleted = false;
- private Boolean filterIgnored;
+ private Boolean filterDeleted = false; // by default, we don't want to fetch resource types that are marked deleted
+ private Boolean filterIgnored = false; // by default, we don't want to fetch types the user requested to be ignored
private Set<ResourceCategory> filterCategories; // needs overrides
private Boolean filterParentResourceTypesEmpty; // needs overrides
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
index 66589a8..676a95e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java
@@ -421,7 +421,7 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
*/
private void setOperationDropDownMenuValues(int resourceTypeId, final Integer selectedOpId, final Configuration args) {
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
- criteria.addFilterId(resourceTypeId);
+ criteria.addFilterId(resourceTypeId); // we are filtering directly on ID, we assume its unignored
criteria.fetchOperationDefinitions(true);
GWTServiceLookup.getResourceTypeGWTService().findResourceTypesByCriteria(criteria,
new AsyncCallback<PageList<ResourceType>>() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java
index bb49a93..17d297f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionExpressionBuilder.java
@@ -490,6 +490,7 @@ public class GroupDefinitionExpressionBuilder extends Window {
private void loadResourceTypeDropDown(final String newPlugin) {
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.addFilterIgnored(false); // make sure we don't let users pick a type that is ignored
criteria.addFilterPluginName(newPlugin);
criteria.setPageControl(PageControl.getUnlimitedInstance());
criteria.setRestriction(Restriction.COLLECTION_ONLY);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
index 4cea75f..e2650e4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java
@@ -73,7 +73,7 @@ public class ResourceSelector extends AbstractSelector<Resource, ResourceCriteri
final SelectItem categorySelect;
typeSelectItem = new IPickTreeItem("type", MSG.common_title_type());
- typeSelectItem.setDataSource(new ResourceTypePluginTreeDataSource());
+ typeSelectItem.setDataSource(new ResourceTypePluginTreeDataSource(false));
typeSelectItem.setValueField("id");
typeSelectItem.setCanSelectParentItems(true);
typeSelectItem.setLoadDataOnDemand(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java
index a9d79ab..8e4caac 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java
@@ -40,9 +40,11 @@ import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
public class PluginTypeTreeView extends EnhancedVLayout {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
+ private final boolean showIgnoredResourceTypes;
- public PluginTypeTreeView() {
+ public PluginTypeTreeView(boolean showIgnoredResourceTypes) {
super();
+ this.showIgnoredResourceTypes = showIgnoredResourceTypes;
setWidth100();
setHeight100();
}
@@ -69,6 +71,7 @@ public class PluginTypeTreeView extends EnhancedVLayout {
addMember(treeGrid);
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.addFilterIgnored((showIgnoredResourceTypes ? (Boolean) null : Boolean.FALSE));
criteria.fetchParentResourceTypes(true);
criteria.setPageControl(PageControl.getUnlimitedInstance());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java
index 6724d54..136db95 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypePluginTreeDataSource.java
@@ -18,6 +18,11 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -26,6 +31,7 @@ import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
import com.smartgwt.client.widgets.tree.TreeNode;
+
import org.rhq.core.domain.criteria.ResourceTypeCriteria;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
@@ -36,11 +42,6 @@ import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-
/**
* @author Greg Hinkle
*/
@@ -50,7 +51,11 @@ public class ResourceTypePluginTreeDataSource extends DataSource {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
- public ResourceTypePluginTreeDataSource() {
+ private final boolean showIgnoredResourceTypes;
+
+ public ResourceTypePluginTreeDataSource(boolean showIgnoredResourceTypes) {
+
+ this.showIgnoredResourceTypes = showIgnoredResourceTypes;
setClientOnly(false);
setDataProtocol(DSProtocol.CLIENTCUSTOM);
@@ -94,6 +99,7 @@ public class ResourceTypePluginTreeDataSource extends DataSource {
processResponse(request.getRequestId(), response);
} else {
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.addFilterIgnored((showIgnoredResourceTypes ? (Boolean) null : Boolean.FALSE));
criteria.fetchParentResourceTypes(true);
criteria.setPageControl(PageControl.getUnlimitedInstance());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
index 7141b47..5c6b934 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeRepository.java
@@ -210,6 +210,7 @@ public class ResourceTypeRepository {
List<Integer> typesNeeded = new ArrayList<Integer>();
EnumSet<MetadataType> metadataTypesNeeded = EnumSet.noneOf(MetadataType.class);
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.addFilterIgnored(null); // we will cache both unignored and ignored types
if (resourceTypeIds == null) {
//preload all
@@ -322,6 +323,7 @@ public class ResourceTypeRepository {
final EnumSet<MetadataType> metadataTypes, final ResourceTypeCriteria criteria,
final Map<Integer, ResourceType> cachedTypes) {
ResourceTypeCriteria topLevelCriteria = new ResourceTypeCriteria();
+ topLevelCriteria.addFilterIgnored(null); // we will cache both unignored and ignored types
topLevelCriteria.addFilterCategories(ResourceCategory.SERVER, ResourceCategory.SERVICE);
topLevelCriteria.addFilterParentResourceTypesEmpty(true);
topLevelCriteria.addSortCategory(PageOrdering.DESC);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java
index 9e36ac3..494ed90 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeDataSource.java
@@ -48,7 +48,11 @@ public class ResourceTypeTreeDataSource extends DataSource {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
- public ResourceTypeTreeDataSource() {
+ private final boolean showIgnoredResourceTypes;
+
+ public ResourceTypeTreeDataSource(boolean showIgnoredResourceTypes) {
+
+ this.showIgnoredResourceTypes = showIgnoredResourceTypes;
setClientOnly(false);
setDataProtocol(DSProtocol.CLIENTCUSTOM);
@@ -93,6 +97,7 @@ public class ResourceTypeTreeDataSource extends DataSource {
} else {
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.addFilterIgnored((showIgnoredResourceTypes ? (Boolean) null : Boolean.FALSE));
criteria.fetchParentResourceTypes(true);
criteria.setPageControl(PageControl.getUnlimitedInstance());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java
index 1e2d3a0..7e7ca00 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java
@@ -41,9 +41,13 @@ public class ResourceTypeTreeView extends EnhancedVLayout {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
- public ResourceTypeTreeView() {
+ private final boolean showIgnoredResourceTypes;
+
+ public ResourceTypeTreeView(boolean showIgnoredResourceTypes) {
super();
+ this.showIgnoredResourceTypes = showIgnoredResourceTypes;
+
setWidth100();
setHeight100();
}
@@ -70,6 +74,7 @@ public class ResourceTypeTreeView extends EnhancedVLayout {
addMember(treeGrid);
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.addFilterIgnored((showIgnoredResourceTypes ? (Boolean) null : Boolean.FALSE));
criteria.fetchParentResourceTypes(true);
criteria.setPageControl(PageControl.getUnlimitedInstance());
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 2f7ab5c..8093241 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
@@ -126,7 +126,7 @@ public class TestTopView extends AbstractSectionedLeftNavigationView {
NavigationItem typeTreeItem = new NavigationItem(PAGE_TYPE_TREE, null, new ViewFactory() {
public Canvas createView() {
- return new ResourceTypeTreeView();
+ return new ResourceTypeTreeView(true);
}
});
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
index 2f6928c..bd74be0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
@@ -891,6 +891,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot
liveDeployment.setBundleVersion(bvs.get(0)); // wire up the full bundle version back into the live deployment
// the bundle type doesn't eagerly load the resource type - the remote plugin container needs that too
ResourceTypeCriteria rtc = new ResourceTypeCriteria();
+ rtc.addFilterIgnored(null); // we are purging, so we don't care if this returns ignored types or not, just purge anyway
rtc.addFilterBundleTypeId(liveDeployment.getBundleVersion().getBundle().getBundleType().getId());
PageList<ResourceType> rts = resourceTypeManager.findResourceTypesByCriteria(subject, rtc);
liveDeployment.getBundleVersion().getBundle().getBundleType().setResourceType(rts.get(0));
@@ -1219,6 +1220,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot
Bundle bundle = bundleManager.findBundlesByCriteria(subject, bc).get(0);
ResourceTypeCriteria rtc = new ResourceTypeCriteria();
+ rtc.addFilterIgnored(false); // we only care about those that are not ignored
rtc.addFilterBundleTypeId(bundle.getBundleType().getId());
ResourceType resourceType = resourceTypeManager.findResourceTypesByCriteria(subject, rtc).get(0);
bundle.getBundleType().setResourceType(resourceType);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java
index 8db311a..6629ad7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DeletedResourceTypeFilter.java
@@ -41,7 +41,8 @@ public class DeletedResourceTypeFilter {
private void loadDeletedTypes() {
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
- criteria.addFilterDeleted(true);
+ criteria.addFilterDeleted(true); // we'll filter on all deleted types ...
+ criteria.addFilterIgnored(null); // ... whether they are ignored or not
//Use CriteriaQuery to automatically chunk/page through criteria query results
CriteriaQueryExecutor<ResourceType, ResourceTypeCriteria> queryExecutor = new CriteriaQueryExecutor<ResourceType, ResourceTypeCriteria>() {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java
index 775c3d8..e4867c6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/inventory/InventoryManagerBean.java
@@ -77,7 +77,8 @@ public class InventoryManagerBean implements InventoryManagerLocal {
@Override
public List<ResourceType> getDeletedTypes() {
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
- criteria.addFilterDeleted(true);
+ criteria.addFilterDeleted(true); // we'll get all deleted types ...
+ criteria.addFilterIgnored(null); // ... whether they are ignored or not
criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
return resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(), criteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java
index e114171..08523b6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/PlatformUtilizationManagerBean.java
@@ -74,6 +74,7 @@ public class PlatformUtilizationManagerBean implements PlatformUtilizationManage
@Override
public PageList<PlatformMetricsSummary> loadPlatformMetrics(final Subject subject) {
final ResourceTypeCriteria typeCriteria = new ResourceTypeCriteria();
+ typeCriteria.addFilterIgnored(false); // don't load metrics for ignored types
typeCriteria.addFilterCategory(PLATFORM);
typeCriteria.fetchMetricDefinitions(true);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
index 7bf4131..bc6903c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java
@@ -971,6 +971,7 @@ public class ResourceManagerBean implements ResourceManagerLocal, ResourceManage
ResourceTypeCriteria resourceTypeCriteria = new ResourceTypeCriteria();
resourceTypeCriteria.addFilterIds(typesSet.toArray(new Integer[typesSet.size()]));
+ resourceTypeCriteria.addFilterIgnored(null); // don't worry if they are ignored or not, get the ancestry anyway
List<ResourceType> types = typeManager.findResourceTypesByCriteria(subject, resourceTypeCriteria);
for (Resource resource : resources) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
index d5e0c87..e9d686a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java
@@ -559,7 +559,9 @@ public class ResourceTypeManagerBean implements ResourceTypeManagerLocal, Resour
List<ResourceType> results = new ArrayList<ResourceType>(uniqueTypes);
if (sawTopLevelServer) {
+ // get all platform types, whether or not they are ignored
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.addFilterIgnored(null);
criteria.addFilterCategory(ResourceCategory.PLATFORM);
criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
@@ -576,7 +578,9 @@ public class ResourceTypeManagerBean implements ResourceTypeManagerLocal, Resour
ResourceType first = entityManager.find(ResourceType.class, resourceTypeId);
if (first.getCategory() == ResourceCategory.PLATFORM) {
+ // get all platform types, whether or not they are ignored
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
+ criteria.addFilterIgnored(null);
criteria.clearPaging();//disable paging as the code assumes all the results will be returned.
List<ResourceType> allResourceTypes = findResourceTypesByCriteria(subject, criteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java
index 0bfa37d..8098e71 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBean.java
@@ -129,10 +129,12 @@ public class PluginManagerBean implements PluginManagerLocal {
}
private int getResourceTypeCount(Plugin plugin) {
+ // this will get all types, even those deleted and ignored
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
criteria.addFilterPluginName(plugin.getName());
criteria.setRestriction(Criteria.Restriction.COUNT_ONLY);
criteria.addFilterDeleted(null);
+ criteria.addFilterIgnored(null);
criteria.setStrict(true);
PageList<ResourceType> types = resourceTypeMgr.findResourceTypesByCriteria(subjectMgr.getOverlord(), criteria);
@@ -328,7 +330,8 @@ public class PluginManagerBean implements PluginManagerLocal {
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
criteria.setStrict(true);
criteria.addFilterPluginName(plugin.getName());
- criteria.addFilterDeleted(true);
+ criteria.addFilterDeleted(true); // get all deleted types ...
+ criteria.addFilterIgnored(null); // ... whether they are ignored or not
criteria.addFilterParentResourceTypesEmpty(true);
criteria.clearPaging();
@@ -342,7 +345,7 @@ public class PluginManagerBean implements PluginManagerLocal {
private void deleteResourcesForType(Subject subject, ResourceType type) throws Exception {
- List<Integer> typeIds = new ArrayList(1);
+ List<Integer> typeIds = new ArrayList<Integer>(1);
typeIds.add(type.getId());
List<Integer> resourceIds = resourceMgr.findIdsByTypeIds(typeIds);
commit 0e4fbbbc258cd3f90e5ba1136992440b619edd38
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Apr 2 14:19:42 2013 -0400
Bug 921927
- add confirm box for delete
- add some tooltips
- clean up some related message properties
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index a799311..2b8f0f2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -110,12 +110,12 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
}
@Override
- public void executeFetch(final DSRequest request, final DSResponse response, final ResourceGroupCriteria criteria ) {
+ public void executeFetch(final DSRequest request, final DSResponse response, final ResourceGroupCriteria criteria) {
groupService.findResourceGroupCompositesByCriteria(criteria,
new AsyncCallback<PageList<ResourceGroupComposite>>() {
public void onFailure(Throwable caught) {
if (caught.getMessage().contains("SearchExpressionException")) {
- Message message = new Message(MSG.search_invalid_search_expression(), Message.Severity.Error);
+ Message message = new Message(MSG.view_searchBar_suggest_noSuggest(), Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
} else {
CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_loadFailed(), caught);
@@ -123,14 +123,15 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
response.setStatus(RPCResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
-
+
private PageList<ResourceGroupComposite> applyAvailabilitySearchFilter(
- PageList<ResourceGroupComposite> result){
+ PageList<ResourceGroupComposite> result) {
if (!isAvailabilitySearch(criteria)) {
return result;
}
- PageList<ResourceGroupComposite> pageList = new PageList<ResourceGroupComposite>(result.getPageControl());
+ PageList<ResourceGroupComposite> pageList = new PageList<ResourceGroupComposite>(result
+ .getPageControl());
for (ResourceGroupComposite rgc : result) {
if (rgc.getExplicitCount() > 0) {
@@ -286,8 +287,8 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
results.append(getColumn(false, " <img height=\"12\" width=\"12\" src=\"" + imagePath + "\" />",
unknown));
} else {
- results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"1px\" height=\"1px\" />"));
+ results
+ .append(getColumn(false, " <img src=\"/images/blank.png\" width=\"1px\" height=\"1px\" />"));
}
}
results.append("</tr></table>");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
index efa985d..d2089b4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
@@ -217,7 +217,7 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.search_failed_to_retrieve_search_suggestion(), caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_suggest_failSuggest(), caught);
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
index c150765..dcc7bda 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
@@ -190,6 +190,7 @@ public class EnhancedSearchBar extends ToolStrip {
searchTextButton = new ToolStripButton();
searchTextButton.setIcon(IconEnum.ARROW_GRAY.getIcon16x16Path());
+ searchTextButton.setTooltip(MSG.view_searchBar_buttonTooltip());
searchTextButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -205,6 +206,7 @@ public class EnhancedSearchBar extends ToolStrip {
saveSearchButton = new ToolStripButton();
saveSearchButton.setIcon(IconEnum.STAR_OFF.getIcon16x16Path());
+ saveSearchButton.setTooltip(MSG.view_searchBar_savedSearch_buttonTooltip());
saveSearchButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -265,7 +267,7 @@ public class EnhancedSearchBar extends ToolStrip {
} else if (savedSearchName.equalsIgnoreCase(name)) {
Integer id = record.getAttributeAsInt(AbstractSearchStrategy.ATTR_ID);
- updateSavedSearchPattern(id, savedSearchPattern);
+ updateSavedSearchPattern(id, name, savedSearchPattern);
updated = true;
} else if (savedSearchPattern.equals(pattern)) {
@@ -339,7 +341,7 @@ public class EnhancedSearchBar extends ToolStrip {
setSearchMode(SearchMode.SAVED_SEARCH_MODE);
saveSearchButton.setIcon(IconEnum.STAR_ON.getIcon16x16Path());
- saveSearchTextItem.setValue(MSG.search_name_your_search());
+ saveSearchTextItem.setValue(MSG.view_searchBar_savedSearch_namePrompt());
saveSearchTextItem.selectValue();
saveSearchTextItem.show();
@@ -357,13 +359,13 @@ public class EnhancedSearchBar extends ToolStrip {
searchService.createSavedSearch(newSavedSearch, new AsyncCallback<Integer>() {
public void onSuccess(Integer newSavedSearchId) {
- Message message = new Message(MSG.search_successfully_saved_search(name), Message.Severity.Info);
+ Message message = new Message(MSG.view_searchBar_savedSearch_save(name), Message.Severity.Info);
CoreGUI.getMessageCenter().notify(message);
getSearchStrategy().searchFocusHandler();
}
public void onFailure(Throwable caught) {
- Message message = new Message(MSG.search_failed_to_save_search(name), Message.Severity.Error);
+ Message message = new Message(MSG.view_searchBar_savedSearch_failSave(name), Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
}
});
@@ -374,32 +376,32 @@ public class EnhancedSearchBar extends ToolStrip {
searchService.updateSavedSearchName(id, name, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean result) {
- Message message = new Message(MSG.search_successfully_saved_search(name), Message.Severity.Info);
+ Message message = new Message(MSG.view_searchBar_savedSearch_save(name), Message.Severity.Info);
CoreGUI.getMessageCenter().notify(message);
getSearchStrategy().searchFocusHandler();
}
@Override
public void onFailure(Throwable caught) {
- Message message = new Message(MSG.search_failed_to_save_search(name), Message.Severity.Error);
+ Message message = new Message(MSG.view_searchBar_savedSearch_failRename(name), Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
}
});
}
- private void updateSavedSearchPattern(final int id, final String pattern) {
+ private void updateSavedSearchPattern(final int id, final String name, final String pattern) {
Subject subject = UserSessionManager.getSessionSubject();
searchService.updateSavedSearchPattern(id, pattern, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean result) {
- Message message = new Message(MSG.search_successfully_saved_search(pattern), Message.Severity.Info);
+ Message message = new Message(MSG.view_searchBar_savedSearch_save(name), Message.Severity.Info);
CoreGUI.getMessageCenter().notify(message);
getSearchStrategy().searchFocusHandler();
}
@Override
public void onFailure(Throwable caught) {
- Message message = new Message(MSG.search_failed_to_save_search(pattern), Message.Severity.Error);
+ Message message = new Message(MSG.view_searchBar_savedSearch_failSave(name), Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
index 8092f38..fdd8fa5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
@@ -24,6 +24,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DataSource;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.util.BooleanCallback;
+import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -87,22 +89,33 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
@Override
public void onRecordDoubleClick(RecordDoubleClickEvent event) {
- Record record = event.getRecord();
- Integer id = record.getAttributeAsInt(ATTR_ID);
+ final Record record = event.getRecord();
final String name = record.getAttribute(ATTR_NAME);
- GWTServiceLookup.getSearchService().deleteSavedSearch(id, new AsyncCallback<Void>() {
- @Override
- public void onSuccess(Void result) {
- Message message = new Message(MSG.search_successfully_deleted_search(name), Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(message);
- populateSavedSearches();
- }
-
- @Override
- public void onFailure(Throwable caught) {
- Message message = new Message(MSG.search_failed_to_save_search(name), Message.Severity.Error);
- CoreGUI.getMessageCenter().notify(message);
+ SC.ask(MSG.view_searchBar_savedSearch_confirmDelete(name), new BooleanCallback() {
+ public void execute(Boolean confirmed) {
+ if (confirmed) {
+ Integer id = record.getAttributeAsInt(ATTR_ID);
+
+
+ GWTServiceLookup.getSearchService().deleteSavedSearch(id, new AsyncCallback<Void>() {
+
+ @Override
+ public void onSuccess(Void result) {
+ Message message = new Message(MSG.view_searchBar_savedSearch_delete(name),
+ Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(message);
+ populateSavedSearches();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ Message message = new Message(MSG.view_searchBar_savedSearch_failDelete(name),
+ Message.Severity.Error);
+ CoreGUI.getMessageCenter().notify(message);
+ }
+ });
+ }
}
});
}
@@ -131,7 +144,7 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.search_failed_to_retrieve_saved_search(), caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_savedSearch_failFetch(), caught);
}
@Override
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 3144439..38a9605 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
@@ -428,13 +428,6 @@ filter_from_date = From
filter_to_date = To
group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
-search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-search_failed_to_save_search = Failed to Save Search: {0}
-search_invalid_search_expression = Invalid search expression.
-search_name_your_search = name of search
-search_successfully_deleted_search = Successfully Deleted Search: {0}
-search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Parent Ancestry for:
util_errorHandler_nullException = exception was null
util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.
@@ -1955,17 +1948,20 @@ view_resource_monitor_table_min = Minimum
view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
view_resource_title_component_errors_tooltip = Shows managed component errors. Click for details
view_resource_title_tagUpdateFailed = Failed to update resource tags
-view_searchBar_defaultPattern = name your pattern
-view_searchBar_instructional_failSuggest = Failed to generate suggestions, see server log for possible errors
-view_searchBar_instructional_noSuggest = No matches, enter a different pattern
-view_searchBar_instructional_refresh = Failed to retrieve saved searches, please refresh page
+view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
+view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
+view_searchBar_savedSearch_namePrompt = name your search
view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+view_searchBar_suggest_failSuggest = Failed to generate suggestions, see server log for possible errors
+view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_searchGUI_loginStatus = Unable to determine login status, check server status
view_selector_assigned = Assigned {0}
view_selector_available = Available {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index 5cc58ac..e8faace 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -447,13 +447,6 @@ filter_from_date = Od
filter_to_date = Do
group_tree_groupOfResourceType = Skupina: [{0}]
group_tree_partialClusterTooltip = {0} z {1} Älenů skupiny má "{2}" zdroj
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Původ rodiÄe pro:
util_errorHandler_nullException = vÃœjimka byla null
util_monitoringRequestCallback_error_checkServerStatusFailure = NepodaÅilo se urÄit stav pÅihlaÅ¡ovánà - zkontrolujte stav serveru.
@@ -1968,17 +1961,20 @@ view_resource_monitor_table_min = Minimum
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
view_resource_title_component_errors_tooltip = Zobrazà chyby ÅÃzenÃœch komponent (managed component). KliknÄte pro detaily.
view_resource_title_tagUpdateFailed = NepodaÅilo se zmÄnit tagy zdroje
-view_searchBar_defaultPattern = pojmenujte svůj vzor
-view_searchBar_instructional_failSuggest = NepodaÅilo se vygenerovat návrhy, podÃvejte se do logu serveru kvůli moÅŸnÃœm chybám.
-view_searchBar_instructional_noSuggest = Nic nenalezeno, vloşte jinÜ vzor
-view_searchBar_instructional_refresh = NepodaÅilo se zÃskat "uloÅŸená hledánÃ", prosÃm obnovte si stránku.
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = ÃspÄÅ¡nÄ smazáno "uloÅŸené hledánÃ" [{0}]
view_searchBar_savedSearch_failDelete = NepodaÅilo se smazat "uloÅŸené hledánÃ" se jménem [{0}]
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = NepodaÅilo se nalézt "uloÅŸené hledánÃ" se jménem [{0}]
view_searchBar_savedSearch_failRename = NepodaÅilo se pÅejmenovat "uloÅŸené hledánÃ" se jménem [{0}]
view_searchBar_savedSearch_failSave = NepodaÅilo se vytvoÅit "uloÅŸené hledánÃ" se jménem [{0}]
+view_searchBar_savedSearch_namePrompt = pojmenujte svůj vzor
view_searchBar_savedSearch_rename = ÃspÄÅ¡nÄ pÅejmenováno "uloÅŸené hledánÃ" na [{0}]
view_searchBar_savedSearch_save = ÃspÄÅ¡nÄ vytvoÅeno "uloÅŸené hledánÃ" [{0}]
+view_searchBar_suggest_failSuggest = NepodaÅilo se vygenerovat návrhy, podÃvejte se do logu serveru kvůli moÅŸnÃœm chybám.
+view_searchBar_suggest_noSuggest = Nic nenalezeno, vloşte jinÜ vzor
view_searchGUI_loginStatus = Nelze urÄit stav pÅihlaÅ¡ovánÃ, zkontrolujte stav serveru
view_selector_assigned = PÅidÄlené {0}
view_selector_available = Dostupné {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 4d5d3ab..ee5dfa3 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -412,13 +412,6 @@ filter_from_date = Von
filter_to_date = Bis
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2}'' Ressource
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_disambiguationReportDecorator_pluginSuffix = ({0} Plugin)
util_errorHandler_nullException = Exception war null
##util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.
@@ -1754,17 +1747,20 @@ view_resource_monitor_table_max = Maximum
view_resource_monitor_table_min = Minimum
view_resource_title_component_errors_tooltip = Zeigt Fehler der gemanagten Ressource. Klicken fÃŒr Details
view_resource_title_tagUpdateFailed = Fehler beim Aktualisieren der Ressourcen-Tags
-view_searchBar_defaultPattern = benennen Sie Ihr Suchmuster
-view_searchBar_instructional_failSuggest = Konnte keine VorschlÀge generieren. Bitte schauen Sie in das Server-Log fÌr mögliche Fehler
-view_searchBar_instructional_noSuggest = Keine Treffer. Bitte geben Sie ein anderes Suchmuster ein
-view_searchBar_instructional_refresh = Konnte die gespeicherten Suchen nicht laden. Bitte laden Sie die Seite neu
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = Gespeicherte Suche [{0}] erflogreich gelöscht
view_searchBar_savedSearch_failDelete = Konnte die gespeicherte Suche mit Namen [{0}] nicht löschen
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = Konnte die gespeicherte Suche mit Namen [{0}] nicht finden
view_searchBar_savedSearch_failRename = Konnte die gespeicherte Suche mit Namen [{0}] nicht umbenennen
view_searchBar_savedSearch_failSave = Konnte die gespeicherte Suche mit Namen [{0}] nicht speichern
+view_searchBar_savedSearch_namePrompt = benennen Sie Ihr Suchmuster
view_searchBar_savedSearch_rename = Die gespeicherte Suche wurde erfolgreich nach [{0}] umbenannt
view_searchBar_savedSearch_save = Die gespeicherte Suche [{0}] wurde erfolgreich angelegt
+view_searchBar_suggest_failSuggest = Konnte keine VorschlÀge generieren. Bitte schauen Sie in das Server-Log fÌr mögliche Fehler
+view_searchBar_suggest_noSuggest = Keine Treffer. Bitte geben Sie ein anderes Suchmuster ein
##view_searchGUI_loginStatus = Unable to determine login status, check server status
view_selector_assigned = Zugewiesen {0}
view_selector_available = VerfÃŒgbar {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 9edfac2..3772a39 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -425,13 +425,6 @@ filter_from_date = éå§
filter_to_date = çµäº
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {1} ã®äžã® {0} ã°ã«ãŒãã¡ã³ããŒã ''{2}'' ãªãœãŒã¹ãæã£ãŠããŸã
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = 芪ã®å
ç¥ :
util_disambiguationReportDecorator_pluginSuffix = ({0} ãã©ã°ã€ã³)
util_errorHandler_nullException = äŸå€ã¯ null ã§ãã
@@ -1939,17 +1932,20 @@ view_resource_monitor_table_min = æå°
view_resource_title_component_errors_cleanup = åé¡ã«åãçµãã åŸã¯ã以äžã®ã¡ãã»ãŒãžãåé€ããŠå
šç»é¢ã®'管çã³ã³ããŒãã³ããšã©ãŒ'ãã¯ãªã¢ããå¿
èŠããããŸãã
view_resource_title_component_errors_tooltip = 管çã³ã³ããŒãã³ããšã©ãŒã®è¡šç€ºã詳现ã¯ã¯ãªãã¯ããŠãã ãã
view_resource_title_tagUpdateFailed = ãªãœãŒã¹ã¿ã°ã®æŽæ°ã«å€±æããŸãã
-view_searchBar_defaultPattern = ãã¿ãŒã³ãååãä»ããŠãã ãã
-view_searchBar_instructional_failSuggest = ãµãžã§ãã·ã§ã³ã®äœæã«å€±æããŸãããå¯èœæ§ã®ãããšã©ãŒããµãŒããŒãã°ãã調ã¹ãŠãã ããã
-view_searchBar_instructional_noSuggest = äžä»¶ãäžèŽããŸããã§ãããç°ãªããã¿ãŒã³ãå
¥åããŠãã ããã
-view_searchBar_instructional_refresh = ä¿åæžã¿ã®æ€çŽ¢ã®åãåºãã«å€±æããŸãããããŒãžããªãã¬ãã·ã¥ããŠãã ããã
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = ä¿åæžã¿ã®æ€çŽ¢ [{0}] ãåé€ããã®ã«å€±æããŸãã
view_searchBar_savedSearch_failDelete = [{0}]ãšããååã®ä¿åæžã¿æ€çŽ¢ãåé€ããã®ã«å€±æããŸãã
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = [{0}]ãšããååã®ä¿åæžã¿æ€çŽ¢ãæ€çŽ¢ããã®ã«å€±æããŸãã
view_searchBar_savedSearch_failRename = [{0}]ãšããååã®ä¿åæžã¿ã®æ€çŽ¢ã®ååãå€æŽããã®ã«å€±æããŸãã
view_searchBar_savedSearch_failSave = [{0}]ãšããååã®ä¿åæžã¿ã®æ€çŽ¢ãäœæããã®ã«å€±æããŸãã
+view_searchBar_savedSearch_namePrompt = ãã¿ãŒã³ãååãä»ããŠãã ãã
view_searchBar_savedSearch_rename = ä¿åæžã¿æ€çŽ¢ã®ååã [{0}] ãžå€æŽããã®ã«æåããŸãã
view_searchBar_savedSearch_save = [{0}] ãšããååã®ä¿åæžã¿æ€çŽ¢ãäœæããã®ã«æåããŸãã
+view_searchBar_suggest_failSuggest = ãµãžã§ãã·ã§ã³ã®äœæã«å€±æããŸãããå¯èœæ§ã®ãããšã©ãŒããµãŒããŒãã°ãã調ã¹ãŠãã ããã
+view_searchBar_suggest_noSuggest = äžä»¶ãäžèŽããŸããã§ãããç°ãªããã¿ãŒã³ãå
¥åããŠãã ããã
view_searchGUI_loginStatus = ãã°ã€ã³ã¹ããŒã¿ã¹ã確å®ã§ããŸããããµãŒããŒã®ç¶æ
ã調ã¹ãŠãã ãã
view_selector_assigned = å²ãåœãŠããã {0}
view_selector_available = å©çšå¯èœãª {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
index 54421b1..fd7f639 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
@@ -382,13 +382,6 @@ favorites_resources = ìŠê²šì°Ÿêž° 늬ìì€
filter_from_date = ìì
group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {1} ì€ {0} 귞룹 ë©€ë²ê° ''{2}'' ììì ê°ì§ê³ ììµëë€.
-search_failed_to_retrieve_saved_search = ì ì¥ë ê²ìì ê²ìíì§ ëª»íìµëë€
-search_failed_to_retrieve_search_suggestion = ì¶ì² ê²ììŽë¥Œ ê²ìíì§ ëª»íìµëë€
-search_failed_to_save_search = ê²ìì ì ì¥íì§ ëª»íìµëë€: {0}
-search_invalid_search_expression = ì못ë ê²ì íí.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-search_successfully_saved_search = ì±ê³µì ìŒë¡ ì ì¥ë ê²ì: {0}
util_ancestry_parentAncestry = ë¶ëªšì ì¡°ì:
util_errorHandler_nullException = ììžë nullìŽììµëë€.
util_monitoringRequestCallback_error_checkServerStatusFailure = ë¡ê·žìž ìí륌 íìží ì ììµëë€ - ìë²ì ìí륌 íìžíììì
@@ -1612,16 +1605,20 @@ view_resource_monitor_table_min = ìµì
view_resource_title_component_errors_cleanup = ìŽ ë¬žì 륌 íŽê²° í íìë ìŽì íë©Žìì 'êŽëŠ¬ êµ¬ì± ìì ì€ë¥'ììŽìœì ìì íë €ë©Ž ìëì ë©ìì§ë¥Œ ìì íŽìŒí©ëë€.
view_resource_title_component_errors_tooltip = êŽëŠ¬ êµ¬ì± ìì ì€ë¥ íì. ììží ëŽì©ì íŽëŠíììì€
view_resource_title_tagUpdateFailed = 늬ìì€ íê·ž ê°±ì ì ì€íšíìµëë€
-view_searchBar_defaultPattern = íšíŽ ìŽëŠì ë¶ì¬ì£Œìžì
-view_searchBar_instructional_failSuggest = ì ìì ìì±íì§ ëª»íìµëë€. ë°ìí ì ìë ì€ë¥ì ëí ìë² ë¡ê·žë¥Œ ì°žì¡°íììì€
-view_searchBar_instructional_refresh = ì ì¥ë ê²ì ì ê±°ì ì€íšíìµëë€. íìŽì§ë¥Œ ìë¡ê³ 칚 íììì€
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = ì ì¥ë ê²ì [{0}]ì ì ê±°íëë° ì±ê³µíìµëë€
view_searchBar_savedSearch_failDelete = [{0}]ëŒë ì ì¥ë ê²ìì ìì íëë° ì€íšíìµëë€
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = [{0}]ëŒë ì ì¥ë ê²ìì ê²ìíëë° ì€íšíìµëë€
view_searchBar_savedSearch_failRename = [{0}]ëŒë ì ì¥ë ê²ìì ìŽëŠì ë³ê²œíëë° ì€íšíìµëë€
view_searchBar_savedSearch_failSave = [{0}]ëŒë ì ì¥ë ê²ìì ìì±ì ì€íšíìµëë€
+view_searchBar_savedSearch_namePrompt = íšíŽ ìŽëŠì ë¶ì¬ì£Œìžì
view_searchBar_savedSearch_rename = ì ì¥ë ê²ì [{0}]ì ìŽëŠì ë³ê²œíëë° ì±ê³µíìµëë€
view_searchBar_savedSearch_save = [{0}]ëŒë ì ì¥ë ê²ìì ë§ëëë° ì±ê³µíìµëë€
+view_searchBar_suggest_failSuggest = ì ìì ìì±íì§ ëª»íìµëë€. ë°ìí ì ìë ì€ë¥ì ëí ìë² ë¡ê·žë¥Œ ì°žì¡°íììì€
+##view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_searchGUI_loginStatus = ë¡ê·žìž ìí륌 íëší ì ììµëë€, ìë²ì ìí륌 íìžíììì€
view_selector_assigned = í ë¹ë {0}
view_selector_available = ì¬ì©ê°ë¥í {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 4e17344..c8d730d 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -430,13 +430,6 @@ favorites_resources = Recursos Favoritos
##filter_to_date = To
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Ancestral para:
util_errorHandler_nullException = Exce\u00E7\u00E3o nula
util_monitoringRequestCallback_error_checkServerStatusFailure = Imposs\u00EDvel verificar o status do login - verifique o status do Servidor.
@@ -2050,17 +2043,20 @@ view_resource_monitor_table_min = Minimum
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
view_resource_title_component_errors_tooltip = Shows managed component errors. Click for details
view_resource_title_tagUpdateFailed = Failed to update resource tags
-view_searchBar_defaultPattern = definir nome para o padr\u00E3o
-##view_searchBar_instructional_failSuggest = Failed to generate suggestions, see server log for possible errors
-view_searchBar_instructional_noSuggest = No matches, enter a different pattern
-##view_searchBar_instructional_refresh = Failed to retrieve saved searches, please refresh page
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
##view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
##view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
##view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
##view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
##view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
+view_searchBar_savedSearch_namePrompt = definir nome para o padr\u00E3o
##view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
##view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+##view_searchBar_suggest_failSuggest = Failed to generate suggestions, see server log for possible errors
+##view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_searchGUI_loginStatus = Imposs\u00EDvel determinar o status do login, verifique o status do servidor
view_selector_assigned = Associado {0}
view_selector_available = Dispon\u00EDvel {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index 54f47af..ac55382 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -2506,9 +2506,6 @@ favorites_resources = ÐзбÑаММÑе ÑеÑÑÑÑÑ
filter_from_date = ÐÑ
filter_to_date = ÐП
group_tree_partialClusterTooltip = {0} Оз {1} ÑлеМПв гÑÑÐ¿Ð¿Ñ ÐžÐŒÐµÑÑ ÑеÑÑÑÑ ''{2}''
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_errorHandler_nullException = ÐПзМОклП null ОÑклÑÑеМОе
util_monitoringRequestCallback_error_checkServerStatusFailure = Ðе ÑЎаеÑÑÑ ÐŸÐ¿ÑеЎелОÑÑ ÑÑаÑÑÑ Ð°Ð²ÑПÑОзаÑОО - пÑПвеÑÑÑе ÑПÑÑПÑМОе ÑеÑвеÑа.
util_userPerm_loadFailGlobal = Ðе ÑЎаеÑÑÑ Ð·Ð°Ð³ÑÑзОÑÑ Ð²Ð°ÑО глПбалÑÐœÑе пПлМПЌПÑÐžÑ - Ме пÑеЎПÑÑавлеМÑ.
@@ -2677,4 +2674,18 @@ view_group_detail_implicitAvail = Group availability for all members (includes r
##view_operationHistoryList_deleteFailure = Failed to delete operation history [{0}].
##view_operationHistoryList_deletePartialSuccess = Deleted [{0}] operation history items, but failed to delete the items with the following IDs: {1}
##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
+##view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
+##view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
+##view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
+##view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
+##view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
+##view_searchBar_savedSearch_namePrompt = name your search
+##view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
+##view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+##view_searchBar_suggest_failSuggest = Failed to generate suggestions, see server log for possible errors
+##view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_tabs_common_graphs_cubism = Cubism гÑаÑОкО
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index abe3253..582be3a 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -420,13 +420,6 @@ favorites_resources = \u8d44\u6e90\u6536\u85cf\u5939
##filter_to_date = To
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\u62e5\u6709 \u4e00\u4e2a''{2}''\u8d44\u6e90
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Parent Ancestry for:
util_errorHandler_nullException = \u5f02\u5e38\u662f null
util_monitoringRequestCallback_error_checkServerStatusFailure = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001- \u68c0\u67e5\u670d\u52a1\u5668\u72b6\u6001.
@@ -1940,17 +1933,20 @@ view_resource_monitor_table_min = \u6700\u5c0f
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
view_resource_title_component_errors_tooltip = \u663e\u793a\u88ab\u7ba1\u7ec4\u4ef6\u9519\u8bef.\u5355\u51fb\u67e5\u770b\u8be6\u60c5
view_resource_title_tagUpdateFailed = \u66f4\u65b0\u8d44\u6e90\u6807\u7b7e\u5931\u8d25
-view_searchBar_defaultPattern = \u5b9a\u4e49\u81ea\u5df1\u7684\u6837\u5f0f
-##view_searchBar_instructional_failSuggest = Failed to generate suggestions, see server log for possible errors
-view_searchBar_instructional_noSuggest = No matches, enter a different pattern
-##view_searchBar_instructional_refresh = Failed to retrieve saved searches, please refresh page
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
##view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
##view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
##view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
##view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
##view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
+view_searchBar_savedSearch_namePrompt = \u5b9a\u4e49\u81ea\u5df1\u7684\u6837\u5f0f
##view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
##view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+##view_searchBar_suggest_failSuggest = Failed to generate suggestions, see server log for possible errors
+##view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_searchGUI_loginStatus = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001\uff0c\u8bf7\u68c0\u67e5\u670d\u52a1
view_selector_assigned = \u6307\u5b9a\u7684 {0}
view_selector_available = \u53ef\u7528\u7684 {0}
commit 6662af978c73a65b34c297679e4534c22ab7307e
Author: mtho11 <mikecthompson(a)gmail.com>
Date: Mon Apr 1 16:02:43 2013 -0700
[BZ 924691] New graphs inconsistent coloring. Made hover label colors match the new actual chart colors.
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
index 750c117..df50d39 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css
@@ -125,17 +125,17 @@ rect.low {
#chartHoverPeakValue {
width: 50px;
font-weight: bold;
- color: #ff8a9a;
+ color: #1794BC;
}
#chartHoverAvgValue {
width: 50px;
font-weight: bold;
- color: #b0d9b0;
+ color: #2e376a;
}
#chartHoverLowValue {
width: 50px;
font-weight: bold;
- color: #8ad6ff;
+ color: #70c4e2;
}
commit c3c5d36953256f25cf9a2ef24fe258f8c6ff2d1c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Apr 1 16:39:48 2013 -0400
Bug 921927
Work on search bar issues:
- Add RecordDoubleClick handling to SearchStrategies, allows us to impl
SavedSearch delete via DblClick.
- Allow TableFilter to be disabled by SearchBar impl, allows SavedSearch
mode to not trigger searches.
- Add SavedSearch updateName/updatePattern/delete
- Fix up keypress delay by canceling timer as needed
- Add SavedSearch hover showing pattern in suggest list
- Tie suggestion box size/positioning to search text box
- Add some more ignored keys
- A variety of other behavioral tweeks
- Remove unncessary field defs in search strategy impls
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
index fb1b135..7ecfa14 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java
@@ -32,6 +32,7 @@ public class SearchSuggestion implements Serializable, Comparable<SearchSuggesti
private Kind kind;
private String value;
+ private String optional; // optional data based on kind.
private String label;
private int startIndex;
private int endIndex;
@@ -41,21 +42,22 @@ public class SearchSuggestion implements Serializable, Comparable<SearchSuggesti
}
public SearchSuggestion(Kind kind, String value) {
- this(kind, value, 0, 0);
+ this(kind, value, value, null, 0, 0);
}
public SearchSuggestion(Kind kind, String value, int startIndex, int length) {
- this.kind = kind;
- this.label = value;
- this.value = value;
- this.startIndex = startIndex;
- this.endIndex = startIndex + length;
+ this(kind, value, value, null, startIndex, length);
}
public SearchSuggestion(Kind kind, String label, String value, int startIndex, int length) {
+ this(kind, label, value, null, startIndex, length);
+ }
+
+ public SearchSuggestion(Kind kind, String label, String value, String optional, int startIndex, int length) {
this.kind = kind;
this.label = label;
this.value = value;
+ this.optional = optional;
this.startIndex = startIndex;
this.endIndex = startIndex + length;
}
@@ -76,6 +78,14 @@ public class SearchSuggestion implements Serializable, Comparable<SearchSuggesti
return value;
}
+ public String getOptional() {
+ return optional;
+ }
+
+ public void setOptional(String optional) {
+ this.optional = optional;
+ }
+
public int getStartIndex() {
return startIndex;
}
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 7af378f..aac0f84 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
@@ -50,7 +50,6 @@ import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
-import com.smartgwt.client.widgets.form.fields.ComboBoxItem;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.HiddenItem;
import com.smartgwt.client.widgets.form.fields.SelectItem;
@@ -82,12 +81,12 @@ import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedSearchBarIt
import org.rhq.enterprise.gui.coregui.client.util.CriteriaUtility;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedIButton;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedToolStrip;
-import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedUtility;
+import org.rhq.enterprise.gui.coregui.client.util.enhanced.EnhancedVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
* A tabular view of set of data records from an {@link RPCDataSource}.
@@ -1226,16 +1225,18 @@ public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements
Log.debug("Table.TableFilter Pressed Enter key");
if (null != searchBarItem) {
- TextItem searchTextItem = searchBarItem.getSearchBar().getSearchTextItem();
- String searchBarValue = searchTextItem.getValueAsString();
- String hiddenValue = (String) hiddenItem.getValue();
- Log.debug("Table.TableFilter searchBarValue :" + searchBarValue + ", hiddenValue" + hiddenValue);
-
- // Only send a fetch request if the user actually changed the search expression.
- if (!equals(searchBarValue, hiddenValue)) {
- hiddenItem.setValue(searchBarValue);
- Log.debug("Table.TableFilter fetchFilteredTableData");
- fetchFilteredTableData();
+ if (searchBarItem.getSearchBar().isFilterEnabled()) {
+ TextItem searchTextItem = searchBarItem.getSearchBar().getSearchTextItem();
+ String searchBarValue = searchTextItem.getValueAsString();
+ String hiddenValue = (String) hiddenItem.getValue();
+ Log.debug("Table.TableFilter searchBarValue :" + searchBarValue + ", hiddenValue" + hiddenValue);
+
+ // Only send a fetch request if the user actually changed the search expression.
+ if (!equals(searchBarValue, hiddenValue)) {
+ hiddenItem.setValue(searchBarValue);
+ Log.debug("Table.TableFilter fetchFilteredTableData");
+ fetchFilteredTableData();
+ }
}
} else {
fetchFilteredTableData();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java
index a2d9891..c893386 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/AbstractSearchStrategy.java
@@ -18,10 +18,11 @@
*/
package org.rhq.enterprise.gui.coregui.client.searchbar;
-import com.smartgwt.client.widgets.form.fields.events.FocusEvent;
import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.events.RecordClickHandler;
+import com.smartgwt.client.widgets.grid.events.RecordDoubleClickEvent;
+import com.smartgwt.client.widgets.grid.events.RecordDoubleClickHandler;
import org.rhq.core.domain.auth.Subject;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
@@ -30,15 +31,13 @@ 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;
-
/**
* AbstractSearchStrategy defines common search strategy behaviors the subclasses must implement.
* Also, houses common functionality such as user auth and searching the domain.
*
* @author Mike Thompson
*/
-public abstract class AbstractSearchStrategy implements RecordClickHandler, CellFormatter
-{
+public abstract class AbstractSearchStrategy implements RecordClickHandler, RecordDoubleClickHandler, CellFormatter {
protected static final Messages MSG = CoreGUI.getMessages();
public static final String ATTR_ID = "id";
public static final String ATTR_KIND = "kind"; // not for saved search
@@ -47,13 +46,14 @@ public abstract class AbstractSearchStrategy implements RecordClickHandler, Cel
public static final String ATTR_RESULT_COUNT = "resultCount";
public static final String ATTR_PATTERN = "pattern";
public static final String ATTR_VALUE = "value";
+ public static final String ATTR_OPTIONAL = "value";
- protected final SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
+ protected final SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
final Subject subject;
protected final EnhancedSearchBar searchBar;
- public AbstractSearchStrategy(EnhancedSearchBar searchBar){
+ public AbstractSearchStrategy(EnhancedSearchBar searchBar) {
this.searchBar = searchBar;
subject = UserSessionManager.getSessionSubject();
}
@@ -76,15 +76,18 @@ public abstract class AbstractSearchStrategy implements RecordClickHandler, Cel
*/
public abstract int getCellHeight();
-
/**
* When return key is pressed in the search bar do I want to do any further
* customization. Optionally, overridden by subclass.
* @param keyUpEvent
*/
- public void searchReturnKeyHandler(KeyUpEvent keyUpEvent){
+ public void searchReturnKeyHandler(KeyUpEvent keyUpEvent) {
// do nothing by default
}
+ @Override
+ public void onRecordDoubleClick(RecordDoubleClickEvent event) {
+ // do nothing by default
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
index 5e9df27..efa985d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
@@ -23,20 +23,17 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DataSource;
import com.smartgwt.client.data.fields.DataSourceTextField;
-import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent;
+import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
-import org.rhq.core.domain.criteria.SavedSearchCriteria;
-import org.rhq.core.domain.search.SavedSearch;
import org.rhq.core.domain.search.SearchSubsystem;
import org.rhq.core.domain.search.SearchSuggestion;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
* This is the general search strategy implementation used for most searches.
@@ -85,50 +82,24 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
@Override
public void onRecordClick(RecordClickEvent event) {
Log.debug("BasicSearchStrategy click");
+
String kind = event.getRecord().getAttribute(ATTR_KIND);
+ String pattern;
+
if (kind.equals("SAVED") || kind.equals("GLOBAL")) {
Log.debug("Saved or Global Search Click");
- searchBar.switchToSavedSearchMode();
- String savedSearchName = event.getRecord().getAttribute(ATTR_VALUE);
- searchBar.getSaveSearchTextItem().setValue(savedSearchName);
- assignSavedSearchExpression(savedSearchName, searchBar.getSearchTextItem());
+ pattern = event.getRecord().getAttribute(ATTR_PATTERN);
+
} else {
Log.debug("Regular Search Click");
- String clickedExpression = event.getRecord().getAttribute(ATTR_NAME);
- searchBar.getSearchTextItem().setValue(clickedExpression);
- if (null != clickedExpression && clickedExpression.length() > 0) {
- getTabAwareSearchSuggestions(SearchSubsystem.RESOURCE, clickedExpression, clickedExpression.length());
- }
+ pattern = event.getRecord().getAttribute(ATTR_NAME);
}
- }
-
- private void assignSavedSearchExpression(final String savedSearchName, final TextItem searchComboBoxItem) {
- SavedSearchCriteria criteria = new SavedSearchCriteria();
- criteria.addFilterSubjectId(subject.getId());
- criteria.addFilterName(savedSearchName); // null OK
- criteria.setStrict(true);
-
- GWTServiceLookup.getSearchService().findSavedSearchesByCriteria(criteria,
- new AsyncCallback<List<SavedSearch>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_savedSearch_failFind(savedSearchName),
- caught);
- }
-
- @Override
- public void onSuccess(List<SavedSearch> results) {
- if (results.size() == 0) {
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_searchBar_savedSearch_failFind(savedSearchName),
- Message.Severity.Error));
- } else {
- SavedSearch savedSearch = results.get(0);
- searchComboBoxItem.setValue(savedSearch.getPattern());
- }
- }
- });
+ searchBar.getSearchTextItem().focusInItem();
+ if (!(null == pattern || pattern.isEmpty())) {
+ searchBar.getSearchTextItem().setValue(pattern);
+ getTabAwareSearchSuggestions(SearchSubsystem.RESOURCE, pattern, pattern.length());
+ }
}
@Override
@@ -143,7 +114,6 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
Log.debug("Keyup in BasicSearchStrategy: " + keyUpEvent.getKeyName());
String searchExpression = searchBar.getSearchTextItem().getValueAsString();
doSearch(searchExpression);
-
}
@Override
@@ -152,13 +122,17 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
}
private void doSearch(String searchExpression) {
- if (null != searchExpression && searchExpression.length() > 0) {
- getTabAwareSearchSuggestions(SearchSubsystem.RESOURCE, searchBar.getSearchTextItem().getValueAsString(),
- searchBar.getSearchTextItem().getValueAsString().length());
- } else {
+ if (null == searchExpression || searchExpression.isEmpty()) {
Log.debug("Empty Search expression");
getTabAwareSearchSuggestions(SearchSubsystem.RESOURCE, null, 0);
+ } else {
+ Log.debug("doSearch: " + searchExpression);
+ getTabAwareSearchSuggestions(SearchSubsystem.RESOURCE, searchBar.getSearchTextItem().getValueAsString(),
+ searchBar.getSearchTextItem().getValueAsString().length());
}
+
+ // don't obscure the results
+ searchBar.getPickListGrid().hide();
}
@Override
@@ -169,8 +143,6 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
private void getTabAwareSearchSuggestions(final SearchSubsystem searchSubsystem, final String expression,
int caretPosition) {
- searchBar.getPickListGrid().setData(new ListGridRecord[] {});
-
final long suggestStart = System.currentTimeMillis();
Log.debug("Searching for: " + expression);
@@ -189,19 +161,33 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
DataSourceTextField idField = new DataSourceTextField(ATTR_ID, "Id");
idField.setPrimaryKey(true);
idField.setCanView(false);
+
DataSourceTextField valueField = new DataSourceTextField(ATTR_VALUE, "Value");
- DataSourceTextField kindField = new DataSourceTextField(ATTR_KIND, "Kind");
- kindField.setCanView(false);
- DataSourceTextField nameField = new DataSourceTextField(ATTR_NAME, "Name");
- nameField.setCanView(false);
- ds.setFields(idField, valueField, kindField, nameField);
+
+ ds.setFields(idField, valueField);
searchBarPickListGrid.setDataSource(ds);
+ ListGridField[] fields = searchBarPickListGrid.getAllFields();
+ searchBarPickListGrid.getField(ATTR_VALUE).setShowHover(true);
+ searchBarPickListGrid.getField(ATTR_VALUE).setHoverCustomizer(new HoverCustomizer() {
+
+ public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
+ String kind = record.getAttribute(ATTR_KIND);
+ if (kind.equals("SAVED") || kind.equals("GLOBAL")) {
+ String pattern = record.getAttribute(ATTR_PATTERN);
+
+ if (!(null == pattern || pattern.isEmpty())) {
+ return pattern;
+ }
+ }
+
+ return null;
+ }
+ });
} else {
ds.invalidateCache();
}
- searchBarPickListGrid.setData(new ListGridRecord[] {});
for (SearchSuggestion searchSuggestion : results) {
Log.debug("search tab aware Suggestions: " + searchSuggestion.getKind() + ", "
@@ -213,10 +199,13 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
}
record.setAttribute(ATTR_NAME, searchSuggestion.getLabel());
record.setAttribute(ATTR_VALUE, searchSuggestion.getValue());
+ String pattern = searchSuggestion.getOptional();
+ record.setAttribute(ATTR_PATTERN, (null == pattern) ? "" : pattern);
ds.addData(record);
}
try {
+ searchBarPickListGrid.setData(new ListGridRecord[] {});
searchBarPickListGrid.fetchData();
} catch (Exception e) {
Log.debug("Caught exception on fetchData: " + e);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
index 4af9bce..c150765 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
@@ -24,18 +24,14 @@ import java.util.List;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.types.Autofit;
-import com.smartgwt.client.types.Overflow;
+import com.smartgwt.client.core.Rectangle;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
-import com.smartgwt.client.widgets.events.MouseOutEvent;
-import com.smartgwt.client.widgets.events.MouseOutHandler;
import com.smartgwt.client.widgets.form.fields.TextItem;
-import com.smartgwt.client.widgets.form.fields.events.FocusEvent;
-import com.smartgwt.client.widgets.form.fields.events.FocusHandler;
import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent;
import com.smartgwt.client.widgets.form.fields.events.KeyUpHandler;
import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
import com.smartgwt.client.widgets.toolbar.ToolStripButton;
@@ -63,10 +59,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
*/
public class EnhancedSearchBar extends ToolStrip {
private static final Messages MSG = CoreGUI.getMessages();
- private static final int PICKLIST_WIDTH = 600;
+ private static final int SEARCH_WIDTH = 600;
private static final int PICKLIST_HEIGHT = 500;
- private static final int PICKLIST_LEFT_OFFSET = 307;
- private static final int PICKLIST_TOP_OFFSET = 140;
private SearchSubsystem searchSubsystem;
private ToolStripButton searchTextButton;
private ToolStripButton saveSearchButton;
@@ -76,6 +70,7 @@ public class EnhancedSearchBar extends ToolStrip {
private final FavoritesSearchStrategy favoritesSearchStrategy;
private final BasicSearchStrategy basicSearchStrategy;
private String lastSearchTerm;
+ private Timer searchDelayTimer;
private final SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
@@ -88,9 +83,12 @@ public class EnhancedSearchBar extends ToolStrip {
private static final List<String> IGNORED_KEYS;
static {
- IGNORED_KEYS = new ArrayList<String>(2);
+ IGNORED_KEYS = new ArrayList<String>();
IGNORED_KEYS.add("Arrow_Down");
IGNORED_KEYS.add("Arrow_Up");
+ IGNORED_KEYS.add("Arrow_Left");
+ IGNORED_KEYS.add("Arrow_Right");
+ IGNORED_KEYS.add("Backspace");
}
enum SearchMode {
@@ -106,7 +104,6 @@ public class EnhancedSearchBar extends ToolStrip {
private EnumMap<SearchMode, AbstractSearchStrategy> searchStrategies = new EnumMap<SearchMode, AbstractSearchStrategy>(
SearchMode.class);
-
public EnhancedSearchBar(SearchSubsystem searchSubsystem, String initialSearchText) {
if (null == searchSubsystem) {
this.searchSubsystem = SearchSubsystem.RESOURCE; // default to resource
@@ -118,72 +115,75 @@ public class EnhancedSearchBar extends ToolStrip {
addSpacer(40);
searchTextItem = new TextItem("search", MSG.common_button_search());
- // now that we have searchComboBoxItem setup dependent objects
favoritesSearchStrategy = new FavoritesSearchStrategy(this);
basicSearchStrategy = new BasicSearchStrategy(this);
// now we can fill our enumMap
searchStrategies.put(SearchMode.BASIC_SEARCH_MODE, basicSearchStrategy);
searchStrategies.put(SearchMode.SAVED_SEARCH_MODE, favoritesSearchStrategy);
- searchTextItem.setWidth(PICKLIST_WIDTH);
+ searchTextItem.setWidth(SEARCH_WIDTH);
searchTextItem.setBrowserSpellCheck(false);
pickListGrid = new ListGrid();
- searchTextItem.setRedrawOnChange(true);
- // this changes it to autocomplete field from combobox
searchTextItem.addKeyUpHandler(new KeyUpHandler() {
- @Override
+
public void onKeyUp(final KeyUpEvent keyUpEvent) {
- Log.debug("onKeyUp search Mode: " + searchMode + " key: "+keyUpEvent.getKeyName());
+ Log.debug("onKeyUp search Mode: " + searchMode + " key: " + keyUpEvent.getKeyName());
+ keyUpEvent.cancel();
if (IGNORED_KEYS.contains(keyUpEvent.getKeyName())) {
return;
}
if (keyUpEvent.getKeyName().equals("Enter")) {
- String currentSearchTerm = (String)keyUpEvent.getItem().getValue();
+ if (getSearchMode().equals(SearchMode.SAVED_SEARCH_MODE)) {
+ return;
+ }
+
+ String currentSearchTerm = (String) keyUpEvent.getItem().getValue();
+ currentSearchTerm = (null == currentSearchTerm) ? "" : currentSearchTerm; // avoid NPEs
Log.debug("onKeyUp search Mode Enter key pressed");
+
// stop any duplicate searches
- if(!currentSearchTerm.equalsIgnoreCase(lastSearchTerm)){
+ if (!currentSearchTerm.equalsIgnoreCase(lastSearchTerm)) {
getSearchStrategy().searchReturnKeyHandler(keyUpEvent);
searchTextItem.focusInItem();
- pickListGrid.hide();
lastSearchTerm = currentSearchTerm;
}
- }
- else {
- Log.debug("Do searchKeyUpHandler...");
- // add our own delay
- new Timer(){
- /**
- * This method will be called when a timer fires. Override it to implement the timer's logic.
- */
- @Override
- public void run() {
- getSearchStrategy().searchKeyUpHandler(keyUpEvent);
- pickListGrid.show();
- showPickListGrid();
- }
- }.schedule(SEARCH_KEYUP_DELAY);
+ } else if (keyUpEvent.getKeyName().equals("Escape")) {
+ if (pickListGrid.isVisible()) {
+ pickListGrid.hide();
+ }
+ } else {
+ if (null == searchDelayTimer) {
+ searchDelayTimer = new Timer() {
+
+ public void run() {
+ getSearchStrategy().searchKeyUpHandler(keyUpEvent);
+ pickListGrid.show();
+ }
+ };
+ } else {
+ searchDelayTimer.cancel();
+ }
+
+ // wait for some typing quiet time before performing a search
+ searchDelayTimer.schedule(SEARCH_KEYUP_DELAY);
}
}
});
-
- searchTextItem.addFocusHandler(new FocusHandler() {
- @Override
- public void onFocus(FocusEvent event) {
- Log.debug("onFocus search Mode: " + searchMode);
- populateInitialSearch();
- }
- });
searchTextItem.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() {
@Override
public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent clickEvent) {
- populateInitialSearch();
+ Log.debug("onClick search Mode: " + searchMode);
+ if (!pickListGrid.isDrawn() || pickListGrid.isVisible()) {
+ populateInitialSearch();
+ }
}
});
+
configurePickListGrid();
addFormItem(searchTextItem);
@@ -193,9 +193,10 @@ public class EnhancedSearchBar extends ToolStrip {
searchTextButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
- if(pickListGrid.isVisible()){
+ if (pickListGrid.isVisible()) {
pickListGrid.hide();
- }else {
+ searchTextItem.focusInItem();
+ } else {
populateInitialSearch();
}
}
@@ -226,26 +227,57 @@ public class EnhancedSearchBar extends ToolStrip {
}
}
});
- pickListGrid.addMouseOutHandler(new MouseOutHandler() {
- @Override
- public void onMouseOut(MouseOutEvent mouseOutEvent) {
- pickListGrid.hide();
- }
- });
+
// set the default search provider
- switchToBasicSearchMode();
+ setSearchMode(SearchMode.BASIC_SEARCH_MODE);
this.draw();
}
+
private void populateInitialSearch() {
getSearchStrategy().searchFocusHandler();
pickListGrid.show();
showPickListGrid();
+ searchTextItem.focusInItem();
}
+
private void saveFavoriteSearch() {
- Log.debug("Saving Favorite Search: " + saveSearchTextItem.getValueAsString());
- createSavedSearch(saveSearchTextItem.getValueAsString(), searchTextItem.getValueAsString());
- toggleFavoriteSearch();
+ String savedSearchName = saveSearchTextItem.getValueAsString();
+ if (null == savedSearchName || savedSearchName.isEmpty()) {
+ return;
+ }
+
+ String savedSearchPattern = searchTextItem.getValueAsString();
+ if (null == savedSearchPattern || savedSearchPattern.isEmpty()) {
+ return;
+ }
+
+ // This may be a name change, a pattern change or a new saved search. Look at the existing SS list and
+ // decided what to do.
+ boolean updated = false;
+ for (int i = 0, size = pickListGrid.getTotalRows(); !updated && (i < size); ++i) {
+ ListGridRecord record = pickListGrid.getRecord(i);
+ String name = record.getAttribute(AbstractSearchStrategy.ATTR_NAME);
+ String pattern = record.getAttribute(AbstractSearchStrategy.ATTR_PATTERN);
+
+ if (savedSearchName.equalsIgnoreCase(name) && savedSearchPattern.equals(pattern)) {
+ return; // SS already exists
+
+ } else if (savedSearchName.equalsIgnoreCase(name)) {
+ Integer id = record.getAttributeAsInt(AbstractSearchStrategy.ATTR_ID);
+ updateSavedSearchPattern(id, savedSearchPattern);
+ updated = true;
+
+ } else if (savedSearchPattern.equals(pattern)) {
+ Integer id = record.getAttributeAsInt(AbstractSearchStrategy.ATTR_ID);
+ updateSavedSearchName(id, savedSearchName);
+ updated = true;
+ }
+ }
+
+ if (!updated) {
+ createSavedSearch(savedSearchName, savedSearchPattern);
+ }
}
public SearchMode getSearchMode() {
@@ -259,19 +291,16 @@ public class EnhancedSearchBar extends ToolStrip {
private void configurePickListGrid() {
pickListGrid.setCellHeight(getSearchStrategy().getCellHeight());
pickListGrid.addRecordClickHandler(getSearchStrategy());
+ pickListGrid.addRecordDoubleClickHandler(getSearchStrategy());
pickListGrid.setCellFormatter(getSearchStrategy());
pickListGrid.setShowHeader(false);
-// pickListGrid.setShowAllRecords(true);
-// pickListGrid.setBodyOverflow(Overflow.CLIP_V);
-// pickListGrid.setOverflow(Overflow.CLIP_V);
-// pickListGrid.setLeaveScrollbarGap(false);
-
}
- private void showPickListGrid(){
- pickListGrid.setLeft(searchTextItem.getLeft()+PICKLIST_LEFT_OFFSET);
- pickListGrid.setTop(searchTextItem.getTop()+PICKLIST_TOP_OFFSET);
- pickListGrid.setWidth(PICKLIST_WIDTH);
+ private void showPickListGrid() {
+ Rectangle searchTextRect = searchTextItem.getPageRect();
+ pickListGrid.setLeft(searchTextRect.getLeft());
+ pickListGrid.setWidth(searchTextRect.getWidth());
+ pickListGrid.setTop(searchTextRect.getTop() + searchTextRect.getHeight());
pickListGrid.setHeight(PICKLIST_HEIGHT);
pickListGrid.redraw();
}
@@ -293,25 +322,31 @@ public class EnhancedSearchBar extends ToolStrip {
}
public void switchToBasicSearchMode() {
+ pickListGrid.destroy();
+ pickListGrid = new ListGrid();
+
setSearchMode(SearchMode.BASIC_SEARCH_MODE);
saveSearchButton.setIcon(IconEnum.STAR_OFF.getIcon16x16Path());
saveSearchTextItem.hide();
configurePickListGrid();
- showPickListGrid();
+ populateInitialSearch();
}
public void switchToSavedSearchMode() {
+ pickListGrid.destroy();
+ pickListGrid = new ListGrid();
+
setSearchMode(SearchMode.SAVED_SEARCH_MODE);
+
saveSearchButton.setIcon(IconEnum.STAR_ON.getIcon16x16Path());
- saveSearchTextItem.show();
saveSearchTextItem.setValue(MSG.search_name_your_search());
- saveSearchTextItem.setSelectOnFocus(true);
saveSearchTextItem.selectValue();
+ saveSearchTextItem.show();
+
configurePickListGrid();
- showPickListGrid();
+ populateInitialSearch();
}
-
public String getValue() {
return searchTextItem.getValueAsString();
}
@@ -320,10 +355,28 @@ public class EnhancedSearchBar extends ToolStrip {
Subject subject = UserSessionManager.getSessionSubject();
SavedSearch newSavedSearch = new SavedSearch(searchSubsystem, name, pattern, subject);
searchService.createSavedSearch(newSavedSearch, new AsyncCallback<Integer>() {
- @Override
+
public void onSuccess(Integer newSavedSearchId) {
- Message message = new Message(MSG.search_successfully_saved_search(name), Message.Severity.Info);
+ Message message = new Message(MSG.search_successfully_saved_search(name), Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(message);
+ getSearchStrategy().searchFocusHandler();
+ }
+
+ public void onFailure(Throwable caught) {
+ Message message = new Message(MSG.search_failed_to_save_search(name), Message.Severity.Error);
+ CoreGUI.getMessageCenter().notify(message);
+ }
+ });
+ }
+
+ private void updateSavedSearchName(final int id, final String name) {
+ Subject subject = UserSessionManager.getSessionSubject();
+ searchService.updateSavedSearchName(id, name, new AsyncCallback<Boolean>() {
+
+ public void onSuccess(Boolean result) {
+ Message message = new Message(MSG.search_successfully_saved_search(name), Message.Severity.Info);
CoreGUI.getMessageCenter().notify(message);
+ getSearchStrategy().searchFocusHandler();
}
@Override
@@ -334,10 +387,32 @@ public class EnhancedSearchBar extends ToolStrip {
});
}
+ private void updateSavedSearchPattern(final int id, final String pattern) {
+ Subject subject = UserSessionManager.getSessionSubject();
+ searchService.updateSavedSearchPattern(id, pattern, new AsyncCallback<Boolean>() {
+
+ public void onSuccess(Boolean result) {
+ Message message = new Message(MSG.search_successfully_saved_search(pattern), Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(message);
+ getSearchStrategy().searchFocusHandler();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ Message message = new Message(MSG.search_failed_to_save_search(pattern), Message.Severity.Error);
+ CoreGUI.getMessageCenter().notify(message);
+ }
+ });
+ }
+
public AbstractSearchStrategy getSearchStrategy() {
return searchStrategies.get(searchMode);
}
+ public boolean isFilterEnabled() {
+ return !SearchMode.SAVED_SEARCH_MODE.equals(getSearchMode());
+ }
+
public ListGrid getPickListGrid() {
return pickListGrid;
}
@@ -349,4 +424,11 @@ public class EnhancedSearchBar extends ToolStrip {
public TextItem getSaveSearchTextItem() {
return saveSearchTextItem;
}
+
+ @Override
+ public void destroy() {
+ if (null != pickListGrid) {
+ pickListGrid.destroy();
+ }
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
index 78ae88d..8092f38 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
@@ -22,19 +22,22 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DataSource;
-import com.smartgwt.client.data.fields.DataSourceIntegerField;
+import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.grid.events.RecordClickEvent;
+import com.smartgwt.client.widgets.grid.events.RecordDoubleClickEvent;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.SavedSearchCriteria;
import org.rhq.core.domain.search.SavedSearch;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
/**
* Search Strategy for the Favorite Saved Searches.
@@ -77,23 +80,44 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
*/
@Override
public void onRecordClick(RecordClickEvent event) {
- // do nothing here; just here if we need to do something
searchBar.getSaveSearchTextItem().setValue(event.getRecord().getAttribute(ATTR_NAME));
searchBar.getSearchTextItem().setValue(event.getRecord().getAttribute(ATTR_PATTERN));
+ searchBar.getSearchTextItem().focusInItem();
+ }
+
+ @Override
+ public void onRecordDoubleClick(RecordDoubleClickEvent event) {
+ Record record = event.getRecord();
+ Integer id = record.getAttributeAsInt(ATTR_ID);
+ final String name = record.getAttribute(ATTR_NAME);
+ GWTServiceLookup.getSearchService().deleteSavedSearch(id, new AsyncCallback<Void>() {
+ @Override
+ public void onSuccess(Void result) {
+ Message message = new Message(MSG.search_successfully_deleted_search(name), Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(message);
+ populateSavedSearches();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ Message message = new Message(MSG.search_failed_to_save_search(name), Message.Severity.Error);
+ CoreGUI.getMessageCenter().notify(message);
+ }
+ });
}
@Override
public void searchKeyUpHandler(KeyUpEvent keyUpEvent) {
- populateSearchComboboxSavedSearchesWithAutoComplete();
+ // do nothing
}
@Override
public void searchFocusHandler() {
- // nothing currently
+ populateSavedSearches();
}
- private void populateSearchComboboxSavedSearchesWithAutoComplete() {
+ private void populateSavedSearches() {
Log.debug("Search Saved Searches");
SavedSearchCriteria savedSearchCriteria = new SavedSearchCriteria();
@@ -114,6 +138,7 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
public void onSuccess(List<SavedSearch> result) {
long fetchTime = System.currentTimeMillis() - startTime;
Log.debug(result.size() + " saved searches fetched in: " + fetchTime + "ms");
+
ListGrid searchBarPickListGrid = searchBar.getPickListGrid();
DataSource ds = searchBarPickListGrid.getDataSource();
@@ -122,16 +147,13 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
ds.setClientOnly(true);
DataSourceTextField valueField = new DataSourceTextField(ATTR_ID, "Id");
valueField.setPrimaryKey(true);
- DataSourceTextField kindField = new DataSourceTextField(ATTR_KIND, "Kind");
- DataSourceTextField nameField = new DataSourceTextField(ATTR_NAME, "Name");
- DataSourceTextField patternField = new DataSourceTextField(ATTR_PATTERN, "Pattern");
- DataSourceTextField descriptionField = new DataSourceTextField(ATTR_DESCRIPTION, "Description");
- DataSourceIntegerField recordCount = new DataSourceIntegerField(ATTR_RESULT_COUNT, "Result Count");
- ds.setFields(valueField, kindField, nameField, patternField, descriptionField, recordCount);
+ ds.setFields(valueField);
+ searchBarPickListGrid.setDataSource(ds);
+
} else {
ds.invalidateCache();
}
- searchBarPickListGrid.setData(new ListGridRecord[] {});
+
for (SavedSearch savedSearch : result) {
Log.debug("savedSearch: " + savedSearch.getName());
ListGridRecord record = new ListGridRecord();
@@ -146,6 +168,7 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
}
try {
+ searchBarPickListGrid.setData(new ListGridRecord[] {});
searchBarPickListGrid.fetchData();
} catch (Exception e) {
Log.debug("Caught exception on fetchData: " + e);
@@ -162,6 +185,5 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
@Override
public void searchReturnKeyHandler(KeyUpEvent keyUpEvent) {
// do nothing
- Log.debug("return key in SavedSearchProvider");
}
}
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 0d731ab..3144439 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
@@ -432,7 +432,8 @@ search_failed_to_retrieve_saved_search = Failed to retrieve saved search
search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
search_failed_to_save_search = Failed to Save Search: {0}
search_invalid_search_expression = Invalid search expression.
-search_name_your_search = name you search
+search_name_your_search = name of search
+search_successfully_deleted_search = Successfully Deleted Search: {0}
search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Parent Ancestry for:
util_errorHandler_nullException = exception was null
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index b4ba1e4..5cc58ac 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -451,7 +451,8 @@ group_tree_partialClusterTooltip = {0} z {1} Älenů skupiny má "{2}" zdroj
##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
##search_failed_to_save_search = Failed to Save Search: {0}
##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name you search
+##search_name_your_search = name of search
+##search_successfully_deleted_search = Successfully Deleted Search: {0}
##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Původ rodiÄe pro:
util_errorHandler_nullException = vÃœjimka byla null
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 016b160..4d5d3ab 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -416,7 +416,8 @@ group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2
##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
##search_failed_to_save_search = Failed to Save Search: {0}
##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name you search
+##search_name_your_search = name of search
+##search_successfully_deleted_search = Successfully Deleted Search: {0}
##search_successfully_saved_search = Successfully Saved Search: {0}
util_disambiguationReportDecorator_pluginSuffix = ({0} Plugin)
util_errorHandler_nullException = Exception war null
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 1f24034..9edfac2 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -429,7 +429,8 @@ group_tree_partialClusterTooltip = {1} ã®äžã® {0} ã°ã«ãŒãã¡ã³ããŒã
##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
##search_failed_to_save_search = Failed to Save Search: {0}
##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name you search
+##search_name_your_search = name of search
+##search_successfully_deleted_search = Successfully Deleted Search: {0}
##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = 芪ã®å
ç¥ :
util_disambiguationReportDecorator_pluginSuffix = ({0} ãã©ã°ã€ã³)
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
index f832c7d..54421b1 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
@@ -386,7 +386,8 @@ search_failed_to_retrieve_saved_search = ì ì¥ë ê²ìì ê²ìíì§ ëª»í
search_failed_to_retrieve_search_suggestion = ì¶ì² ê²ììŽë¥Œ ê²ìíì§ ëª»íìµëë€
search_failed_to_save_search = ê²ìì ì ì¥íì§ ëª»íìµëë€: {0}
search_invalid_search_expression = ì못ë ê²ì íí.
-search_name_your_search = ê²ì ìŽëŠ
+##search_name_your_search = name of search
+##search_successfully_deleted_search = Successfully Deleted Search: {0}
search_successfully_saved_search = ì±ê³µì ìŒë¡ ì ì¥ë ê²ì: {0}
util_ancestry_parentAncestry = ë¶ëªšì ì¡°ì:
util_errorHandler_nullException = ììžë nullìŽììµëë€.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index bb7d48b..4e17344 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -434,7 +434,8 @@ group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' r
##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
##search_failed_to_save_search = Failed to Save Search: {0}
##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name you search
+##search_name_your_search = name of search
+##search_successfully_deleted_search = Successfully Deleted Search: {0}
##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Ancestral para:
util_errorHandler_nullException = Exce\u00E7\u00E3o nula
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index f354bd8..54f47af 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -2506,6 +2506,9 @@ favorites_resources = ÐзбÑаММÑе ÑеÑÑÑÑÑ
filter_from_date = ÐÑ
filter_to_date = ÐП
group_tree_partialClusterTooltip = {0} Оз {1} ÑлеМПв гÑÑÐ¿Ð¿Ñ ÐžÐŒÐµÑÑ ÑеÑÑÑÑ ''{2}''
+##search_name_your_search = name of search
+##search_successfully_deleted_search = Successfully Deleted Search: {0}
+##search_successfully_saved_search = Successfully Saved Search: {0}
util_errorHandler_nullException = ÐПзМОклП null ОÑклÑÑеМОе
util_monitoringRequestCallback_error_checkServerStatusFailure = Ðе ÑЎаеÑÑÑ ÐŸÐ¿ÑеЎелОÑÑ ÑÑаÑÑÑ Ð°Ð²ÑПÑОзаÑОО - пÑПвеÑÑÑе ÑПÑÑПÑМОе ÑеÑвеÑа.
util_userPerm_loadFailGlobal = Ðе ÑЎаеÑÑÑ Ð·Ð°Ð³ÑÑзОÑÑ Ð²Ð°ÑО глПбалÑÐœÑе пПлМПЌПÑÐžÑ - Ме пÑеЎПÑÑавлеМÑ.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index e19f5f2..abe3253 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -424,7 +424,8 @@ group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\
##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
##search_failed_to_save_search = Failed to Save Search: {0}
##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name you search
+##search_name_your_search = name of search
+##search_successfully_deleted_search = Successfully Deleted Search: {0}
##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Parent Ancestry for:
util_errorHandler_nullException = \u5f02\u5e38\u662f null
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java
index 646a24a..861affc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java
@@ -60,7 +60,7 @@ public class SavedSearchManagerBean implements SavedSearchManagerLocal /* local
* @see SavedSearchManagerRemote#updateSavedSearch(Subject, SavedSearch)
*/
public boolean updateSavedSearch(Subject subject, SavedSearch savedSearch) {
- // this needs to prevent certains types of updates, be more sophisticated, etc
+ // this needs to prevent certain types of updates, be more sophisticated, etc
validateManipulatePermission(subject, savedSearch);
SavedSearch oldSavedSearch = entityManager.find(SavedSearch.class, savedSearch.getId());
if (null == oldSavedSearch || oldSavedSearch.equals(savedSearch)) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
index ca9bfab..9d03610 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java
@@ -439,8 +439,8 @@ public class SearchAssistManager {
+ primarySimpleContext + "]");
}
- List<String> valueSuggestions = padWithQuotes(beforeCaret, completor.getValues(primarySimpleContext, null,
- parsedTerm));
+ List<String> valueSuggestions = padWithQuotes(beforeCaret,
+ completor.getValues(primarySimpleContext, null, parsedTerm));
List<SearchSuggestion> suggestions = convert(valueSuggestions, parsed, parsedTerm, Kind.Simple);
return suggestions;
}
@@ -540,8 +540,8 @@ public class SearchAssistManager {
LOG.debug("getAdvancedSuggestions: operator state");
if (allComparisonOperators.contains(parsed.operator)) {
LOG.debug("search term is complete operator, suggesting values instead");
- List<String> valueSuggestions = padWithQuotes(beforeCaret, completor.getValues(parsed.context,
- parsed.param, ""));
+ List<String> valueSuggestions = padWithQuotes(beforeCaret,
+ completor.getValues(parsed.context, parsed.param, ""));
if (completor.getSimpleContexts().contains(parsed.context)) {
LOG.debug("getAdvancedSuggestions: suggesting value completions for a simple context");
return convert(pad(parsed.context + parsed.operator, valueSuggestions, ""));
@@ -568,8 +568,8 @@ public class SearchAssistManager {
}
case VALUE:
LOG.debug("getAdvancedSuggestions: value state");
- List<String> valueSuggestions = padWithQuotes(beforeCaret, completor.getValues(parsed.context,
- parsed.param, parsed.value));
+ List<String> valueSuggestions = padWithQuotes(beforeCaret,
+ completor.getValues(parsed.context, parsed.param, parsed.value));
if (completor.getSimpleContexts().contains(parsed.context)) {
LOG.debug("getAdvancedSuggestions: suggesting value completions for a simple context");
return convert(pad(parsed.context + parsed.operator, valueSuggestions, ""), parsed, parsed.value);
@@ -629,8 +629,8 @@ public class SearchAssistManager {
}
String value = next.getName();
int index = next.getName().toLowerCase().indexOf(expression);
- SearchSuggestion suggestion = new SearchSuggestion(Kind.UserSavedSearch, label, value, index, expression
- .length());
+ SearchSuggestion suggestion = new SearchSuggestion(Kind.UserSavedSearch, label, value, next.getPattern(),
+ index, expression.length());
results.add(suggestion);
}
return results;
@@ -668,8 +668,8 @@ public class SearchAssistManager {
}
String value = next.getName();
int index = next.getName().toLowerCase().indexOf(expression);
- SearchSuggestion suggestion = new SearchSuggestion(Kind.GlobalSavedSearch, label, value, index, expression
- .length());
+ SearchSuggestion suggestion = new SearchSuggestion(Kind.GlobalSavedSearch, label, value, next.getPattern(),
+ index, expression.length());
results.add(suggestion);
}
return results;
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 15 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java | 20 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java | 43 ++++++----
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 18 +---
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 18 +---
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 18 +---
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 18 +---
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties | 17 +--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 18 +---
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 17 +++
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 18 +---
12 files changed, 111 insertions(+), 111 deletions(-)
New commits:
commit 0e4fbbbc258cd3f90e5ba1136992440b619edd38
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Apr 2 14:19:42 2013 -0400
Bug 921927
- add confirm box for delete
- add some tooltips
- clean up some related message properties
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
index a799311..2b8f0f2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java
@@ -110,12 +110,12 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
}
@Override
- public void executeFetch(final DSRequest request, final DSResponse response, final ResourceGroupCriteria criteria ) {
+ public void executeFetch(final DSRequest request, final DSResponse response, final ResourceGroupCriteria criteria) {
groupService.findResourceGroupCompositesByCriteria(criteria,
new AsyncCallback<PageList<ResourceGroupComposite>>() {
public void onFailure(Throwable caught) {
if (caught.getMessage().contains("SearchExpressionException")) {
- Message message = new Message(MSG.search_invalid_search_expression(), Message.Severity.Error);
+ Message message = new Message(MSG.view_searchBar_suggest_noSuggest(), Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
} else {
CoreGUI.getErrorHandler().handleError(MSG.view_inventory_groups_loadFailed(), caught);
@@ -123,14 +123,15 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
response.setStatus(RPCResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
-
+
private PageList<ResourceGroupComposite> applyAvailabilitySearchFilter(
- PageList<ResourceGroupComposite> result){
+ PageList<ResourceGroupComposite> result) {
if (!isAvailabilitySearch(criteria)) {
return result;
}
- PageList<ResourceGroupComposite> pageList = new PageList<ResourceGroupComposite>(result.getPageControl());
+ PageList<ResourceGroupComposite> pageList = new PageList<ResourceGroupComposite>(result
+ .getPageControl());
for (ResourceGroupComposite rgc : result) {
if (rgc.getExplicitCount() > 0) {
@@ -286,8 +287,8 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou
results.append(getColumn(false, " <img height=\"12\" width=\"12\" src=\"" + imagePath + "\" />",
unknown));
} else {
- results.append(getColumn(false,
- " <img src=\"/images/blank.png\" width=\"1px\" height=\"1px\" />"));
+ results
+ .append(getColumn(false, " <img src=\"/images/blank.png\" width=\"1px\" height=\"1px\" />"));
}
}
results.append("</tr></table>");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
index efa985d..d2089b4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/BasicSearchStrategy.java
@@ -217,7 +217,7 @@ public class BasicSearchStrategy extends AbstractSearchStrategy {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.search_failed_to_retrieve_search_suggestion(), caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_suggest_failSuggest(), caught);
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
index c150765..dcc7bda 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/EnhancedSearchBar.java
@@ -190,6 +190,7 @@ public class EnhancedSearchBar extends ToolStrip {
searchTextButton = new ToolStripButton();
searchTextButton.setIcon(IconEnum.ARROW_GRAY.getIcon16x16Path());
+ searchTextButton.setTooltip(MSG.view_searchBar_buttonTooltip());
searchTextButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -205,6 +206,7 @@ public class EnhancedSearchBar extends ToolStrip {
saveSearchButton = new ToolStripButton();
saveSearchButton.setIcon(IconEnum.STAR_OFF.getIcon16x16Path());
+ saveSearchButton.setTooltip(MSG.view_searchBar_savedSearch_buttonTooltip());
saveSearchButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -265,7 +267,7 @@ public class EnhancedSearchBar extends ToolStrip {
} else if (savedSearchName.equalsIgnoreCase(name)) {
Integer id = record.getAttributeAsInt(AbstractSearchStrategy.ATTR_ID);
- updateSavedSearchPattern(id, savedSearchPattern);
+ updateSavedSearchPattern(id, name, savedSearchPattern);
updated = true;
} else if (savedSearchPattern.equals(pattern)) {
@@ -339,7 +341,7 @@ public class EnhancedSearchBar extends ToolStrip {
setSearchMode(SearchMode.SAVED_SEARCH_MODE);
saveSearchButton.setIcon(IconEnum.STAR_ON.getIcon16x16Path());
- saveSearchTextItem.setValue(MSG.search_name_your_search());
+ saveSearchTextItem.setValue(MSG.view_searchBar_savedSearch_namePrompt());
saveSearchTextItem.selectValue();
saveSearchTextItem.show();
@@ -357,13 +359,13 @@ public class EnhancedSearchBar extends ToolStrip {
searchService.createSavedSearch(newSavedSearch, new AsyncCallback<Integer>() {
public void onSuccess(Integer newSavedSearchId) {
- Message message = new Message(MSG.search_successfully_saved_search(name), Message.Severity.Info);
+ Message message = new Message(MSG.view_searchBar_savedSearch_save(name), Message.Severity.Info);
CoreGUI.getMessageCenter().notify(message);
getSearchStrategy().searchFocusHandler();
}
public void onFailure(Throwable caught) {
- Message message = new Message(MSG.search_failed_to_save_search(name), Message.Severity.Error);
+ Message message = new Message(MSG.view_searchBar_savedSearch_failSave(name), Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
}
});
@@ -374,32 +376,32 @@ public class EnhancedSearchBar extends ToolStrip {
searchService.updateSavedSearchName(id, name, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean result) {
- Message message = new Message(MSG.search_successfully_saved_search(name), Message.Severity.Info);
+ Message message = new Message(MSG.view_searchBar_savedSearch_save(name), Message.Severity.Info);
CoreGUI.getMessageCenter().notify(message);
getSearchStrategy().searchFocusHandler();
}
@Override
public void onFailure(Throwable caught) {
- Message message = new Message(MSG.search_failed_to_save_search(name), Message.Severity.Error);
+ Message message = new Message(MSG.view_searchBar_savedSearch_failRename(name), Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
}
});
}
- private void updateSavedSearchPattern(final int id, final String pattern) {
+ private void updateSavedSearchPattern(final int id, final String name, final String pattern) {
Subject subject = UserSessionManager.getSessionSubject();
searchService.updateSavedSearchPattern(id, pattern, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean result) {
- Message message = new Message(MSG.search_successfully_saved_search(pattern), Message.Severity.Info);
+ Message message = new Message(MSG.view_searchBar_savedSearch_save(name), Message.Severity.Info);
CoreGUI.getMessageCenter().notify(message);
getSearchStrategy().searchFocusHandler();
}
@Override
public void onFailure(Throwable caught) {
- Message message = new Message(MSG.search_failed_to_save_search(pattern), Message.Severity.Error);
+ Message message = new Message(MSG.view_searchBar_savedSearch_failSave(name), Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
index 8092f38..fdd8fa5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/searchbar/FavoritesSearchStrategy.java
@@ -24,6 +24,8 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DataSource;
import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.util.BooleanCallback;
+import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -87,22 +89,33 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
@Override
public void onRecordDoubleClick(RecordDoubleClickEvent event) {
- Record record = event.getRecord();
- Integer id = record.getAttributeAsInt(ATTR_ID);
+ final Record record = event.getRecord();
final String name = record.getAttribute(ATTR_NAME);
- GWTServiceLookup.getSearchService().deleteSavedSearch(id, new AsyncCallback<Void>() {
- @Override
- public void onSuccess(Void result) {
- Message message = new Message(MSG.search_successfully_deleted_search(name), Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(message);
- populateSavedSearches();
- }
-
- @Override
- public void onFailure(Throwable caught) {
- Message message = new Message(MSG.search_failed_to_save_search(name), Message.Severity.Error);
- CoreGUI.getMessageCenter().notify(message);
+ SC.ask(MSG.view_searchBar_savedSearch_confirmDelete(name), new BooleanCallback() {
+ public void execute(Boolean confirmed) {
+ if (confirmed) {
+ Integer id = record.getAttributeAsInt(ATTR_ID);
+
+
+ GWTServiceLookup.getSearchService().deleteSavedSearch(id, new AsyncCallback<Void>() {
+
+ @Override
+ public void onSuccess(Void result) {
+ Message message = new Message(MSG.view_searchBar_savedSearch_delete(name),
+ Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(message);
+ populateSavedSearches();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ Message message = new Message(MSG.view_searchBar_savedSearch_failDelete(name),
+ Message.Severity.Error);
+ CoreGUI.getMessageCenter().notify(message);
+ }
+ });
+ }
}
});
}
@@ -131,7 +144,7 @@ public class FavoritesSearchStrategy extends AbstractSearchStrategy {
@Override
public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.search_failed_to_retrieve_saved_search(), caught);
+ CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_savedSearch_failFetch(), caught);
}
@Override
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 3144439..38a9605 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
@@ -428,13 +428,6 @@ filter_from_date = From
filter_to_date = To
group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
-search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-search_failed_to_save_search = Failed to Save Search: {0}
-search_invalid_search_expression = Invalid search expression.
-search_name_your_search = name of search
-search_successfully_deleted_search = Successfully Deleted Search: {0}
-search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Parent Ancestry for:
util_errorHandler_nullException = exception was null
util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.
@@ -1955,17 +1948,20 @@ view_resource_monitor_table_min = Minimum
view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
view_resource_title_component_errors_tooltip = Shows managed component errors. Click for details
view_resource_title_tagUpdateFailed = Failed to update resource tags
-view_searchBar_defaultPattern = name your pattern
-view_searchBar_instructional_failSuggest = Failed to generate suggestions, see server log for possible errors
-view_searchBar_instructional_noSuggest = No matches, enter a different pattern
-view_searchBar_instructional_refresh = Failed to retrieve saved searches, please refresh page
+view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
+view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
+view_searchBar_savedSearch_namePrompt = name your search
view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+view_searchBar_suggest_failSuggest = Failed to generate suggestions, see server log for possible errors
+view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_searchGUI_loginStatus = Unable to determine login status, check server status
view_selector_assigned = Assigned {0}
view_selector_available = Available {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index 5cc58ac..e8faace 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -447,13 +447,6 @@ filter_from_date = Od
filter_to_date = Do
group_tree_groupOfResourceType = Skupina: [{0}]
group_tree_partialClusterTooltip = {0} z {1} Älenů skupiny má "{2}" zdroj
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Původ rodiÄe pro:
util_errorHandler_nullException = vÃœjimka byla null
util_monitoringRequestCallback_error_checkServerStatusFailure = NepodaÅilo se urÄit stav pÅihlaÅ¡ovánà - zkontrolujte stav serveru.
@@ -1968,17 +1961,20 @@ view_resource_monitor_table_min = Minimum
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
view_resource_title_component_errors_tooltip = Zobrazà chyby ÅÃzenÃœch komponent (managed component). KliknÄte pro detaily.
view_resource_title_tagUpdateFailed = NepodaÅilo se zmÄnit tagy zdroje
-view_searchBar_defaultPattern = pojmenujte svůj vzor
-view_searchBar_instructional_failSuggest = NepodaÅilo se vygenerovat návrhy, podÃvejte se do logu serveru kvůli moÅŸnÃœm chybám.
-view_searchBar_instructional_noSuggest = Nic nenalezeno, vloşte jinÜ vzor
-view_searchBar_instructional_refresh = NepodaÅilo se zÃskat "uloÅŸená hledánÃ", prosÃm obnovte si stránku.
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = ÃspÄÅ¡nÄ smazáno "uloÅŸené hledánÃ" [{0}]
view_searchBar_savedSearch_failDelete = NepodaÅilo se smazat "uloÅŸené hledánÃ" se jménem [{0}]
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = NepodaÅilo se nalézt "uloÅŸené hledánÃ" se jménem [{0}]
view_searchBar_savedSearch_failRename = NepodaÅilo se pÅejmenovat "uloÅŸené hledánÃ" se jménem [{0}]
view_searchBar_savedSearch_failSave = NepodaÅilo se vytvoÅit "uloÅŸené hledánÃ" se jménem [{0}]
+view_searchBar_savedSearch_namePrompt = pojmenujte svůj vzor
view_searchBar_savedSearch_rename = ÃspÄÅ¡nÄ pÅejmenováno "uloÅŸené hledánÃ" na [{0}]
view_searchBar_savedSearch_save = ÃspÄÅ¡nÄ vytvoÅeno "uloÅŸené hledánÃ" [{0}]
+view_searchBar_suggest_failSuggest = NepodaÅilo se vygenerovat návrhy, podÃvejte se do logu serveru kvůli moÅŸnÃœm chybám.
+view_searchBar_suggest_noSuggest = Nic nenalezeno, vloşte jinÜ vzor
view_searchGUI_loginStatus = Nelze urÄit stav pÅihlaÅ¡ovánÃ, zkontrolujte stav serveru
view_selector_assigned = PÅidÄlené {0}
view_selector_available = Dostupné {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 4d5d3ab..ee5dfa3 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -412,13 +412,6 @@ filter_from_date = Von
filter_to_date = Bis
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2}'' Ressource
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_disambiguationReportDecorator_pluginSuffix = ({0} Plugin)
util_errorHandler_nullException = Exception war null
##util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status.
@@ -1754,17 +1747,20 @@ view_resource_monitor_table_max = Maximum
view_resource_monitor_table_min = Minimum
view_resource_title_component_errors_tooltip = Zeigt Fehler der gemanagten Ressource. Klicken fÃŒr Details
view_resource_title_tagUpdateFailed = Fehler beim Aktualisieren der Ressourcen-Tags
-view_searchBar_defaultPattern = benennen Sie Ihr Suchmuster
-view_searchBar_instructional_failSuggest = Konnte keine VorschlÀge generieren. Bitte schauen Sie in das Server-Log fÌr mögliche Fehler
-view_searchBar_instructional_noSuggest = Keine Treffer. Bitte geben Sie ein anderes Suchmuster ein
-view_searchBar_instructional_refresh = Konnte die gespeicherten Suchen nicht laden. Bitte laden Sie die Seite neu
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = Gespeicherte Suche [{0}] erflogreich gelöscht
view_searchBar_savedSearch_failDelete = Konnte die gespeicherte Suche mit Namen [{0}] nicht löschen
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = Konnte die gespeicherte Suche mit Namen [{0}] nicht finden
view_searchBar_savedSearch_failRename = Konnte die gespeicherte Suche mit Namen [{0}] nicht umbenennen
view_searchBar_savedSearch_failSave = Konnte die gespeicherte Suche mit Namen [{0}] nicht speichern
+view_searchBar_savedSearch_namePrompt = benennen Sie Ihr Suchmuster
view_searchBar_savedSearch_rename = Die gespeicherte Suche wurde erfolgreich nach [{0}] umbenannt
view_searchBar_savedSearch_save = Die gespeicherte Suche [{0}] wurde erfolgreich angelegt
+view_searchBar_suggest_failSuggest = Konnte keine VorschlÀge generieren. Bitte schauen Sie in das Server-Log fÌr mögliche Fehler
+view_searchBar_suggest_noSuggest = Keine Treffer. Bitte geben Sie ein anderes Suchmuster ein
##view_searchGUI_loginStatus = Unable to determine login status, check server status
view_selector_assigned = Zugewiesen {0}
view_selector_available = VerfÃŒgbar {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 9edfac2..3772a39 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -425,13 +425,6 @@ filter_from_date = éå§
filter_to_date = çµäº
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {1} ã®äžã® {0} ã°ã«ãŒãã¡ã³ããŒã ''{2}'' ãªãœãŒã¹ãæã£ãŠããŸã
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = 芪ã®å
ç¥ :
util_disambiguationReportDecorator_pluginSuffix = ({0} ãã©ã°ã€ã³)
util_errorHandler_nullException = äŸå€ã¯ null ã§ãã
@@ -1939,17 +1932,20 @@ view_resource_monitor_table_min = æå°
view_resource_title_component_errors_cleanup = åé¡ã«åãçµãã åŸã¯ã以äžã®ã¡ãã»ãŒãžãåé€ããŠå
šç»é¢ã®'管çã³ã³ããŒãã³ããšã©ãŒ'ãã¯ãªã¢ããå¿
èŠããããŸãã
view_resource_title_component_errors_tooltip = 管çã³ã³ããŒãã³ããšã©ãŒã®è¡šç€ºã詳现ã¯ã¯ãªãã¯ããŠãã ãã
view_resource_title_tagUpdateFailed = ãªãœãŒã¹ã¿ã°ã®æŽæ°ã«å€±æããŸãã
-view_searchBar_defaultPattern = ãã¿ãŒã³ãååãä»ããŠãã ãã
-view_searchBar_instructional_failSuggest = ãµãžã§ãã·ã§ã³ã®äœæã«å€±æããŸãããå¯èœæ§ã®ãããšã©ãŒããµãŒããŒãã°ãã調ã¹ãŠãã ããã
-view_searchBar_instructional_noSuggest = äžä»¶ãäžèŽããŸããã§ãããç°ãªããã¿ãŒã³ãå
¥åããŠãã ããã
-view_searchBar_instructional_refresh = ä¿åæžã¿ã®æ€çŽ¢ã®åãåºãã«å€±æããŸãããããŒãžããªãã¬ãã·ã¥ããŠãã ããã
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = ä¿åæžã¿ã®æ€çŽ¢ [{0}] ãåé€ããã®ã«å€±æããŸãã
view_searchBar_savedSearch_failDelete = [{0}]ãšããååã®ä¿åæžã¿æ€çŽ¢ãåé€ããã®ã«å€±æããŸãã
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = [{0}]ãšããååã®ä¿åæžã¿æ€çŽ¢ãæ€çŽ¢ããã®ã«å€±æããŸãã
view_searchBar_savedSearch_failRename = [{0}]ãšããååã®ä¿åæžã¿ã®æ€çŽ¢ã®ååãå€æŽããã®ã«å€±æããŸãã
view_searchBar_savedSearch_failSave = [{0}]ãšããååã®ä¿åæžã¿ã®æ€çŽ¢ãäœæããã®ã«å€±æããŸãã
+view_searchBar_savedSearch_namePrompt = ãã¿ãŒã³ãååãä»ããŠãã ãã
view_searchBar_savedSearch_rename = ä¿åæžã¿æ€çŽ¢ã®ååã [{0}] ãžå€æŽããã®ã«æåããŸãã
view_searchBar_savedSearch_save = [{0}] ãšããååã®ä¿åæžã¿æ€çŽ¢ãäœæããã®ã«æåããŸãã
+view_searchBar_suggest_failSuggest = ãµãžã§ãã·ã§ã³ã®äœæã«å€±æããŸãããå¯èœæ§ã®ãããšã©ãŒããµãŒããŒãã°ãã調ã¹ãŠãã ããã
+view_searchBar_suggest_noSuggest = äžä»¶ãäžèŽããŸããã§ãããç°ãªããã¿ãŒã³ãå
¥åããŠãã ããã
view_searchGUI_loginStatus = ãã°ã€ã³ã¹ããŒã¿ã¹ã確å®ã§ããŸããããµãŒããŒã®ç¶æ
ã調ã¹ãŠãã ãã
view_selector_assigned = å²ãåœãŠããã {0}
view_selector_available = å©çšå¯èœãª {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
index 54421b1..fd7f639 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ko.properties
@@ -382,13 +382,6 @@ favorites_resources = ìŠê²šì°Ÿêž° 늬ìì€
filter_from_date = ìì
group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {1} ì€ {0} 귞룹 ë©€ë²ê° ''{2}'' ììì ê°ì§ê³ ììµëë€.
-search_failed_to_retrieve_saved_search = ì ì¥ë ê²ìì ê²ìíì§ ëª»íìµëë€
-search_failed_to_retrieve_search_suggestion = ì¶ì² ê²ììŽë¥Œ ê²ìíì§ ëª»íìµëë€
-search_failed_to_save_search = ê²ìì ì ì¥íì§ ëª»íìµëë€: {0}
-search_invalid_search_expression = ì못ë ê²ì íí.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-search_successfully_saved_search = ì±ê³µì ìŒë¡ ì ì¥ë ê²ì: {0}
util_ancestry_parentAncestry = ë¶ëªšì ì¡°ì:
util_errorHandler_nullException = ììžë nullìŽììµëë€.
util_monitoringRequestCallback_error_checkServerStatusFailure = ë¡ê·žìž ìí륌 íìží ì ììµëë€ - ìë²ì ìí륌 íìžíììì
@@ -1612,16 +1605,20 @@ view_resource_monitor_table_min = ìµì
view_resource_title_component_errors_cleanup = ìŽ ë¬žì 륌 íŽê²° í íìë ìŽì íë©Žìì 'êŽëŠ¬ êµ¬ì± ìì ì€ë¥'ììŽìœì ìì íë €ë©Ž ìëì ë©ìì§ë¥Œ ìì íŽìŒí©ëë€.
view_resource_title_component_errors_tooltip = êŽëŠ¬ êµ¬ì± ìì ì€ë¥ íì. ììží ëŽì©ì íŽëŠíììì€
view_resource_title_tagUpdateFailed = 늬ìì€ íê·ž ê°±ì ì ì€íšíìµëë€
-view_searchBar_defaultPattern = íšíŽ ìŽëŠì ë¶ì¬ì£Œìžì
-view_searchBar_instructional_failSuggest = ì ìì ìì±íì§ ëª»íìµëë€. ë°ìí ì ìë ì€ë¥ì ëí ìë² ë¡ê·žë¥Œ ì°žì¡°íììì€
-view_searchBar_instructional_refresh = ì ì¥ë ê²ì ì ê±°ì ì€íšíìµëë€. íìŽì§ë¥Œ ìë¡ê³ 칚 íììì€
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
view_searchBar_savedSearch_delete = ì ì¥ë ê²ì [{0}]ì ì ê±°íëë° ì±ê³µíìµëë€
view_searchBar_savedSearch_failDelete = [{0}]ëŒë ì ì¥ë ê²ìì ìì íëë° ì€íšíìµëë€
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
view_searchBar_savedSearch_failFind = [{0}]ëŒë ì ì¥ë ê²ìì ê²ìíëë° ì€íšíìµëë€
view_searchBar_savedSearch_failRename = [{0}]ëŒë ì ì¥ë ê²ìì ìŽëŠì ë³ê²œíëë° ì€íšíìµëë€
view_searchBar_savedSearch_failSave = [{0}]ëŒë ì ì¥ë ê²ìì ìì±ì ì€íšíìµëë€
+view_searchBar_savedSearch_namePrompt = íšíŽ ìŽëŠì ë¶ì¬ì£Œìžì
view_searchBar_savedSearch_rename = ì ì¥ë ê²ì [{0}]ì ìŽëŠì ë³ê²œíëë° ì±ê³µíìµëë€
view_searchBar_savedSearch_save = [{0}]ëŒë ì ì¥ë ê²ìì ë§ëëë° ì±ê³µíìµëë€
+view_searchBar_suggest_failSuggest = ì ìì ìì±íì§ ëª»íìµëë€. ë°ìí ì ìë ì€ë¥ì ëí ìë² ë¡ê·žë¥Œ ì°žì¡°íììì€
+##view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_searchGUI_loginStatus = ë¡ê·žìž ìí륌 íëší ì ììµëë€, ìë²ì ìí륌 íìžíììì€
view_selector_assigned = í ë¹ë {0}
view_selector_available = ì¬ì©ê°ë¥í {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index 4e17344..c8d730d 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -430,13 +430,6 @@ favorites_resources = Recursos Favoritos
##filter_to_date = To
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Ancestral para:
util_errorHandler_nullException = Exce\u00E7\u00E3o nula
util_monitoringRequestCallback_error_checkServerStatusFailure = Imposs\u00EDvel verificar o status do login - verifique o status do Servidor.
@@ -2050,17 +2043,20 @@ view_resource_monitor_table_min = Minimum
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
view_resource_title_component_errors_tooltip = Shows managed component errors. Click for details
view_resource_title_tagUpdateFailed = Failed to update resource tags
-view_searchBar_defaultPattern = definir nome para o padr\u00E3o
-##view_searchBar_instructional_failSuggest = Failed to generate suggestions, see server log for possible errors
-view_searchBar_instructional_noSuggest = No matches, enter a different pattern
-##view_searchBar_instructional_refresh = Failed to retrieve saved searches, please refresh page
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
##view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
##view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
##view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
##view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
##view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
+view_searchBar_savedSearch_namePrompt = definir nome para o padr\u00E3o
##view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
##view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+##view_searchBar_suggest_failSuggest = Failed to generate suggestions, see server log for possible errors
+##view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_searchGUI_loginStatus = Imposs\u00EDvel determinar o status do login, verifique o status do servidor
view_selector_assigned = Associado {0}
view_selector_available = Dispon\u00EDvel {0}
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index 54f47af..ac55382 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -2506,9 +2506,6 @@ favorites_resources = ÐзбÑаММÑе ÑеÑÑÑÑÑ
filter_from_date = ÐÑ
filter_to_date = ÐП
group_tree_partialClusterTooltip = {0} Оз {1} ÑлеМПв гÑÑÐ¿Ð¿Ñ ÐžÐŒÐµÑÑ ÑеÑÑÑÑ ''{2}''
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_errorHandler_nullException = ÐПзМОклП null ОÑклÑÑеМОе
util_monitoringRequestCallback_error_checkServerStatusFailure = Ðе ÑЎаеÑÑÑ ÐŸÐ¿ÑеЎелОÑÑ ÑÑаÑÑÑ Ð°Ð²ÑПÑОзаÑОО - пÑПвеÑÑÑе ÑПÑÑПÑМОе ÑеÑвеÑа.
util_userPerm_loadFailGlobal = Ðе ÑЎаеÑÑÑ Ð·Ð°Ð³ÑÑзОÑÑ Ð²Ð°ÑО глПбалÑÐœÑе пПлМПЌПÑÐžÑ - Ме пÑеЎПÑÑавлеМÑ.
@@ -2677,4 +2674,18 @@ view_group_detail_implicitAvail = Group availability for all members (includes r
##view_operationHistoryList_deleteFailure = Failed to delete operation history [{0}].
##view_operationHistoryList_deletePartialSuccess = Deleted [{0}] operation history items, but failed to delete the items with the following IDs: {1}
##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
+##view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
+##view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
+##view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
+##view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
+##view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
+##view_searchBar_savedSearch_namePrompt = name your search
+##view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
+##view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+##view_searchBar_suggest_failSuggest = Failed to generate suggestions, see server log for possible errors
+##view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_tabs_common_graphs_cubism = Cubism гÑаÑОкО
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index abe3253..582be3a 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -420,13 +420,6 @@ favorites_resources = \u8d44\u6e90\u6536\u85cf\u5939
##filter_to_date = To
##group_tree_groupOfResourceType = Group of [{0}]
group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\u62e5\u6709 \u4e00\u4e2a''{2}''\u8d44\u6e90
-##search_failed_to_retrieve_saved_search = Failed to retrieve saved search
-##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion
-##search_failed_to_save_search = Failed to Save Search: {0}
-##search_invalid_search_expression = Invalid search expression.
-##search_name_your_search = name of search
-##search_successfully_deleted_search = Successfully Deleted Search: {0}
-##search_successfully_saved_search = Successfully Saved Search: {0}
util_ancestry_parentAncestry = Parent Ancestry for:
util_errorHandler_nullException = \u5f02\u5e38\u662f null
util_monitoringRequestCallback_error_checkServerStatusFailure = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001- \u68c0\u67e5\u670d\u52a1\u5668\u72b6\u6001.
@@ -1940,17 +1933,20 @@ view_resource_monitor_table_min = \u6700\u5c0f
##view_resource_title_component_errors_cleanup = After addressing the issue, you will need to delete the message below to clear the 'managed component error' icon from the previous screen.
view_resource_title_component_errors_tooltip = \u663e\u793a\u88ab\u7ba1\u7ec4\u4ef6\u9519\u8bef.\u5355\u51fb\u67e5\u770b\u8be6\u60c5
view_resource_title_tagUpdateFailed = \u66f4\u65b0\u8d44\u6e90\u6807\u7b7e\u5931\u8d25
-view_searchBar_defaultPattern = \u5b9a\u4e49\u81ea\u5df1\u7684\u6837\u5f0f
-##view_searchBar_instructional_failSuggest = Failed to generate suggestions, see server log for possible errors
-view_searchBar_instructional_noSuggest = No matches, enter a different pattern
-##view_searchBar_instructional_refresh = Failed to retrieve saved searches, please refresh page
+##view_searchBar_buttonTooltip = Click to hide/show the search suggestion list. Also hide the list by hitting Escape when focus is in the search pattern text box.
+##view_searchBar_savedSearch_buttonTooltip = Click to toggle Saved Search mode. When active, save the current pattern by entering a name and hitting return. Edit an existing search by selecting it in the list, updating the pattern or name, and hitting return in the name text box. Delete by double-clicking the list entry.
+##view_searchBar_savedSearch_confirmDelete = Delete saved search with name [{0}]?
##view_searchBar_savedSearch_delete = Successfully deleted saved search [{0}]
##view_searchBar_savedSearch_failDelete = Failed to delete saved search with name [{0}]
+##view_searchBar_savedSearch_failFetch = Failed to fetch saved searches
##view_searchBar_savedSearch_failFind = Failed to find saved search with name [{0}]
##view_searchBar_savedSearch_failRename = Failed to rename saved search with name [{0}]
##view_searchBar_savedSearch_failSave = Failed to create saved search with name [{0}]
+view_searchBar_savedSearch_namePrompt = \u5b9a\u4e49\u81ea\u5df1\u7684\u6837\u5f0f
##view_searchBar_savedSearch_rename = Successfully renamed saved search to [{0}]
##view_searchBar_savedSearch_save = Successfully created saved search [{0}]
+##view_searchBar_suggest_failSuggest = Failed to generate suggestions, see server log for possible errors
+##view_searchBar_suggest_noSuggest = No matches, enter a different pattern
view_searchGUI_loginStatus = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001\uff0c\u8bf7\u68c0\u67e5\u670d\u52a1
view_selector_assigned = \u6307\u5b9a\u7684 {0}
view_selector_available = \u53ef\u7528\u7684 {0}
1
0