[rhq] Branch 'feature/cassandra-backend' - 5 commits - modules/enterprise modules/helpers pom.xml
by John Sanda
modules/enterprise/server/installer/pom.xml | 18 -
modules/enterprise/server/installer/src/main/resources/module/main/module.xml | 9
modules/helpers/metrics-simulator/pom.xml | 6
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/InsertionTimes.java | 60 +++++
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java | 19 +
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawInserts.java | 92 ++++++++
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java | 30 ++
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java | 109 ++++++++++
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/StatsCollector.java | 76 ++++++
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java | 10
modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java | 1
modules/helpers/metrics-simulator/src/main/resources/log4j.properties | 7
modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json | 17 +
pom.xml | 3
14 files changed, 410 insertions(+), 47 deletions(-)
New commits:
commit 8abefb5e81764002248eb4f8754292eb230424af
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Feb 20 10:16:36 2013 -0500
fixing bug to reset counter for raw inserts per minute
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
index a3f1664..408632c 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
@@ -97,6 +97,7 @@ public class Simulator {
log.info("Starting executor service");
executorService.scheduleAtFixedRate(statsCollector, 0, 1, TimeUnit.MINUTES);
+
for (int i = 0; i < plan.getNumMeasurementCollectors(); ++i) {
MeasurementCollector measurementCollector = new MeasurementCollector();
measurementCollector.setMetricsServer(metricsServer);
@@ -127,8 +128,8 @@ public class Simulator {
DeploymentOptions deploymentOptions = new DeploymentOptions();
deploymentOptions.setClusterDir(clusterDir.getAbsolutePath());
deploymentOptions.setNumNodes(2);
- deploymentOptions.setHeapSize("64M");
- deploymentOptions.setHeapNewSize("8M");
+ deploymentOptions.setHeapSize("256M");
+ deploymentOptions.setHeapNewSize("64M");
deploymentOptions.setLoggingLevel("INFO");
deploymentOptions.load();
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java
index 8588905..bf61369 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java
@@ -80,6 +80,7 @@ public class Stats {
try {
insertCountsLock.lock();
insertsLastInterval = rawInsertsThisInterval;
+ rawInsertsThisInterval = 0;
} finally {
insertCountsLock.unlock();
}
commit d888a64878b040b82a91648f63c726dcd6d67f5c
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Feb 20 10:14:23 2013 -0500
updating installer with cassandra 1.2.1.
forgot to update the installer when i previously upgraded to C* 1.2.1
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
index 27260d6..618df02 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -307,24 +307,6 @@
<version>0.7.0</version>
</artifactItem>
<!-- end cassandra-driver-core deps -->
- <artifactItem>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-core</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- <destFileName>liquibase-core-3.0.0-SNAPSHOT.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache-extras.cassandra-jdbc</groupId>
- <artifactId>cassandra-jdbc</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <destFileName>cassandra-jdbc-1.2.0-SNAPSHOT.jar</destFileName>
- </artifactItem>
- <artifactItem>
- <groupId>cassandra-liquibase-ext</groupId>
- <artifactId>cassandra-liquibase-ext</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- <destFileName>cassandra-liquibase-ext-0.1.0-SNAPSHOT.jar</destFileName>
- </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/installer-deps</outputDirectory>
</configuration>
diff --git a/modules/enterprise/server/installer/src/main/resources/module/main/module.xml b/modules/enterprise/server/installer/src/main/resources/module/main/module.xml
index fd7f0d7..0972a7b 100644
--- a/modules/enterprise/server/installer/src/main/resources/module/main/module.xml
+++ b/modules/enterprise/server/installer/src/main/resources/module/main/module.xml
@@ -26,17 +26,14 @@
<resource-root path="slf4j-api-1.7.2.jar"/>
<resource-root path="slf4j-log4j12-1.6.6.jar"/>
<resource-root path="netty-3.5.9.Final.jar"/>
- <resource-root path="cassandra-all-1.2.0-rc1.jar"/>
+ <resource-root path="cassandra-all-${cassandra.version}.jar"/>
<resource-root path="metrics-core-2.2.0.jar"/>
<resource-root path="guava-12.0.jar"/>
- <resource-root path="cassandra-thrift-1.2.0-rc1.jar"/>
- <resource-root path="libthrift-0.7.0.jar"/>
+ <resource-root path="cassandra-thrift-${cassandra.version}.jar"/>
+ <resource-root path="libthrift-${cassandra.thrift.version}.jar"/>
<resource-root path="jackson-mapper-asl-1.4.0.jar"/>
<resource-root path="jackson-core-asl-1.4.0.jar"/>
<!-- end rhq-cassandra-schema dependencies -->
- <resource-root path="liquibase-core-3.0.0-SNAPSHOT.jar"/>
- <resource-root path="cassandra-jdbc-1.2.0-SNAPSHOT.jar"/>
- <resource-root path="cassandra-liquibase-ext-0.1.0-SNAPSHOT.jar"/>
<resource-root path="commons-codec-1.3.jar"/>
</resources>
diff --git a/pom.xml b/pom.xml
index fc708dc..e5e5686 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,13 +154,12 @@
<!-- cassandra dependency versions -->
<cassandra.version>1.2.1</cassandra.version>
<cassandra.thrift.version>0.7.0</cassandra.thrift.version>
- <cassandra.jdbc.version>1.2.0-SNAPSHOT</cassandra.jdbc.version>
<!--
This is a transitive, runtime dependency of the cassandra jdbc driver. This property
is used in the container build. It should only be changed when the the
cassandra.jdbc.version property is changed as well.
-->
- <cassandra.jdbc.guava.version>12.0</cassandra.jdbc.guava.version>
+ <cassandra.jdbc.guava.version>13.0.1</cassandra.jdbc.guava.version>
<!--
This is a transitive, runtime dependency of the cassandra jdbc driver. This property
is used in the container build. It should only be changed when the the
commit f31b47f234b9ba1f52f3bbc430d1d3e7d4fe8e3b
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Feb 19 17:14:59 2013 -0500
updating the statistics that are tracked
The simulator now tracks the total number of raw inserts, raw inserts per
minute, and raw insertion times. The stats are logged along with an aggregate
summary of insertion times.
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/InsertionTimes.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/InsertionTimes.java
new file mode 100644
index 0000000..6c3c023
--- /dev/null
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/InsertionTimes.java
@@ -0,0 +1,60 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 Red Hat, Inc.
+ * * All rights reserved.
+ * *
+ * * This program is free software; you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.metrics.simulator;
+
+/**
+ * @author John Sanda
+ */
+public class InsertionTimes {
+
+ private double max;
+ private double min;
+ private double mean;
+ private double standardDeviation;
+
+ public InsertionTimes(double max, double min, double mean, double standardDeviation) {
+ this.max = max;
+ this.min = min;
+ this.mean = mean;
+ this.standardDeviation = standardDeviation;
+ }
+
+ public double getMax() {
+ return max;
+ }
+
+ public double getMin() {
+ return min;
+ }
+
+ public double getMean() {
+ return mean;
+ }
+
+ public double getStandardDeviation() {
+ return standardDeviation;
+ }
+}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
index 33a10ba..99b1d68 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
@@ -106,7 +106,7 @@ public class MeasurementCollector implements Runnable {
}
metricsCollected = data.size();
metricsServer.addNumericData(data);
- stats.rawDataInserted(metricsCollected);
+ stats.addRawInserts(metricsCollected);
try {
queueLock.lock();
for (Schedule schedule : schedules) {
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawDataStats.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawDataStats.java
deleted file mode 100644
index 3793ab9..0000000
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawDataStats.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * * RHQ Management Platform
- * * Copyright (C) 2005-2012 Red Hat, Inc.
- * * All rights reserved.
- * *
- * * This program is free software; you can redistribute it and/or modify
- * * it under the terms of the GNU General Public License, version 2, as
- * * published by the Free Software Foundation, and/or the GNU Lesser
- * * General Public License, version 2.1, also as published by the Free
- * * Software Foundation.
- * *
- * * This program is distributed in the hope that it will be useful,
- * * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * * GNU General Public License and the GNU Lesser General Public License
- * * for more details.
- * *
- * * You should have received a copy of the GNU General Public License
- * * and the GNU Lesser General Public License along with this program;
- * * if not, write to the Free Software Foundation, Inc.,
- * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-package org.rhq.metrics.simulator;
-
-import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
-
-/**
- * @author John Sanda
- */
-public class RawDataStats {
-
- private long startTime;
-
- private long endTime;
-
- private SummaryStatistics stats = new SummaryStatistics();
-
- public void startSamplingPeriod() {
- startTime = System.currentTimeMillis();
- }
-
- public void endSamplingPeriod() {
- endTime = System.currentTimeMillis();
- }
-
- public long getStartTime() {
- return startTime;
- }
-
- public long getEndTime() {
- return endTime;
- }
-
- public long getSamplingPeriod() {
- return endTime - startTime;
- }
-
- public SummaryStatistics getStatistics() {
- return stats;
- }
-
-}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawInserts.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawInserts.java
new file mode 100644
index 0000000..60b3d59
--- /dev/null
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawInserts.java
@@ -0,0 +1,92 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 Red Hat, Inc.
+ * * All rights reserved.
+ * *
+ * * This program is free software; you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.metrics.simulator;
+
+/**
+ * @author John Sanda
+ */
+public class RawInserts implements Comparable<RawInserts> {
+
+ private long timestamp;
+
+ private int count;
+
+ public RawInserts(long timestamp, int count) {
+ this.timestamp = timestamp;
+ this.count = count;
+ }
+
+ public long getTimestamp() {
+ return timestamp;
+ }
+
+ public int getCount() {
+ return count;
+ }
+
+ @Override
+ public int compareTo(RawInserts other) {
+ if (timestamp < other.timestamp) {
+ return -1;
+ }
+
+ if (timestamp > other.timestamp) {
+ return 1;
+ }
+
+ if (count < other.count) {
+ return -1;
+ }
+
+ if (count > other.count) {
+ return 1;
+ }
+
+ return 0;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ RawInserts that = (RawInserts) o;
+
+ if (timestamp != that.timestamp) return false;
+ if (count != that.count) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = (int) (timestamp ^ (timestamp >>> 32));
+ result = 31 * result + count;
+ return result;
+ }
+
+
+}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
index 61f067b..a3f1664 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
@@ -119,8 +119,6 @@ public class Simulator {
log.info("Shutting down executor service");
executorService.shutdown();
executorService.awaitTermination(5, TimeUnit.SECONDS);
-
- statsCollector.logSummary();
}
private List<CassandraNode> deployCluster() throws IOException {
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java
index 7012505..8588905 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java
@@ -25,83 +25,84 @@
package org.rhq.metrics.simulator;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.NavigableSet;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.commons.math3.stat.descriptive.AggregateSummaryStatistics;
-import org.apache.commons.math3.stat.descriptive.StatisticalSummaryValues;
-import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
/**
* @author John Sanda
*/
public class Stats {
- private List<RawDataStats> rawDataInserts = new ArrayList<RawDataStats>();
+ /**
+ * The total number of raw data inserted
+ */
+ private AtomicLong totalRawInserts = new AtomicLong(0);
- private SummaryStatistics rawDataInsertTimes = new SummaryStatistics();
+ /**
+ * A set of per-minute samples of raw inserts
+ */
+ private NavigableSet<RawInserts> rawInsertsPerMinute = new TreeSet<RawInserts>();
- private RawDataStats currentRawDataStats;
+ private int rawInsertsThisInterval;
- private ReentrantLock rawDataInsertsLock = new ReentrantLock();
+ private long currentInterval;
- private ReentrantLock rawDataInsertTimesLock = new ReentrantLock();
+ private DescriptiveStatistics rawDataInsertTimes = new DescriptiveStatistics(200);
- public void rawDataInserted(int count) {
+ private ReentrantLock insertCountsLock = new ReentrantLock();
+
+ private ReentrantLock insertTimesLock = new ReentrantLock();
+
+ public void addRawInserts(int count) {
+ totalRawInserts.addAndGet(count);
try {
- rawDataInsertsLock.lock();
- currentRawDataStats.getStatistics().addValue(count);
+ insertCountsLock.lock();
+ rawInsertsThisInterval += count;
} finally {
- rawDataInsertsLock.unlock();
+ insertCountsLock.unlock();
}
}
- public void addRawDataInsertTime(long time) {
- try {
- rawDataInsertTimesLock.lock();
- rawDataInsertTimes.addValue(time);
- } finally {
- rawDataInsertTimesLock.unlock();
- }
+ public long getTotalRawInserts() {
+ return totalRawInserts.get();
}
- public void startNewSample() {
- if (currentRawDataStats == null) {
- currentRawDataStats = new RawDataStats();
- currentRawDataStats.startSamplingPeriod();
- } else {
- RawDataStats lastRawDataStats = currentRawDataStats;
- try {
- rawDataInsertsLock.lock();
- lastRawDataStats.endSamplingPeriod();
- currentRawDataStats = new RawDataStats();
- currentRawDataStats.startSamplingPeriod();
- } finally {
- rawDataInsertsLock.unlock();
- }
- rawDataInserts.add(lastRawDataStats);
- }
+ public RawInserts getRawInsertsForLastInterval() {
+ return rawInsertsPerMinute.pollLast();
}
- public RawDataStats getLastSample() {
- if (rawDataInserts.isEmpty()) {
- return null;
+ public void startNewInterval(long startTime) {
+ int insertsLastInterval;
+ try {
+ insertCountsLock.lock();
+ insertsLastInterval = rawInsertsThisInterval;
+ } finally {
+ insertCountsLock.unlock();
}
- return rawDataInserts.get(rawDataInserts.size() - 1);
+ rawInsertsPerMinute.add(new RawInserts(currentInterval, insertsLastInterval));
+ currentInterval = startTime;
}
- public StatisticalSummaryValues getAggregateSummary() {
- AggregateSummaryStatistics summary = new AggregateSummaryStatistics();
- List<SummaryStatistics> stats = new ArrayList<SummaryStatistics>(rawDataInserts.size());
- for (RawDataStats raw : rawDataInserts) {
- stats.add(raw.getStatistics());
+ public void addRawDataInsertTime(long time) {
+ try {
+ insertTimesLock.lock();
+ rawDataInsertTimes.addValue(time);
+ } finally {
+ insertTimesLock.unlock();
}
- return summary.aggregate(stats);
}
- public SummaryStatistics getRawDataInsertTimes() {
- return rawDataInsertTimes;
+ public InsertionTimes getInsertionTimes() {
+ try {
+ insertTimesLock.lock();
+ return new InsertionTimes(rawDataInsertTimes.getMax(), rawDataInsertTimes.getMin(),
+ rawDataInsertTimes.getMean(), rawDataInsertTimes.getStandardDeviation());
+ } finally {
+ insertTimesLock.unlock();
+ }
}
-
}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/StatsCollector.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/StatsCollector.java
index 290d347..665302a 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/StatsCollector.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/StatsCollector.java
@@ -29,7 +29,6 @@ import java.util.Date;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.joda.time.Duration;
/**
* @author John Sanda
@@ -46,18 +45,32 @@ public class StatsCollector implements Runnable {
@Override
public void run() {
- stats.startNewSample();
- RawDataStats rawStats = stats.getLastSample();
- if (rawStats != null) {
- Duration duration = new Duration(rawStats.getStartTime(), rawStats.getEndTime());
- log.info("Reporting summary of raw data inserts/minute starting at " + new Date(rawStats.getStartTime()) +
- " for a duration of " + duration.toStandardSeconds().getSeconds() + " seconds\n" +
- rawStats.getStatistics());
+ long totalRawInserts = stats.getTotalRawInserts();
+ long now = System.currentTimeMillis();
+ stats.startNewInterval(now);
+ RawInserts inserts = stats.getRawInsertsForLastInterval();
+
+ // inserts will be null on the first run
+ if (inserts == null) {
+ return;
}
+
+ log.info("Inserted " + totalRawInserts + " raw metrics in total.");
+ log.info("Inserted " + inserts.getCount() + " for interval starting at " + new Date(inserts.getTimestamp()));
+ logInsertionTimeStats();
+ }
+
+ private void logInsertionTimeStats() {
+ InsertionTimes insertionTimes = stats.getInsertionTimes();
+ log.info("Summary of raw insertion time stats (milliseconds):\n" +
+ "Min: " + insertionTimes.getMin() + "\n" +
+ "Mean: " + insertionTimes.getMean() + "\n" +
+ "Max: " + insertionTimes.getMax() + "\n" +
+ "Standard Deviation: " + insertionTimes.getStandardDeviation());
}
public void logSummary() {
- log.info("Summary of raw data inserts/minute\n" + stats.getAggregateSummary());
- log.info("Summary of raw data insertion times in milliseconds\n" + stats.getRawDataInsertTimes());
+// log.info("Summary of raw data inserts/minute\n" + stats.getAggregateSummary());
+// log.info("Summary of raw data insertion times in milliseconds\n" + stats.getRawDataInsertTimes());
}
}
commit 6af977bc4f750208040092699e27c049ba1d7e38
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Feb 18 16:30:06 2013 -0500
adding some initial support for generating stats about raw data inserted
diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml
index e3baf6c..d58a8be 100644
--- a/modules/helpers/metrics-simulator/pom.xml
+++ b/modules/helpers/metrics-simulator/pom.xml
@@ -52,5 +52,11 @@
<artifactId>jackson-annotations</artifactId>
<version>2.1.1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.1.1</version>
+ </dependency>
</dependencies>
</project>
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
index 9e612c4..33a10ba 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
@@ -49,6 +49,10 @@ public class MeasurementCollector implements Runnable {
private ReentrantLock queueLock;
+ private Stats stats;
+
+ private int batchSize = 500;
+
public void setQueue(PriorityQueue<Schedule> queue) {
this.queue = queue;
}
@@ -61,12 +65,15 @@ public class MeasurementCollector implements Runnable {
this.queueLock = queueLock;
}
+ public void setStats(Stats stats) {
+ this.stats = stats;
+ }
+
@Override
public void run() {
long startTime = System.currentTimeMillis();
int metricsCollected = 0;
// TODO parameterize threshold
- int threshold = 500;
try {
log.info("Starting metrics collections...");
Set<Schedule> schedules = new HashSet<Schedule>();
@@ -76,7 +83,7 @@ public class MeasurementCollector implements Runnable {
if (first != null && first.getNextCollection() <= System.currentTimeMillis()) {
Schedule next = first;
while (next != null && next.getNextCollection() == first.getNextCollection() &&
- schedules.size() < threshold) {
+ schedules.size() < batchSize) {
schedules.add(queue.poll());
next = queue.peek();
}
@@ -99,7 +106,7 @@ public class MeasurementCollector implements Runnable {
}
metricsCollected = data.size();
metricsServer.addNumericData(data);
-
+ stats.rawDataInserted(metricsCollected);
try {
queueLock.lock();
for (Schedule schedule : schedules) {
@@ -110,8 +117,9 @@ public class MeasurementCollector implements Runnable {
}
} finally {
long endTime = System.currentTimeMillis();
- log.info("Finished collecting and storing " + metricsCollected + " raw metric in " +
- (endTime - startTime) + " ms.");
+ long totalTime = endTime - startTime;
+ stats.addRawDataInsertTime(totalTime);
+ log.info("Finished collecting and storing " + metricsCollected + " raw metric in " +totalTime + " ms.");
}
}
}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawDataStats.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawDataStats.java
new file mode 100644
index 0000000..3793ab9
--- /dev/null
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/RawDataStats.java
@@ -0,0 +1,65 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 Red Hat, Inc.
+ * * All rights reserved.
+ * *
+ * * This program is free software; you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.metrics.simulator;
+
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+
+/**
+ * @author John Sanda
+ */
+public class RawDataStats {
+
+ private long startTime;
+
+ private long endTime;
+
+ private SummaryStatistics stats = new SummaryStatistics();
+
+ public void startSamplingPeriod() {
+ startTime = System.currentTimeMillis();
+ }
+
+ public void endSamplingPeriod() {
+ endTime = System.currentTimeMillis();
+ }
+
+ public long getStartTime() {
+ return startTime;
+ }
+
+ public long getEndTime() {
+ return endTime;
+ }
+
+ public long getSamplingPeriod() {
+ return endTime - startTime;
+ }
+
+ public SummaryStatistics getStatistics() {
+ return stats;
+ }
+
+}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
index 2f0e5cd..61f067b 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
@@ -90,13 +90,19 @@ public class Simulator {
MeasurementAggregator measurementAggregator = new MeasurementAggregator();
measurementAggregator.setMetricsServer(metricsServer);
+ Stats stats = new Stats();
+ StatsCollector statsCollector = new StatsCollector(stats);
+
ScheduledExecutorService executorService = Executors.newScheduledThreadPool(plan.getThreadPoolSize());
log.info("Starting executor service");
+ executorService.scheduleAtFixedRate(statsCollector, 0, 1, TimeUnit.MINUTES);
+
for (int i = 0; i < plan.getNumMeasurementCollectors(); ++i) {
MeasurementCollector measurementCollector = new MeasurementCollector();
measurementCollector.setMetricsServer(metricsServer);
measurementCollector.setQueue(queue);
measurementCollector.setQueueLock(queueLock);
+ measurementCollector.setStats(stats);
executorService.scheduleAtFixedRate(measurementCollector, 0, plan.getCollectionInterval(),
TimeUnit.MILLISECONDS);
@@ -106,12 +112,15 @@ public class Simulator {
TimeUnit.MILLISECONDS);
try {
- Thread.sleep(10000 * 6 * 20);
+// Thread.sleep(10000 * 6 * 20);
+ Thread.sleep(10000 * 6 * 5);
} catch (InterruptedException e) {
}
log.info("Shutting down executor service");
executorService.shutdown();
executorService.awaitTermination(5, TimeUnit.SECONDS);
+
+ statsCollector.logSummary();
}
private List<CassandraNode> deployCluster() throws IOException {
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java
new file mode 100644
index 0000000..7012505
--- /dev/null
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Stats.java
@@ -0,0 +1,107 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 Red Hat, Inc.
+ * * All rights reserved.
+ * *
+ * * This program is free software; you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.metrics.simulator;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.apache.commons.math3.stat.descriptive.AggregateSummaryStatistics;
+import org.apache.commons.math3.stat.descriptive.StatisticalSummaryValues;
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+
+/**
+ * @author John Sanda
+ */
+public class Stats {
+
+ private List<RawDataStats> rawDataInserts = new ArrayList<RawDataStats>();
+
+ private SummaryStatistics rawDataInsertTimes = new SummaryStatistics();
+
+ private RawDataStats currentRawDataStats;
+
+ private ReentrantLock rawDataInsertsLock = new ReentrantLock();
+
+ private ReentrantLock rawDataInsertTimesLock = new ReentrantLock();
+
+ public void rawDataInserted(int count) {
+ try {
+ rawDataInsertsLock.lock();
+ currentRawDataStats.getStatistics().addValue(count);
+ } finally {
+ rawDataInsertsLock.unlock();
+ }
+ }
+
+ public void addRawDataInsertTime(long time) {
+ try {
+ rawDataInsertTimesLock.lock();
+ rawDataInsertTimes.addValue(time);
+ } finally {
+ rawDataInsertTimesLock.unlock();
+ }
+ }
+
+ public void startNewSample() {
+ if (currentRawDataStats == null) {
+ currentRawDataStats = new RawDataStats();
+ currentRawDataStats.startSamplingPeriod();
+ } else {
+ RawDataStats lastRawDataStats = currentRawDataStats;
+ try {
+ rawDataInsertsLock.lock();
+ lastRawDataStats.endSamplingPeriod();
+ currentRawDataStats = new RawDataStats();
+ currentRawDataStats.startSamplingPeriod();
+ } finally {
+ rawDataInsertsLock.unlock();
+ }
+ rawDataInserts.add(lastRawDataStats);
+ }
+ }
+
+ public RawDataStats getLastSample() {
+ if (rawDataInserts.isEmpty()) {
+ return null;
+ }
+ return rawDataInserts.get(rawDataInserts.size() - 1);
+ }
+
+ public StatisticalSummaryValues getAggregateSummary() {
+ AggregateSummaryStatistics summary = new AggregateSummaryStatistics();
+ List<SummaryStatistics> stats = new ArrayList<SummaryStatistics>(rawDataInserts.size());
+ for (RawDataStats raw : rawDataInserts) {
+ stats.add(raw.getStatistics());
+ }
+ return summary.aggregate(stats);
+ }
+
+ public SummaryStatistics getRawDataInsertTimes() {
+ return rawDataInsertTimes;
+ }
+
+}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/StatsCollector.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/StatsCollector.java
new file mode 100644
index 0000000..290d347
--- /dev/null
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/StatsCollector.java
@@ -0,0 +1,63 @@
+/*
+ *
+ * * RHQ Management Platform
+ * * Copyright (C) 2005-2012 Red Hat, Inc.
+ * * All rights reserved.
+ * *
+ * * This program is free software; you can redistribute it and/or modify
+ * * it under the terms of the GNU General Public License, version 2, as
+ * * published by the Free Software Foundation, and/or the GNU Lesser
+ * * General Public License, version 2.1, also as published by the Free
+ * * Software Foundation.
+ * *
+ * * This program is distributed in the hope that it will be useful,
+ * * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * * GNU General Public License and the GNU Lesser General Public License
+ * * for more details.
+ * *
+ * * You should have received a copy of the GNU General Public License
+ * * and the GNU Lesser General Public License along with this program;
+ * * if not, write to the Free Software Foundation, Inc.,
+ * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+package org.rhq.metrics.simulator;
+
+import java.util.Date;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.Duration;
+
+/**
+ * @author John Sanda
+ */
+public class StatsCollector implements Runnable {
+
+ private final Log log = LogFactory.getLog(StatsCollector.class);
+
+ private Stats stats;
+
+ public StatsCollector(Stats stats) {
+ this.stats = stats;
+ }
+
+ @Override
+ public void run() {
+ stats.startNewSample();
+ RawDataStats rawStats = stats.getLastSample();
+ if (rawStats != null) {
+ Duration duration = new Duration(rawStats.getStartTime(), rawStats.getEndTime());
+ log.info("Reporting summary of raw data inserts/minute starting at " + new Date(rawStats.getStartTime()) +
+ " for a duration of " + duration.toStandardSeconds().getSeconds() + " seconds\n" +
+ rawStats.getStatistics());
+ }
+ }
+
+ public void logSummary() {
+ log.info("Summary of raw data inserts/minute\n" + stats.getAggregateSummary());
+ log.info("Summary of raw data insertion times in milliseconds\n" + stats.getRawDataInsertTimes());
+ }
+}
diff --git a/modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json b/modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json
index d3bff2b..154e6fc 100644
--- a/modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json
+++ b/modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json
@@ -1,7 +1,7 @@
{
"schedules": [
{
- "count": 2000,
+ "count": 5000,
"interval": 500
},
{
@@ -11,8 +11,8 @@
],
"collectionInterval": 500,
"aggregationInterval": 1000,
- "numMeasurementCollectors": 5,
- "threadPoolSize": 6,
+ "numMeasurementCollectors": 8,
+ "threadPoolSize": 10,
"ttl": [
{
"table": "raw_metrics",
commit 86ea818bc1b1179c34503008857d20ad0505bd4c
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Feb 15 23:25:30 2013 -0500
making serveral changes to simulator to put a hurtin' on cassandra
Making the number of measurement collectors configurable. Setting the min/max
heap for cassandra to 128 MB. Updating the test simulation to handle more
schedules.
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
index 2f51092..9e612c4 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/MeasurementCollector.java
@@ -65,6 +65,8 @@ public class MeasurementCollector implements Runnable {
public void run() {
long startTime = System.currentTimeMillis();
int metricsCollected = 0;
+ // TODO parameterize threshold
+ int threshold = 500;
try {
log.info("Starting metrics collections...");
Set<Schedule> schedules = new HashSet<Schedule>();
@@ -73,7 +75,8 @@ public class MeasurementCollector implements Runnable {
Schedule first = queue.peek();
if (first != null && first.getNextCollection() <= System.currentTimeMillis()) {
Schedule next = first;
- while (next != null && next.getNextCollection() == first.getNextCollection()) {
+ while (next != null && next.getNextCollection() == first.getNextCollection() &&
+ schedules.size() < threshold) {
schedules.add(queue.poll());
next = queue.peek();
}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
index bb6c1f4..2f0e5cd 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/Simulator.java
@@ -87,23 +87,26 @@ public class Simulator {
PriorityQueue<Schedule> queue = new PriorityQueue<Schedule>(schedules);
ReentrantLock queueLock = new ReentrantLock();
- MeasurementCollector measurementCollector = new MeasurementCollector();
- measurementCollector.setMetricsServer(metricsServer);
- measurementCollector.setQueue(queue);
- measurementCollector.setQueueLock(queueLock);
-
MeasurementAggregator measurementAggregator = new MeasurementAggregator();
measurementAggregator.setMetricsServer(metricsServer);
ScheduledExecutorService executorService = Executors.newScheduledThreadPool(plan.getThreadPoolSize());
log.info("Starting executor service");
- executorService.scheduleAtFixedRate(measurementCollector, 0, plan.getCollectionInterval(),
- TimeUnit.MILLISECONDS);
+ for (int i = 0; i < plan.getNumMeasurementCollectors(); ++i) {
+ MeasurementCollector measurementCollector = new MeasurementCollector();
+ measurementCollector.setMetricsServer(metricsServer);
+ measurementCollector.setQueue(queue);
+ measurementCollector.setQueueLock(queueLock);
+
+ executorService.scheduleAtFixedRate(measurementCollector, 0, plan.getCollectionInterval(),
+ TimeUnit.MILLISECONDS);
+ }
+
executorService.scheduleAtFixedRate(measurementAggregator, 0, plan.getAggregationInterval(),
TimeUnit.MILLISECONDS);
try {
- Thread.sleep(10000);
+ Thread.sleep(10000 * 6 * 20);
} catch (InterruptedException e) {
}
log.info("Shutting down executor service");
@@ -117,6 +120,9 @@ public class Simulator {
DeploymentOptions deploymentOptions = new DeploymentOptions();
deploymentOptions.setClusterDir(clusterDir.getAbsolutePath());
deploymentOptions.setNumNodes(2);
+ deploymentOptions.setHeapSize("64M");
+ deploymentOptions.setHeapNewSize("8M");
+ deploymentOptions.setLoggingLevel("INFO");
deploymentOptions.load();
CassandraClusterManager ccm = new CassandraClusterManager(deploymentOptions);
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java
index e5dbdcd..7c333b1 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlan.java
@@ -45,6 +45,8 @@ public class SimulationPlan {
private MetricsConfiguration metricsServerConfiguration;
+ private int numMeasurementCollectors;
+
public List<ScheduleGroup> getScheduleSets() {
return scheduleSets;
}
@@ -88,4 +90,12 @@ public class SimulationPlan {
public void setAggregationInterval(long aggregationInterval) {
this.aggregationInterval = aggregationInterval;
}
+
+ public int getNumMeasurementCollectors() {
+ return numMeasurementCollectors;
+ }
+
+ public void setNumMeasurementCollectors(int numMeasurementCollectors) {
+ this.numMeasurementCollectors = numMeasurementCollectors;
+ }
}
diff --git a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
index 49463a9..5636b27 100644
--- a/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
+++ b/modules/helpers/metrics-simulator/src/main/java/org/rhq/metrics/simulator/plan/SimulationPlanner.java
@@ -52,6 +52,7 @@ public class SimulationPlanner {
simulation.setCollectionInterval(root.get("collectionInterval").asLong());
simulation.setAggregationInterval(root.get("aggregationInterval").asLong());
simulation.setThreadPoolSize(root.get("threadPoolSize").asInt());
+ simulation.setNumMeasurementCollectors(root.get("numMeasurementCollectors").asInt());
for (JsonNode node : root.get("schedules")) {
simulation.addScheduleSet(new ScheduleGroup(node.get("count").asInt(), node.get("interval").asLong()));
diff --git a/modules/helpers/metrics-simulator/src/main/resources/log4j.properties b/modules/helpers/metrics-simulator/src/main/resources/log4j.properties
index d5ef168..9a3f64d 100644
--- a/modules/helpers/metrics-simulator/src/main/resources/log4j.properties
+++ b/modules/helpers/metrics-simulator/src/main/resources/log4j.properties
@@ -23,16 +23,17 @@
# */
#
-log4j.rootCategory=DEBUG, FILE, CONSOLE
+log4j.rootCategory=INFO, FILE, CONSOLE
log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
log4j.appender.FILE.DatePattern='.'yyyy-MM-dd
log4j.appender.FILE.File=./target/test.log
log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n
+log4j.appender.FILE.layout.ConversionPattern=%d{ISO8601} %-5p [%t] (%c{5}) - %m%n
#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
log4j.appender.FILE.Append=false
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
\ No newline at end of file
+log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
+log4j.logger.org.rhq=DEBUG
\ No newline at end of file
diff --git a/modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json b/modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json
index bf05df1..d3bff2b 100644
--- a/modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json
+++ b/modules/helpers/metrics-simulator/src/test/resources/org/rhq/metrics/simulator/test-simulator.json
@@ -1,29 +1,34 @@
{
"schedules": [
{
- "count": 2,
+ "count": 2000,
"interval": 500
+ },
+ {
+ "count": 1000,
+ "interval": 1000
}
],
"collectionInterval": 500,
"aggregationInterval": 1000,
- "threadPoolSize": 4,
+ "numMeasurementCollectors": 5,
+ "threadPoolSize": 6,
"ttl": [
{
"table": "raw_metrics",
- "value": 3600
+ "value": 180
},
{
"table": "one_hour_metrics",
- "value": 7200
+ "value": 360
},
{
"table": "six_hour_metrics",
- "value": 10800
+ "value": 540
},
{
"table": "twenty_four_hour_metrics",
- "value": 14400
+ "value": 720
}
],
"timeSliceDuration": {
11 years, 3 months
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java | 96 ++++++++--
1 file changed, 85 insertions(+), 11 deletions(-)
New commits:
commit b3d6756033305f1d6a02ebded33864c4303d3a10
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Feb 20 09:37:52 2013 -0500
Add another test for the work done in Bug 912871.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
index 0900ce6..7d0343b 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java
@@ -78,11 +78,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
private Agent agent;
private Subject overlord;
- /**
- * Prepares things for the entire test class.
- */
- //@BeforeClass don't use BeforeClass as Arquillian 1.0.2 invokes it on every test method
- protected void beforeClass() {
+ @Override
+ protected void beforeMethod() throws Exception {
// Make sure page control sorts so the latest config update is last (the default is for the latest to be first).
configUpdatesPageControl = PageControl.getUnlimitedInstance();
// (ips, 04/01/10): Use createdTime, rather than id, to order by, since the id's are not guaranteed to be
@@ -92,12 +89,6 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
configurationManager = LookupUtil.getConfigurationManager();
resourceManager = LookupUtil.getResourceManager();
- overlord = LookupUtil.getSubjectManager().getOverlord();
- }
-
- @Override
- protected void beforeMethod() throws Exception {
- beforeClass();
prepareScheduler();
@@ -106,6 +97,8 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
agentServiceContainer.configurationService = testServices;
agentServiceContainer.discoveryService = testServices;
+ overlord = LookupUtil.getSubjectManager().getOverlord();
+
getTransactionManager().begin();
try {
@@ -257,6 +250,87 @@ public class ConfigurationManagerBeanTest extends AbstractEJB3Test {
}
@Test(enabled = ENABLE_TESTS)
+ public void testInProgressConfiguration() throws Exception {
+ int resourceId = newResource1.getId();
+
+ Subject overlord = LookupUtil.getSubjectManager().getOverlord();
+
+ // create 3 configs: config1 will be stored as current. config2 will be in progress, config3 should get
+ // blocked from updating by the inprogress update
+ Configuration configuration1 = new Configuration();
+ configuration1.put(new PropertySimple("myboolean", "true"));
+
+ Configuration configuration2 = new Configuration();
+ configuration2.put(new PropertySimple("myboolean", "false"));
+ configuration2.put(new PropertySimple("mysleep", "7000"));
+
+ Configuration configuration3 = new Configuration();
+ configuration3.put(new PropertySimple("mysleep", "10000"));
+
+ // make config1 the current
+ configurationManager.updateResourceConfiguration(overlord, resourceId, configuration1);
+ Thread.sleep(2000); // wait for the test agent to complete the request
+
+ ResourceConfigurationUpdate history1;
+ history1 = configurationManager.getLatestResourceConfigurationUpdate(overlord, resourceId);
+ assert history1 != null;
+ PropertySimple myprop = history1.getConfiguration().getSimple("myboolean");
+ assert myprop != null;
+ assert "true".equals(myprop.getStringValue());
+
+ // now update to config2 - the "agent" will sleep for a bit before it completes
+ // so we will have an INPROGRESS configuration for a few seconds before it goes to SUCCESS
+ configurationManager.updateResourceConfiguration(overlord, resourceId, configuration2);
+
+ // now update to config3 - this should fail as you can't update while there is one in progress
+ try {
+ configurationManager.updateResourceConfiguration(overlord, resourceId, configuration3);
+ assert false : "Should have thrown an in progress exception";
+
+ } catch (ConfigurationUpdateStillInProgressException e) {
+ System.out.println("======> " + e);
+
+ // make sure everything works as expected (like the above test)
+
+ boolean inProgress = false;
+ boolean inProgressTested = false;
+
+ do {
+ ResourceConfigurationUpdate history2 = configurationManager.getLatestResourceConfigurationUpdate(
+ overlord, resourceId);
+ inProgress = configurationManager.isResourceConfigurationUpdateInProgress(overlord, resourceId);
+
+ if (inProgress) {
+ // history2 should be history1 since the update is not complete
+ assert history2 != null;
+ assert history2.getId() == history1.getId();
+ myprop = history2.getConfiguration().getSimple("myboolean");
+ assert myprop != null;
+ assert "true".equals(myprop.getStringValue());
+ myprop = history2.getConfiguration().getSimple("mysleep"); // this wasn't in the first config
+ assert myprop == null;
+ // record that this test case ran, we expect it will if the agent delay is there
+ inProgressTested = true;
+ } else {
+ // update is complete, history 2 should be different
+ history2 = configurationManager.getLatestResourceConfigurationUpdate(overlord, resourceId);
+ assert history2 != null;
+ assert history2.getId() != history1.getId();
+ myprop = history2.getConfiguration().getSimple("myboolean");
+ assert myprop != null;
+ assert "false".equals(myprop.getStringValue());
+ myprop = history2.getConfiguration().getSimple("mysleep");
+ assert myprop.getLongValue() != null;
+ assert myprop.getLongValue().longValue() == 7000L;
+ }
+ } while (inProgress);
+
+ } catch (Throwable t) {
+ assert false : "Should have thrown an in progress exception, not: " + t;
+ }
+ }
+
+ @Test(enabled = ENABLE_TESTS)
public void testDeleteType() throws Exception {
// the purpose of this little test is to test an error condition I'm getting when attempting to delete
// a resource type - just forces a run with before/afterMethod
11 years, 3 months
[rhq] Branch 'jshaughn/selenium' - modules/enterprise
by Jay Shaughnessy
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ErrorMessageWindow.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 37 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 21 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java | 23 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java | 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java | 27 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 63 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/UpdateExistingSchedulesWidget.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java | 81 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java | 18 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java | 78 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/SubsystemResourceAlertView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java | 27 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java | 20 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java | 28 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java | 18 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java | 21 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java | 24 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 25 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java | 32 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 34 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java | 21 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateSnapshotView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java | 31 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java | 21 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDriftDetailsView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java | 43 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftDefinitionsView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListDetailView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 60 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java | 43 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java | 49 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java | 19 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java | 21 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDetailView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryListView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/PluginTypeTreeView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/type/ResourceTypeTreeView.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 42 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 30 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReportTable.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/InventorySummaryReportTable.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java | 177 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java | 63 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 21 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java | 39 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyConfigurationView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyGroupConfigurationView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java | 33 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java | 23 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableDialog.java | 33 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java | 58 ---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHTMLFlow.java | 34 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableImg.java | 24 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableImgButton.java | 23 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLabel.java | 49 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableListGrid.java | 34 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableSectionStack.java | 37 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableStretchImgButton.java | 24 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTileLayout.java | 34 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTreeGrid.java | 33 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableWidgetCanvas.java | 39 --
225 files changed, 1236 insertions(+), 1748 deletions(-)
New commits:
commit 63f2e08e5f1e8b041369668d3b11e2c6e33ae397
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Tue Feb 19 20:48:31 2013 -0500
Bring me her broom! More work to be done... selenium support removal
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index 824a376..7b8f111 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -309,7 +309,7 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String>, Event.Na
public void buildCoreUI() {
// If the core gui is already built (eg. from previous login) skip the build and just refire event
if (rootCanvas == null) {
- menuBarView = new MenuBarView("TopMenu");
+ menuBarView = new MenuBarView();
menuBarView.setWidth("100%");
footer = new Footer();
@@ -367,17 +367,17 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String>, Event.Na
Canvas canvas;
if (viewName.equals(DashboardsView.VIEW_ID.getName())) {
- canvas = new DashboardsView(viewName);
+ canvas = new DashboardsView();
} else if (viewName.equals(InventoryView.VIEW_ID.getName())) {
canvas = new InventoryView();
} else if (viewName.equals(ResourceTopView.VIEW_ID.getName())) {
- canvas = new ResourceTopView(viewName);
+ canvas = new ResourceTopView();
} else if (viewName.equals(ResourceGroupTopView.VIEW_ID.getName())) {
- canvas = new ResourceGroupTopView(viewName);
+ canvas = new ResourceGroupTopView();
} else if (viewName.equals(ReportTopView.VIEW_ID.getName())) {
canvas = new ReportTopView();
} else if (viewName.equals(BundleTopView.VIEW_ID.getName())) {
- canvas = new BundleTopView(viewName);
+ canvas = new BundleTopView();
} else if (viewName.equals(AdministrationView.VIEW_ID.getName())) {
canvas = new AdministrationView();
} else if (viewName.equals(HelpView.VIEW_ID.getName())) {
@@ -390,7 +390,7 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String>, Event.Na
canvas = logoutView;
logoutView.showLoginDialog();
} else if (viewName.equals(TaggedView.VIEW_ID.getName())) {
- canvas = new TaggedView(viewName);
+ canvas = new TaggedView();
} else if (viewName.equals("Subsystems")) {
canvas = new AlertHistoryView();
} else if (viewName.equals(TestTopView.VIEW_ID.getName())) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ErrorMessageWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ErrorMessageWindow.java
index c0a90cb..e98fbee 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ErrorMessageWindow.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ErrorMessageWindow.java
@@ -38,7 +38,7 @@ import com.smartgwt.client.widgets.events.CloseClickHandler;
* @author John Mazzitelli
*/
public class ErrorMessageWindow extends Window {
- public ErrorMessageWindow(String locatorId, String title, String message) {
+ public ErrorMessageWindow(String title, String message) {
super();
HTMLPane htmlPane = new HTMLPane();
@@ -50,7 +50,7 @@ public class ErrorMessageWindow extends Window {
setupWindow(title, htmlPane);
}
- public ErrorMessageWindow(String locatorId, String title, Canvas item) {
+ public ErrorMessageWindow(String title, Canvas item) {
super();
setupWindow(title, item);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java
index ded371f..8e6ade0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client;
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.VLayout;
@@ -27,23 +28,21 @@ import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.enterprise.gui.coregui.client.footer.FavoritesButton;
import org.rhq.enterprise.gui.coregui.client.util.message.MessageBar;
import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenterView;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* @author Greg Hinkle
* @author Joseph Marques
*/
-public class Footer extends LocatableHLayout {
- private static final String LOCATOR_ID = "CoreFooter";
+public class Footer extends EnhancedHLayout {
private MessageBar messageBar;
private MessageCenterView messageCenter;
public Footer() {
- super(LOCATOR_ID);
+ super();
setHeight(30);
setAlign(Alignment.LEFT);
setWidth100();
@@ -77,7 +76,7 @@ public class Footer extends LocatableHLayout {
}
private LocatableVLayout getMessageCenterButton() {
- LocatableVLayout layout = new LocatableVLayout(extendLocatorId("layout"));
+ LocatableVLayout layout = new LocatableVLayout();
layout.setMembersMargin(5);
layout.setHeight100();
layout.setAlign(Alignment.CENTER);
@@ -99,9 +98,9 @@ public class Footer extends LocatableHLayout {
// Leaving this although it's unused. It used to be the subclass for the alert count mechanism, which is now
// gone, but this may be useful in the future for something else.
- public abstract static class RefreshableLabel extends LocatableLabel {
- public RefreshableLabel(String locatorId) {
- super(locatorId);
+ public abstract static class RefreshableLabel extends Label {
+ public RefreshableLabel() {
+ super();
}
// scheduling refreshes is sub-optimal, really need to move to a message bus architecture
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index ac1fdb8..80e521e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -106,11 +106,11 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
}
protected VLayout defaultView() {
- LocatableVLayout vLayout = new LocatableVLayout(this.extendLocatorId("Default"));
+ LocatableVLayout vLayout = new LocatableVLayout();
vLayout.setWidth100();
// TODO: Admin icon.
- TitleBar titleBar = new TitleBar(this, MSG.view_admin_administration(), IconEnum.ADMIN.getIcon24x24Path());
+ TitleBar titleBar = new TitleBar(MSG.view_admin_administration(), IconEnum.ADMIN.getIcon24x24Path());
vLayout.addMember(titleBar);
ProductInfo productInfo = CoreGUI.get().getProductInfo();
@@ -125,15 +125,13 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildSecuritySection() {
NavigationItem usersItem = new NavigationItem(UsersView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new UsersView(extendLocatorId("Users"), getGlobalPermissions().contains(
- Permission.MANAGE_SECURITY));
+ return new UsersView(getGlobalPermissions().contains(Permission.MANAGE_SECURITY));
}
});
NavigationItem rolesItem = new NavigationItem(RolesView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new RolesView(extendLocatorId("Roles"), getGlobalPermissions().contains(
- Permission.MANAGE_SECURITY));
+ return new RolesView(getGlobalPermissions().contains(Permission.MANAGE_SECURITY));
}
});
@@ -146,32 +144,31 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
NavigationItem remoteAgentInstallItem = new NavigationItem(RemoteAgentInstallView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new RemoteAgentInstallView(extendLocatorId("RemoteAgentInstall"));
+ return new RemoteAgentInstallView();
}
}, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
NavigationItem serversItem = new NavigationItem(ServerTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new ServerTableView(extendLocatorId(ServerTableView.VIEW_ID.getName()), null, false);
+ return new ServerTableView(null, false);
}
}, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
NavigationItem agentsItem = new NavigationItem(AgentTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new AgentTableView(extendLocatorId(AgentTableView.VIEW_ID.getName()), null, false);
+ return new AgentTableView(null, false);
}
}, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
NavigationItem affinityGroupsItem = new NavigationItem(AffinityGroupTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new AffinityGroupTableView(extendLocatorId(AffinityGroupTableView.VIEW_ID.getName()));
+ return new AffinityGroupTableView();
}
}, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
NavigationItem partitionEventsItem = new NavigationItem(PartitionEventTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new PartitionEventTableView(extendLocatorId(PartitionEventTableView.VIEW_ID.getName()),
- PartitionEventTableView.VIEW_ID.getTitle());
+ return new PartitionEventTableView(PartitionEventTableView.VIEW_ID.getTitle());
}
}, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
@@ -189,7 +186,7 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildConfigurationSection() {
NavigationItem systemSettingsItem = new NavigationItem(SystemSettingsView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new SystemSettingsView(extendLocatorId(SystemSettingsView.VIEW_ID.getName()));
+ return new SystemSettingsView();
}
}, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
systemSettingsItem.setRefreshRequired(true); // refresh so it always reloads the latest settings
@@ -197,8 +194,7 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
NavigationItem alertTemplatesItem = new NavigationItem(AlertDefinitionTemplateTypeView.VIEW_ID,
new ViewFactory() {
public Canvas createView() {
- return new AlertDefinitionTemplateTypeView(
- extendLocatorId(AlertDefinitionTemplateTypeView.VIEW_ID.getName()));
+ return new AlertDefinitionTemplateTypeView();
}
});
alertTemplatesItem.setRefreshRequired(true); // we always need a new page
@@ -206,34 +202,33 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
NavigationItem driftTemplatesItem = new NavigationItem(DriftDefinitionTemplateTypeView.VIEW_ID,
new ViewFactory() {
public Canvas createView() {
- return new DriftDefinitionTemplateTypeView(
- extendLocatorId(DriftDefinitionTemplateTypeView.VIEW_ID.getName()));
+ return new DriftDefinitionTemplateTypeView();
}
});
driftTemplatesItem.setRefreshRequired(true); // we always need a new page
NavigationItem metricTemplatesItem = new NavigationItem(MetricTemplateTypeView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new MetricTemplateTypeView(extendLocatorId(MetricTemplateTypeView.VIEW_ID.getName()));
+ return new MetricTemplateTypeView();
}
});
metricTemplatesItem.setRefreshRequired(true); // we always need a new page
NavigationItem downloadsItem = new NavigationItem(DownloadsView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new DownloadsView(extendLocatorId(DownloadsView.VIEW_ID.getName()));
+ return new DownloadsView();
}
});
NavigationItem agentPluginsItem = new NavigationItem(AgentPluginTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new AgentPluginTableView(extendLocatorId(AgentPluginTableView.VIEW_ID.getName()));
+ return new AgentPluginTableView();
}
}, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
NavigationItem serverPluginsItem = new NavigationItem(ServerPluginTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new ServerPluginTableView(extendLocatorId(ServerPluginTableView.VIEW_ID.getName()));
+ return new ServerPluginTableView();
}
}, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java
index 3cce414..ea7cb67 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginDetailView.java
@@ -36,7 +36,6 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.PluginGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -49,8 +48,8 @@ public class AgentPluginDetailView extends LocatableVLayout {
private final PluginGWTServiceAsync pluginManager = GWTServiceLookup.getPluginService();
private final int pluginId;
- public AgentPluginDetailView(String locatorId, int pluginId) {
- super(locatorId);
+ public AgentPluginDetailView(int pluginId) {
+ super();
this.pluginId = pluginId;
setHeight100();
setWidth100();
@@ -60,9 +59,9 @@ public class AgentPluginDetailView extends LocatableVLayout {
protected void onDraw() {
super.onDraw();
- final LocatableSectionStack sectionStack;
+ final SectionStack sectionStack;
- sectionStack = new LocatableSectionStack(extendLocatorId("stack"));
+ sectionStack = new SectionStack();
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth100();
sectionStack.setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java
index 58db695..074c414 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AgentPluginTableView.java
@@ -81,7 +81,7 @@ public class AgentPluginTableView extends TableSection<AgentPluginDataSource> {
private boolean showDeleted = false;
- public AgentPluginTableView(String locatorId) {
+ public AgentPluginTableView() {
super(null);
setHeight100();
setWidth100();
@@ -121,8 +121,8 @@ public class AgentPluginTableView extends TableSection<AgentPluginDataSource> {
}
});
- addTableAction(extendLocatorId("disable"), MSG.common_button_disable(), new AuthorizedTableAction(this,
- TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
+ addTableAction(MSG.common_button_disable(), new AuthorizedTableAction(this, TableActionEnablement.ANY,
+ Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
ArrayList<String> selectedNames = getSelectedNames(selections);
String message = MSG.view_admin_plugins_agentDisableConfirm(selectedNames.toString());
@@ -156,8 +156,8 @@ public class AgentPluginTableView extends TableSection<AgentPluginDataSource> {
}
});
- addTableAction(extendLocatorId("delete"), MSG.common_button_delete(), new AuthorizedTableAction(this,
- TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
+ addTableAction(MSG.common_button_delete(), new AuthorizedTableAction(this, TableActionEnablement.ANY,
+ Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
ArrayList<String> selectedNames = getSelectedNames(selections);
String message = MSG.view_admin_plugins_agentDeleteConfirm(selectedNames.toString());
@@ -272,7 +272,7 @@ public class AgentPluginTableView extends TableSection<AgentPluginDataSource> {
@Override
public Canvas getDetailsView(Integer id) {
- return new AgentPluginDetailView(extendLocatorId("detailsView"), id);
+ return new AgentPluginDetailView(id);
}
private int[] getSelectedIds(ListGridRecord[] selections) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
index 227fb29..74f34b5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
@@ -29,6 +29,7 @@ import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.SpacerItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import com.smartgwt.client.widgets.layout.SectionStack;
import com.smartgwt.client.widgets.layout.SectionStackSection;
import org.rhq.core.domain.common.ProductInfo;
@@ -37,7 +38,6 @@ import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.SystemGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -55,7 +55,7 @@ public class DownloadsView extends LocatableVLayout {
private final SystemGWTServiceAsync systemManager = GWTServiceLookup.getSystemService();
- private LocatableSectionStack sectionStack;
+ private SectionStack sectionStack;
private SectionStackSection agentSection;
private SectionStackSection cliSection;
private SectionStackSection bundleSection;
@@ -65,14 +65,14 @@ public class DownloadsView extends LocatableVLayout {
private ProductInfo productInfo;
- public DownloadsView(String locatorId) {
- super(locatorId);
+ public DownloadsView() {
+ super();
productInfo = CoreGUI.get().getProductInfo();
setHeight100();
setWidth100();
- sectionStack = new LocatableSectionStack(extendLocatorId("stack"));
+ sectionStack = new SectionStack();
sectionStack.setShowResizeBar(true);
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java
index f992326..c923a94 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginControlView.java
@@ -74,7 +74,7 @@ public class ServerPluginControlView extends LocatableVStack {
public ServerPluginControlView(String locatorId, ServerPlugin plugin,
ArrayList<ServerPluginControlDefinition> controlDefs) {
- super(locatorId);
+ super();
this.plugin = plugin;
this.controlDefinitions = controlDefs;
setAutoHeight();
@@ -216,8 +216,7 @@ public class ServerPluginControlView extends LocatableVStack {
statusItem.setPrompt(MSG.view_admin_plugins_serverControls_clickForError());
statusItem.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
- ErrorMessageWindow win = new ErrorMessageWindow(extendLocatorId("errorWin"), MSG
- .common_label_error(), results.getError());
+ ErrorMessageWindow win = new ErrorMessageWindow(MSG.common_label_error(), results.getError());
win.show();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java
index b8bcd6c..ae760ea 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginDetailView.java
@@ -55,7 +55,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.PluginGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -68,7 +67,7 @@ public class ServerPluginDetailView extends LocatableVLayout {
private final PluginGWTServiceAsync pluginManager = GWTServiceLookup.getPluginService();
private final int pluginId;
- private final LocatableSectionStack sectionStack;
+ private final SectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection helpSection = null;
private SectionStackSection controlsSection = null;
@@ -76,14 +75,14 @@ public class ServerPluginDetailView extends LocatableVLayout {
private SectionStackSection scheduledJobsSection = null;
private int initSectionCount = 0;
- public ServerPluginDetailView(String locatorId, int pluginId) {
- super(locatorId);
+ public ServerPluginDetailView(int pluginId) {
+ super();
this.pluginId = pluginId;
setHeight100();
setWidth100();
setOverflow(Overflow.AUTO);
- sectionStack = new LocatableSectionStack(extendLocatorId("stack"));
+ sectionStack = new SectionStack();
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth100();
sectionStack.setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java
index 19d02dc..e8b8819 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/ServerPluginTableView.java
@@ -81,7 +81,7 @@ public class ServerPluginTableView extends TableSection<ServerPluginDataSource>
private boolean showUndeployed = false;
- public ServerPluginTableView(String locatorId) {
+ public ServerPluginTableView() {
super(null);
setHeight100();
setWidth100();
@@ -120,8 +120,8 @@ public class ServerPluginTableView extends TableSection<ServerPluginDataSource>
}
});
- addTableAction(extendLocatorId("disable"), MSG.common_button_disable(), new AuthorizedTableAction(this,
- TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
+ addTableAction(MSG.common_button_disable(), new AuthorizedTableAction(this, TableActionEnablement.ANY,
+ Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
ArrayList<String> selectedNames = getSelectedNames(selections);
String message = MSG.view_admin_plugins_serverDisableConfirm(selectedNames.toString());
@@ -155,8 +155,8 @@ public class ServerPluginTableView extends TableSection<ServerPluginDataSource>
}
});
- addTableAction(extendLocatorId("undeploy"), MSG.view_admin_plugins_undeploy(), new AuthorizedTableAction(this,
- TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
+ addTableAction(MSG.view_admin_plugins_undeploy(), new AuthorizedTableAction(this, TableActionEnablement.ANY,
+ Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
ArrayList<String> selectedNames = getSelectedNames(selections);
String message = MSG.view_admin_plugins_serverUndeployConfirm(selectedNames.toString());
@@ -299,7 +299,7 @@ public class ServerPluginTableView extends TableSection<ServerPluginDataSource>
@Override
public Canvas getDetailsView(Integer id) {
- return new ServerPluginDetailView(extendLocatorId("detailsView"), id);
+ return new ServerPluginDetailView(id);
}
private int[] getSelectedIds(ListGridRecord[] selections) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
index 60586a9..d0b9923 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/SystemSettingsView.java
@@ -74,8 +74,8 @@ public class SystemSettingsView extends LocatableVLayout implements PropertyValu
private IButton saveButton;
private IButton dumpToLogButton;
- public SystemSettingsView(String locatorId) {
- super(locatorId);
+ public SystemSettingsView() {
+ super();
setHeight100();
setWidth100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
index f6a8f56..bcc1d3a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/agent/install/RemoteAgentInstallView.java
@@ -71,8 +71,8 @@ public class RemoteAgentInstallView extends LocatableVLayout {
private ButtonItem stopButton;
private VLayout agentInfoLayout;
- public RemoteAgentInstallView(String locatorId) {
- super(locatorId);
+ public RemoteAgentInstallView() {
+ super();
setMembersMargin(1);
setWidth100();
setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
index 6c5d820..58c7a52 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java
@@ -49,7 +49,6 @@ import org.rhq.core.domain.common.ProductInfo;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack;
/**
@@ -146,7 +145,7 @@ public class PermissionsEditor extends LocatableVStack {
private ListGrid createGlobalPermissionsGrid() {
ProductInfo productInfo = CoreGUI.get().getProductInfo();
- ListGrid grid = createPermissionsGrid("GlobalPermissions");
+ ListGrid grid = createPermissionsGrid();
// TODO: Add table title.
@@ -187,9 +186,8 @@ public class PermissionsEditor extends LocatableVStack {
MSG.view_adminRoles_permissions_permDesc_manageRepositories());
records.add(record);
- record = createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_viewUsers(),
- "global/User", Permission.VIEW_USERS,
- MSG.view_adminRoles_permissions_permDesc_viewUsers());
+ record = createGlobalPermissionRecord(MSG.view_adminRoles_permissions_perm_viewUsers(), "global/User",
+ Permission.VIEW_USERS, MSG.view_adminRoles_permissions_permDesc_viewUsers());
records.add(record);
grid.setData(records.toArray(new ListGridRecord[records.size()]));
@@ -198,7 +196,7 @@ public class PermissionsEditor extends LocatableVStack {
}
private ListGrid createResourcePermissionsGrid() {
- ListGrid grid = createPermissionsGrid("ResourcePermissions");
+ ListGrid grid = createPermissionsGrid();
// TODO: Add table title.
ListGridField iconField = createIconField();
@@ -294,8 +292,8 @@ public class PermissionsEditor extends LocatableVStack {
return iconField;
}
- private LocatableListGrid createPermissionsGrid(String id) {
- LocatableListGrid grid = new LocatableListGrid(extendLocatorId(id));
+ private ListGrid createPermissionsGrid() {
+ ListGrid grid = new ListGrid();
grid.setAutoFitData(Autofit.BOTH);
grid.setWrapCells(true);
@@ -304,7 +302,8 @@ public class PermissionsEditor extends LocatableVStack {
return grid;
}
- private ListGridField createAuthorizedField(String name, String title, final String nameField, final ListGrid grid, boolean readOnlyColumn) {
+ private ListGridField createAuthorizedField(String name, String title, final String nameField, final ListGrid grid,
+ boolean readOnlyColumn) {
final ListGridField authorizedField = new ListGridField(name, title, 65);
// Show images rather than true/false.
@@ -313,10 +312,10 @@ public class PermissionsEditor extends LocatableVStack {
LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(2);
// set the proper images different for read-only column
- if(readOnlyColumn){
+ if (readOnlyColumn) {
valueMap.put(Boolean.TRUE.toString(), "global/permission_checked_disabled_11.png");
valueMap.put(Boolean.FALSE.toString(), "global/permission_disabled_11.png");
- }else {
+ } else {
valueMap.put(Boolean.TRUE.toString(), "global/permission_enabled_11.png");
valueMap.put(Boolean.FALSE.toString(), "global/permission_disabled_11.png");
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
index 5c776bd..0c2187c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
@@ -80,8 +80,8 @@ public class RoleEditView extends AbstractRecordEditor<RolesDataSource> implemen
private boolean isLdapConfigured;
private boolean isSystemRole;
- public RoleEditView(String locatorId, int roleId) {
- super(locatorId, new RolesDataSource(), roleId, MSG.common_label_role(), HEADER_ICON);
+ public RoleEditView(int roleId) {
+ super(new RolesDataSource(), roleId, MSG.common_label_role(), HEADER_ICON);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
index f0bcb76..1e779f8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
@@ -52,7 +52,7 @@ public class RolesView extends TableSection<RolesDataSource> implements HasViewN
private boolean hasManageSecurity;
- public RolesView(String locatorId, boolean hasManageSecurity) {
+ public RolesView(boolean hasManageSecurity) {
super(null);
final RolesDataSource datasource = RolesDataSource.getInstance();
@@ -156,7 +156,7 @@ public class RolesView extends TableSection<RolesDataSource> implements HasViewN
@Override
public Canvas getDetailsView(Integer roleId) {
- return new RoleEditView(extendLocatorId("Detail"), roleId);
+ return new RoleEditView(roleId);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java
index 03153e9..78bca06 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/AlertDefinitionTemplateTypeView.java
@@ -20,6 +20,11 @@
package org.rhq.enterprise.gui.coregui.client.admin.templates;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -27,21 +32,21 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.layout.Layout;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeGridField;
+
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceTypeTemplateCountComposite;
-import org.rhq.enterprise.gui.coregui.client.*;
+import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
+import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
+import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.alert.definitions.TemplateAlertDefinitionsView;
import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
/**
* @author Jay Shaughnessy
*/
@@ -55,8 +60,8 @@ public class AlertDefinitionTemplateTypeView extends ResourceTypeTreeView {
private Layout canvas;
- public AlertDefinitionTemplateTypeView(String locatorId) {
- super(locatorId);
+ public AlertDefinitionTemplateTypeView() {
+ super();
}
@Override
@@ -72,7 +77,7 @@ public class AlertDefinitionTemplateTypeView extends ResourceTypeTreeView {
@Override
protected TitleBar getTitleBar() {
- return new TitleBar(this, MSG.view_adminConfig_alertDefTemplates(), VIEW_ID.getIcon().getIcon24x24Path());
+ return new TitleBar(MSG.view_adminConfig_alertDefTemplates(), VIEW_ID.getIcon().getIcon24x24Path());
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java
index 6f45ab1..07c9ee3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/DriftDefinitionTemplateTypeView.java
@@ -20,6 +20,12 @@
package org.rhq.enterprise.gui.coregui.client.admin.templates;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
+
import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -27,10 +33,16 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.layout.Layout;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeGridField;
+
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceTypeTemplateCountComposite;
-import org.rhq.enterprise.gui.coregui.client.*;
+import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
+import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
+import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.drift.DriftDefinitionTemplatesView;
@@ -38,8 +50,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-import java.util.*;
-
/**
* @author Jay Shaughnessy
*
@@ -55,8 +65,8 @@ public class DriftDefinitionTemplateTypeView extends ResourceTypeTreeView {
private Layout canvas;
- public DriftDefinitionTemplateTypeView(String locatorId) {
- super(locatorId);
+ public DriftDefinitionTemplateTypeView() {
+ super();
}
@Override
@@ -72,7 +82,7 @@ public class DriftDefinitionTemplateTypeView extends ResourceTypeTreeView {
@Override
protected TitleBar getTitleBar() {
- return new TitleBar(this, MSG.view_adminConfig_driftDefTemplates(), ImageManager.getDriftIcon());
+ return new TitleBar(MSG.view_adminConfig_driftDefTemplates(), ImageManager.getDriftIcon());
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java
index 96b8f35..d40d198 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/MetricTemplateTypeView.java
@@ -20,32 +20,39 @@
package org.rhq.enterprise.gui.coregui.client.admin.templates;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.layout.Layout;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeGridField;
+
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceTypeTemplateCountComposite;
-import org.rhq.enterprise.gui.coregui.client.*;
+import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
+import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
+import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
+import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
/**
* @author Jay Shaughnessy
*
*/
public class MetricTemplateTypeView extends ResourceTypeTreeView {
- public static final ViewName VIEW_ID = new ViewName("MetricTemplates", MSG.view_adminConfig_metricTemplates(), IconEnum.METRIC);
+ public static final ViewName VIEW_ID = new ViewName("MetricTemplates", MSG.view_adminConfig_metricTemplates(),
+ IconEnum.METRIC);
public static final String VIEW_PATH = ResourceTypeTreeView.VIEW_PATH + VIEW_ID;
public static final String ATTR_ENABLED_TEMPLATES = "enabledTemplates";
@@ -53,8 +60,8 @@ public class MetricTemplateTypeView extends ResourceTypeTreeView {
private Layout canvas;
- public MetricTemplateTypeView(String locatorId) {
- super(locatorId);
+ public MetricTemplateTypeView() {
+ super();
}
@Override
@@ -70,7 +77,7 @@ public class MetricTemplateTypeView extends ResourceTypeTreeView {
@Override
protected TitleBar getTitleBar() {
- return new TitleBar(this, MSG.view_adminConfig_metricTemplates(), ImageManager.getMetricEditIcon());
+ return new TitleBar(MSG.view_adminConfig_metricTemplates(), ImageManager.getMetricEditIcon());
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
index a3ca599..21ae386 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java
@@ -18,6 +18,10 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.templates;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+
import com.smartgwt.client.data.Record;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.ListGridFieldType;
@@ -35,6 +39,7 @@ import com.smartgwt.client.widgets.layout.SectionStackSection;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeGridField;
import com.smartgwt.client.widgets.tree.TreeNode;
+
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
@@ -45,11 +50,8 @@ import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.EnumSet;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A tree view of all known ResourceTypes, which includes summaries of metric schedule and alert definition templates
@@ -65,8 +67,8 @@ public abstract class ResourceTypeTreeView extends LocatableVLayout implements B
private Layout gridCanvas;
- public ResourceTypeTreeView(String locatorId) {
- super(locatorId);
+ public ResourceTypeTreeView() {
+ super();
setWidth100();
setHeight100();
@@ -122,20 +124,20 @@ public abstract class ResourceTypeTreeView extends LocatableVLayout implements B
titleBar.setExtraSpace(10);
layout.addMember(titleBar);
- SectionStack sectionStack = new LocatableSectionStack(extendLocatorId("TypeStack"));
+ SectionStack sectionStack = new SectionStack();
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
- ListGrid platformsList = new CustomResourceTypeListGrid(extendLocatorId("platformsList"));
+ ListGrid platformsList = new CustomResourceTypeListGrid();
SectionStackSection platforms = new SectionStackSection(MSG.view_adminTemplates_platforms());
platforms.setExpanded(true);
platforms.addItem(platformsList);
- ListGrid platformServicesList = new CustomResourceTypeListGrid(extendLocatorId("platformServicesList"));
+ ListGrid platformServicesList = new CustomResourceTypeListGrid();
SectionStackSection platformServices = new SectionStackSection(MSG.view_adminTemplates_platformServices());
platformServices.setExpanded(true);
platformServices.addItem(platformServicesList);
- TreeGrid serversTreeGrid = new CustomResourceTypeTreeGrid(extendLocatorId("serversTree"));
+ TreeGrid serversTreeGrid = new CustomResourceTypeTreeGrid();
SectionStackSection servers = new SectionStackSection(MSG.view_adminTemplates_servers());
servers.setExpanded(true);
servers.addItem(serversTreeGrid);
@@ -173,8 +175,7 @@ public abstract class ResourceTypeTreeView extends LocatableVLayout implements B
if (showBackButton) {
String backLink = getEditLink(null).substring(1); // strip the #
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_tableSection_backButton(),
- backLink);
+ BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backLink);
parentCanvas.addMember(backButton);
}
@@ -182,10 +183,10 @@ public abstract class ResourceTypeTreeView extends LocatableVLayout implements B
parentCanvas.markForRedraw();
}
- public class CustomResourceTypeListGrid extends LocatableListGrid {
+ public class CustomResourceTypeListGrid extends ListGrid {
- public CustomResourceTypeListGrid(String locatorId) {
- super(locatorId);
+ public CustomResourceTypeListGrid() {
+ super();
setWrapCells(true);
setFixedRecordHeights(false);
@@ -194,20 +195,20 @@ public abstract class ResourceTypeTreeView extends LocatableVLayout implements B
ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7);
- final ListGridField nameField = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME, MSG
- .common_title_name());
+ final ListGridField nameField = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME,
+ MSG.common_title_name());
nameField.setShowValueIconOnly(false);
fields.add(nameField);
- final ListGridField pluginField = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN, MSG
- .common_title_plugin());
+ final ListGridField pluginField = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN,
+ MSG.common_title_plugin());
fields.add(pluginField);
pluginField.setHidden(true);
fields.addAll(getAdditionalListGridFields(false));
- ListGridField editField = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_EDIT, MSG
- .common_title_edit());
+ ListGridField editField = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_EDIT,
+ MSG.common_title_edit());
editField.setType(ListGridFieldType.IMAGE);
editField.setAlign(Alignment.CENTER);
editField.setCanGroupBy(false);
@@ -243,10 +244,10 @@ public abstract class ResourceTypeTreeView extends LocatableVLayout implements B
}
}
- public class CustomResourceTypeTreeGrid extends LocatableTreeGrid {
+ public class CustomResourceTypeTreeGrid extends TreeGrid {
- public CustomResourceTypeTreeGrid(String locatorId) {
- super(locatorId);
+ public CustomResourceTypeTreeGrid() {
+ super();
setWrapCells(true);
setFixedRecordHeights(false);
@@ -256,18 +257,18 @@ public abstract class ResourceTypeTreeView extends LocatableVLayout implements B
ArrayList<ListGridField> fields = new ArrayList<ListGridField>(7);
- final TreeGridField nameField = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME, MSG
- .common_title_name());
+ final TreeGridField nameField = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME,
+ MSG.common_title_name());
fields.add(nameField);
- final TreeGridField pluginField = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN, MSG
- .common_title_plugin());
+ final TreeGridField pluginField = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN,
+ MSG.common_title_plugin());
fields.add(pluginField);
fields.addAll(getAdditionalListGridFields(true));
- ListGridField editField = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_EDIT, MSG
- .common_title_edit());
+ ListGridField editField = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_EDIT,
+ MSG.common_title_edit());
editField.setType(ListGridFieldType.IMAGE);
editField.setAlign(Alignment.CENTER);
editField.addRecordClickHandler(new RecordClickHandler() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/UpdateExistingSchedulesWidget.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/UpdateExistingSchedulesWidget.java
index 89459d7..ef0d7ba 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/UpdateExistingSchedulesWidget.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/UpdateExistingSchedulesWidget.java
@@ -27,7 +27,7 @@ import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
/**
* A table widget that provides a checkbox for selecting whether or not to update existing schedules when updating
@@ -35,11 +35,11 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
*
* @author Ian Springer
*/
-public class UpdateExistingSchedulesWidget extends LocatableHLayout implements TableWidget {
+public class UpdateExistingSchedulesWidget extends EnhancedHLayout implements TableWidget {
private TemplateSchedulesView schedulesView;
public UpdateExistingSchedulesWidget(TemplateSchedulesView schedulesView) {
- super(schedulesView.extendLocatorId("UpdateExistingSchedulesWidget"));
+ super();
this.schedulesView = schedulesView;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
index bd7eace..b9f308b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
@@ -40,7 +40,6 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath;
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;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -54,21 +53,21 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
private final int affinityGroupId;
private static final int SECTION_COUNT = 3;
- private final LocatableSectionStack sectionStack;
+ private final SectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection agentSection = null;
private SectionStackSection serverSection = null;
private volatile int initSectionCount = 0;
- public AffinityGroupDetailView(String locatorId, int affinityGroupId) {
- super(locatorId);
+ public AffinityGroupDetailView(int affinityGroupId) {
+ super();
this.affinityGroupId = affinityGroupId;
setHeight100();
setWidth100();
setOverflow(Overflow.AUTO);
- sectionStack = new LocatableSectionStack(extendLocatorId("stack"));
+ sectionStack = new SectionStack();
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth100();
sectionStack.setHeight100();
@@ -138,8 +137,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
private void prepareAgentSection(SectionStack stack) {
SectionStackSection section = new SectionStackSection(MSG.view_adminTopology_affinityGroups_agetnMembers());
section.setExpanded(true);
- AgentTableView agentsTable = new AgentTableView(extendLocatorId(AgentTableView.VIEW_ID.getName()),
- affinityGroupId, true);
+ AgentTableView agentsTable = new AgentTableView(affinityGroupId, true);
section.setItems(agentsTable);
agentSection = section;
@@ -150,8 +148,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
private void prepareServerSection(SectionStack stack) {
SectionStackSection section = new SectionStackSection(MSG.view_adminTopology_affinityGroups_serverMembers());
section.setExpanded(true);
- ServerTableView serverTable = new ServerTableView(extendLocatorId(AgentTableView.VIEW_ID.getName()),
- affinityGroupId, true);
+ ServerTableView serverTable = new ServerTableView(affinityGroupId, true);
section.setItems(serverTable);
serverSection = section;
@@ -169,7 +166,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
final TextItem nameItem = new TextItem(FIELD_NAME.propertyName(), FIELD_NAME.title());
nameItem.setValue(affinityGroup.getName());
- LocatableToolStrip footer = new LocatableToolStrip(extendLocatorId("detailsFooter"));
+ LocatableToolStrip footer = new LocatableToolStrip();
footer.setPadding(5);
footer.setWidth100();
footer.setMembersMargin(15);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
index e1a3f4c..1b95330 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
@@ -72,7 +72,7 @@ public class AffinityGroupTableView extends TableSection<AffinityGroupWithCounts
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
+ AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
- public AffinityGroupTableView(String locatorId) {
+ public AffinityGroupTableView() {
super(null);
setHeight100();
setWidth100();
@@ -90,51 +90,50 @@ public class AffinityGroupTableView extends TableSection<AffinityGroupWithCounts
@Override
public Canvas getDetailsView(Integer id) {
- return new AffinityGroupDetailView(extendLocatorId("detailsView"), id);
+ return new AffinityGroupDetailView(id);
}
private void showActions() {
- addTableAction(extendLocatorId("createNew"), MSG.view_adminTopology_affinityGroups_createNew(),
- new AuthorizedTableAction(this, TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- showCreateAffinityGroupWindow();
- }
- });
+ addTableAction(MSG.view_adminTopology_affinityGroups_createNew(), new AuthorizedTableAction(this,
+ TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
+ public void executeAction(final ListGridRecord[] selections, Object actionValue) {
+ showCreateAffinityGroupWindow();
+ }
+ });
- addTableAction(extendLocatorId("removeSelected"), MSG.view_adminTopology_server_removeSelected(), null,
- new AuthorizedTableAction(this, TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- final List<String> selectedNames = getSelectedNames(selections);
- String message = MSG.view_adminTopology_message_removeAGroupsConfirm(selectedNames.toString());
- SC.ask(message, new BooleanCallback() {
- public void execute(Boolean confirmed) {
- if (confirmed) {
- int[] selectedIds = getSelectedIds(selections);
- GWTServiceLookup.getTopologyService().deleteAffinityGroups(selectedIds,
- new AsyncCallback<Integer>() {
- public void onSuccess(Integer count) {
- Message msg = new Message(MSG
- .view_adminTopology_message_removedAGroups(String.valueOf(count)),
- Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(msg);
- refresh();
- }
-
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_adminTopology_message_removeAGroupsFail(selectedNames
- .toString()) + " " + caught.getMessage(), caught);
- refreshTableInfo();
- }
-
- });
- } else {
- refreshTableInfo();
- }
+ addTableAction(MSG.view_adminTopology_server_removeSelected(), null, new AuthorizedTableAction(this,
+ TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
+ public void executeAction(final ListGridRecord[] selections, Object actionValue) {
+ final List<String> selectedNames = getSelectedNames(selections);
+ String message = MSG.view_adminTopology_message_removeAGroupsConfirm(selectedNames.toString());
+ SC.ask(message, new BooleanCallback() {
+ public void execute(Boolean confirmed) {
+ if (confirmed) {
+ int[] selectedIds = getSelectedIds(selections);
+ GWTServiceLookup.getTopologyService().deleteAffinityGroups(selectedIds,
+ new AsyncCallback<Integer>() {
+ public void onSuccess(Integer count) {
+ Message msg = new Message(MSG.view_adminTopology_message_removedAGroups(String
+ .valueOf(count)), Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(msg);
+ refresh();
+ }
+
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_removeAGroupsFail(selectedNames.toString())
+ + " " + caught.getMessage(), caught);
+ refreshTableInfo();
+ }
+
+ });
+ } else {
+ refreshTableInfo();
}
- });
- }
- });
+ }
+ });
+ }
+ });
}
private int[] getSelectedIds(ListGridRecord[] selections) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
index a1f9edc..2fc23ff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
@@ -46,7 +46,6 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -60,20 +59,20 @@ public class AgentDetailView extends LocatableVLayout {
private final int agentId;
private static final int SECTION_COUNT = 2;
- private final LocatableSectionStack sectionStack;
+ private final SectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection failoverListSection = null;
private volatile int initSectionCount = 0;
- public AgentDetailView(String locatorId, int agentId) {
- super(locatorId);
+ public AgentDetailView(int agentId) {
+ super();
this.agentId = agentId;
setHeight100();
setWidth100();
setOverflow(Overflow.AUTO);
- sectionStack = new LocatableSectionStack(extendLocatorId("stack"));
+ sectionStack = new SectionStack();
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth100();
sectionStack.setHeight100();
@@ -147,8 +146,7 @@ public class AgentDetailView extends LocatableVLayout {
private void prepareFailoverListSection(SectionStack stack, Agent agent) {
SectionStackSection section = new SectionStackSection(MSG.view_adminTopology_agentDetail_agentFailoverList());
section.setExpanded(true);
- ServerTableView agentsTable = new ServerTableView(extendLocatorId(ServerTableView.VIEW_ID.getName()),
- agent.getId(), false);
+ ServerTableView agentsTable = new ServerTableView(agent.getId(), false);
section.setItems(agentsTable);
failoverListSection = section;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
index 057f4a6..8534a9a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
@@ -58,7 +58,7 @@ public class AgentTableView extends TableSection<AgentDatasource> implements Has
private final boolean isAffinityGroupId;
private final Integer id;
- public AgentTableView(String locatorId, Integer id, boolean isAffinityGroupId) {
+ public AgentTableView(Integer id, boolean isAffinityGroupId) {
super(null);
this.isAffinityGroupId = isAffinityGroupId;
this.id = id;
@@ -126,24 +126,24 @@ public class AgentTableView extends TableSection<AgentDatasource> implements Has
}
private void showUpdateMembersAction() {
- addTableAction(extendLocatorId("editGroupAgents"), MSG.view_groupInventoryMembers_button_updateMembership(),
- new AuthorizedTableAction(this, TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- AffinityGroupAgentsSelector.show(id, AgentTableView.this);
- }
- });
+ addTableAction(MSG.view_groupInventoryMembers_button_updateMembership(), new AuthorizedTableAction(this,
+ TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
+ public void executeAction(final ListGridRecord[] selections, Object actionValue) {
+ AffinityGroupAgentsSelector.show(id, AgentTableView.this);
+ }
+ });
}
@Override
public Canvas getDetailsView(Integer id) {
- return new AgentDetailView(extendLocatorId("detailsView"), id);
+ return new AgentDetailView(id);
}
@Override
public ViewName getViewName() {
return VIEW_ID;
}
-
+
@Override
protected String getBasePath() {
return VIEW_PATH;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
index 212bc19..99f7ef8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
@@ -50,7 +50,6 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.TopologyGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -63,20 +62,20 @@ public class PartitionEventDetailView extends LocatableVLayout implements Bookma
private final int partitionEventId;
private static final int SECTION_COUNT = 2;
- private final LocatableSectionStack sectionStack;
+ private final SectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection agentSection = null;
private volatile int initSectionCount = 0;
- public PartitionEventDetailView(String locatorId, int partitionEventId) {
- super(locatorId);
+ public PartitionEventDetailView(int partitionEventId) {
+ super();
this.partitionEventId = partitionEventId;
setHeight100();
setWidth100();
setOverflow(Overflow.AUTO);
- sectionStack = new LocatableSectionStack(extendLocatorId("stack"));
+ sectionStack = new SectionStack();
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth100();
sectionStack.setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
index eee1aef..ef6d96c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
@@ -84,7 +84,7 @@ public class PartitionEventTableView extends TableSection<PartitionEventDatasour
}
}
- public PartitionEventTableView(String locatorId, String tableTitle) {
+ public PartitionEventTableView(String tableTitle) {
super(tableTitle, INITIAL_CRITERIA, new SortSpecifier[] { DEFAULT_SORT_SPECIFIER });
setHeight100();
setWidth100();
@@ -136,7 +136,7 @@ public class PartitionEventTableView extends TableSection<PartitionEventDatasour
@Override
public Canvas getDetailsView(Integer id) {
- return new PartitionEventDetailView(extendLocatorId("detailsView"), id);
+ return new PartitionEventDetailView(id);
}
private void showActions() {
@@ -146,8 +146,8 @@ public class PartitionEventTableView extends TableSection<PartitionEventDatasour
}
private void addTableAction(final TableAction action) {
- addTableAction(extendLocatorId(action.toString()), action.title, null, new AuthorizedTableAction(this,
- action.enablement, Permission.MANAGE_SETTINGS) {
+ addTableAction(action.title, null, new AuthorizedTableAction(this, action.enablement,
+ Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
String eventTypes = getSelectedEventTypes(selections).toString();
String message = null;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
index 8fe5732..383aaf7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
@@ -56,7 +56,6 @@ 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.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -71,20 +70,20 @@ public class ServerDetailView extends LocatableVLayout implements BookmarkableVi
private final int serverId;
private static final int SECTION_COUNT = 2;
- private final LocatableSectionStack sectionStack;
+ private final SectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection agentSection = null;
private volatile int initSectionCount = 0;
- public ServerDetailView(String locatorId, int serverId) {
- super(locatorId);
+ public ServerDetailView(int serverId) {
+ super();
this.serverId = serverId;
setHeight100();
setWidth100();
setOverflow(Overflow.AUTO);
- sectionStack = new LocatableSectionStack(extendLocatorId("stack"));
+ sectionStack = new SectionStack();
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth100();
sectionStack.setHeight100();
@@ -158,8 +157,7 @@ public class ServerDetailView extends LocatableVLayout implements BookmarkableVi
private void prepareAgentSection(SectionStack stack, Server server) {
SectionStackSection section = new SectionStackSection(MSG.view_adminTopology_serverDetail_connectedAgents());
section.setExpanded(true);
- AgentTableView agentsTable = new AgentTableView(extendLocatorId(AgentTableView.VIEW_ID.getName()), serverId,
- false);
+ AgentTableView agentsTable = new AgentTableView(serverId, false);
section.setItems(agentsTable);
agentSection = section;
@@ -250,7 +248,7 @@ public class ServerDetailView extends LocatableVLayout implements BookmarkableVi
form.setItems(nameItem, addressItem, portItem, securePortItem, operationModeItem, affinityGroupItem,
installationDateItem, lastUpdatetem);
- LocatableToolStrip footer = new LocatableToolStrip(extendLocatorId("detailsFooter"));
+ LocatableToolStrip footer = new LocatableToolStrip();
footer.setPadding(5);
footer.setWidth100();
footer.setMembersMargin(15);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
index 99822c6..09738a6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
@@ -70,7 +70,7 @@ public class ServerTableView extends
private final boolean isAffinityGroupId;
private final Integer id;
- public ServerTableView(String locatorId, Integer id, boolean isAffinityGroupId) {
+ public ServerTableView(Integer id, boolean isAffinityGroupId) {
super(null);
this.showActions = id == null && !isAffinityGroupId;
this.isAffinityGroupId = isAffinityGroupId;
@@ -145,55 +145,53 @@ public class ServerTableView extends
@Override
public Canvas getDetailsView(Integer id) {
- return new ServerDetailView(extendLocatorId("detailsView"), id);
+ return new ServerDetailView(id);
}
-
-// @Override
-// public abstract void showDetails(ID id) {
-//
-// }
+
+ // @Override
+ // public abstract void showDetails(ID id) {
+ //
+ // }
private void showCommonActions() {
addChangeOperationModeAction(OperationMode.NORMAL, MSG.view_adminTopology_server_setNormal());
addChangeOperationModeAction(OperationMode.MAINTENANCE, MSG.view_adminTopology_server_setMaintenance());
- addTableAction(extendLocatorId("removeSelected"), MSG.view_adminTopology_server_removeSelected(), null,
- new AuthorizedTableAction(this, TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- List<String> selectedNames = getSelectedNames(selections);
- String message = MSG.view_adminTopology_message_removeServerConfirm(selectedNames.toString());
- SC.ask(message, new BooleanCallback() {
- public void execute(Boolean confirmed) {
- if (confirmed) {
- int[] selectedIds = getSelectedIds(selections);
- GWTServiceLookup.getTopologyService().deleteServers(selectedIds,
- new AsyncCallback<Void>() {
- public void onSuccess(Void arg0) {
- Message msg = new Message(MSG
- .view_adminTopology_message_removedServer(String
- .valueOf(selections.length)), Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(msg);
- refresh();
- }
+ addTableAction(MSG.view_adminTopology_server_removeSelected(), null, new AuthorizedTableAction(this,
+ TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
+ public void executeAction(final ListGridRecord[] selections, Object actionValue) {
+ List<String> selectedNames = getSelectedNames(selections);
+ String message = MSG.view_adminTopology_message_removeServerConfirm(selectedNames.toString());
+ SC.ask(message, new BooleanCallback() {
+ public void execute(Boolean confirmed) {
+ if (confirmed) {
+ int[] selectedIds = getSelectedIds(selections);
+ GWTServiceLookup.getTopologyService().deleteServers(selectedIds, new AsyncCallback<Void>() {
+ public void onSuccess(Void arg0) {
+ Message msg = new Message(MSG.view_adminTopology_message_removedServer(String
+ .valueOf(selections.length)), Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(msg);
+ refresh();
+ }
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_adminTopology_message_removeServerFail(String
- .valueOf(selections.length)) + " " + caught.getMessage(), caught);
- refreshTableInfo();
- }
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_removeServerFail(String
+ .valueOf(selections.length)) + " " + caught.getMessage(), caught);
+ refreshTableInfo();
+ }
- });
- }
+ });
}
- });
- }
- });
+ }
+ });
+ }
+ });
}
private void addChangeOperationModeAction(final OperationMode mode, String label) {
- addTableAction(extendLocatorId("set" + mode), label, null, new AuthorizedTableAction(this,
- TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
+ addTableAction(label, null, new AuthorizedTableAction(this, TableActionEnablement.ANY,
+ Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
List<String> selectedNames = getSelectedNames(selections);
String message = MSG.view_adminTopology_message_setModeConfirm(selectedNames.toString(), mode.name());
@@ -229,7 +227,7 @@ public class ServerTableView extends
}
private void showUpdateMembersAction() {
- addTableAction(extendLocatorId("editGroupServers"), MSG.view_groupInventoryMembers_button_updateMembership(),
+ addTableAction(MSG.view_groupInventoryMembers_button_updateMembership(),
new AuthorizedTableAction(this, TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
AffinityGroupServersSelector.show(id, ServerTableView.this);
@@ -264,7 +262,7 @@ public class ServerTableView extends
public ViewName getViewName() {
return VIEW_ID;
}
-
+
@Override
protected String getBasePath() {
return VIEW_PATH;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
index 217fc15..51af4ff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java
@@ -65,8 +65,8 @@ public class UserEditView extends AbstractRecordEditor<UsersDataSource> {
private boolean loggedInUserHasManageSecurityPermission;
private boolean ldapAuthorizationEnabled;
- public UserEditView(String locatorId, int subjectId) {
- super(locatorId, new UsersDataSource(), subjectId, MSG.common_label_user(), HEADER_ICON);
+ public UserEditView(int subjectId) {
+ super(new UsersDataSource(), subjectId, MSG.common_label_user(), HEADER_ICON);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
index ed08330..8f96526 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -60,7 +60,7 @@ public class UsersView extends TableSection<UsersDataSource> implements HasViewN
private boolean hasManageSecurity;
- public UsersView(String locatorId, boolean hasManageSecurity) {
+ public UsersView(boolean hasManageSecurity) {
super(null);
final UsersDataSource dataSource = UsersDataSource.getInstance();
@@ -222,7 +222,7 @@ public class UsersView extends TableSection<UsersDataSource> implements HasViewN
@Override
public Canvas getDetailsView(Integer subjectId) {
- return new UserEditView(extendLocatorId("Detail"), subjectId);
+ return new UserEditView(subjectId);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
index 04c2163..ba6d079 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDetailsView.java
@@ -65,15 +65,15 @@ public class AlertDetailsView extends LocatableVLayout implements BookmarkableVi
private int alertId;
- private static AlertDetailsView INSTANCE = new AlertDetailsView("alertDetailsView");
+ private static AlertDetailsView INSTANCE = new AlertDetailsView();
public static AlertDetailsView getInstance() {
return INSTANCE;
}
- private AlertDetailsView(String locatorId) {
+ private AlertDetailsView() {
// access through the static singleton only
- super(locatorId);
+ super();
}
private void show(int alertId) {
@@ -103,7 +103,7 @@ public class AlertDetailsView extends LocatableVLayout implements BookmarkableVi
}
private TabSet getDetailsTabSet(Record record) {
- TabSet tabset = new NamedTabSet(extendLocatorId("detailsTabSet"));
+ TabSet tabset = new NamedTabSet();
Tab generalTab = new NamedTab(extendLocatorId("general"), new ViewName("general",
MSG.view_alert_common_tab_general()));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/SubsystemResourceAlertView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/SubsystemResourceAlertView.java
index 54aedc8..59ca208 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/SubsystemResourceAlertView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/SubsystemResourceAlertView.java
@@ -25,7 +25,7 @@ package org.rhq.enterprise.gui.coregui.client.alert;
import org.rhq.core.domain.common.EntityContext;
public class SubsystemResourceAlertView extends AlertHistoryView {
- public SubsystemResourceAlertView(String locatorId, boolean hasWriteAccess) {
+ public SubsystemResourceAlertView(boolean hasWriteAccess) {
super(MSG.common_title_recent_alerts(), EntityContext.forSubsystemView(), hasWriteAccess);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
index 93aa80c..4eac915 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
@@ -75,7 +75,7 @@ public abstract class AbstractAlertDefinitionsView extends TableSection<Abstract
final boolean isAuthorized = isAuthorizedToModifyAlertDefinitions();
- addTableAction(extendLocatorId("New"), MSG.common_button_new(), null, new AbstractTableAction() {
+ addTableAction(MSG.common_button_new(), null, new AbstractTableAction() {
public boolean isEnabled(ListGridRecord[] selection) {
return super.isEnabled(selection) && isAuthorized;
}
@@ -128,15 +128,13 @@ public abstract class AbstractAlertDefinitionsView extends TableSection<Abstract
}
AlertDefinition alertDef = getAlertDefinitionDataSource().copyValues(record);
- SingleAlertDefinitionView singleAlertDefinitionView = new SingleAlertDefinitionView(
- this.extendLocatorId(alertDef.getName()), this, alertDef);
+ SingleAlertDefinitionView singleAlertDefinitionView = new SingleAlertDefinitionView(this, alertDef);
return singleAlertDefinitionView;
}
@Override
public SingleAlertDefinitionView getDetailsView(final Integer id) {
- final SingleAlertDefinitionView singleAlertDefinitionView = new SingleAlertDefinitionView(
- this.extendLocatorId("singleAlertDefinitionView"), this);
+ final SingleAlertDefinitionView singleAlertDefinitionView = new SingleAlertDefinitionView(this);
if (id == 0) {
// create an empty one with all defaults
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java
index 9302d8d..e309623 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsAlertDefinitionForm.java
@@ -65,7 +65,7 @@ public class ConditionsAlertDefinitionForm extends LocatableVLayout implements E
}
public ConditionsAlertDefinitionForm(String locatorId, ResourceType resourceType, AlertDefinition alertDefinition) {
- super(locatorId);
+ super();
this.resourceType = resourceType;
this.alertDefinition = alertDefinition;
this.updated = false;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java
index 5b26401..5ce72ee 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ConditionsEditor.java
@@ -66,7 +66,7 @@ public class ConditionsEditor extends LocatableVLayout {
public ConditionsEditor(String locatorId, SelectItem conditionExpression, ResourceType resourceType,
HashSet<AlertCondition> conditions) {
- super(locatorId);
+ super();
this.conditionExpression = conditionExpression;
this.resourceType = resourceType;
this.updated = false;
@@ -126,7 +126,7 @@ public class ConditionsEditor extends LocatableVLayout {
protected void onInit() {
super.onInit();
- table = new ConditionsTable(extendLocatorId("conditionsTable"));
+ table = new ConditionsTable();
addMember(table);
}
@@ -144,8 +144,8 @@ public class ConditionsEditor extends LocatableVLayout {
}
private class ConditionsTable extends Table<ConditionDataSource> {
- private ConditionsTable(String locatorId) {
- super(locatorId);
+ private ConditionsTable() {
+ super();
setShowHeader(false);
@@ -155,7 +155,7 @@ public class ConditionsEditor extends LocatableVLayout {
@Override
protected void configureTable() {
- addTableAction(this.extendLocatorId("add"), "Add", null, new AbstractTableAction() {
+ addTableAction(MSG.common_button_add(), null, new AbstractTableAction() {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
// we need the drift definition templates (if there are any) so we know if we should offer drift conditions as an option
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java
index aec61c6..bb59d87 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/DampeningAlertDefinitionForm.java
@@ -75,11 +75,11 @@ public class DampeningAlertDefinitionForm extends DynamicForm implements EditAle
private boolean updated;
- public DampeningAlertDefinitionForm(String locatorId) {
- this(locatorId, null);
+ public DampeningAlertDefinitionForm() {
+ this(null);
}
- public DampeningAlertDefinitionForm(String locatorId, AlertDefinition alertDefinition) {
+ public DampeningAlertDefinitionForm(AlertDefinition alertDefinition) {
super();
this.alertDefinition = alertDefinition;
this.updated = false;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
index 409b31b..9fd52b8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NotificationsAlertDefinitionForm.java
@@ -69,7 +69,7 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
private Table table;
public NotificationsAlertDefinitionForm(String locatorId, AlertDefinition alertDefinition) {
- super(locatorId);
+ super();
this.alertDefinition = alertDefinition;
extractShallowCopyOfNotifications(this.alertDefinition);
}
@@ -150,7 +150,7 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
private void buildForm() {
if (!formBuilt) {
- table = new NotificationTable(extendLocatorId("notificationsTable"));
+ table = new NotificationTable();
addMember(table);
@@ -245,8 +245,8 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
}
private class NotificationTable extends Table<NotificationDataSource> {
- public NotificationTable(String locatorId) {
- super(locatorId);
+ public NotificationTable() {
+ super();
setShowHeader(false);
final NotificationDataSource dataSource = new NotificationDataSource();
@@ -275,7 +275,7 @@ public class NotificationsAlertDefinitionForm extends LocatableVLayout implement
}
});
- addTableAction(this.extendLocatorId("add"), MSG.common_button_add(), null, new AbstractTableAction() {
+ addTableAction(MSG.common_button_add(), null, new AbstractTableAction() {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
popupNotificationEditor(null);
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 f34b1d4..194e06b 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
@@ -63,7 +63,7 @@ import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourcePicker.OkHandler;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.SingleResourcePicker;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
@@ -104,7 +104,7 @@ public class ResourceOperationNotificationSenderForm extends AbstractNotificatio
dynamicForm = new DynamicForm();
dynamicForm.setNumCols(3);
- operationArgumentsCanvasItem = new LocatableHLayout(extendLocatorId("opArgLayout"));
+ operationArgumentsCanvasItem = new EnhancedHLayout();
operationArgumentsCanvasItem.setOverflow(Overflow.VISIBLE);
operationArgumentsCanvasItem.setHeight(400);
operationArgumentsCanvasItem.setWidth(500);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
index d0f6302..3a5ee88 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
@@ -56,13 +56,12 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
private boolean isAuthorizedToModifyAlertDefinitions;
- public SingleAlertDefinitionView(String locatorId, AbstractAlertDefinitionsView alertDefView) {
- this(locatorId, alertDefView, null);
+ public SingleAlertDefinitionView(AbstractAlertDefinitionsView alertDefView) {
+ this(alertDefView, null);
}
- public SingleAlertDefinitionView(String locatorId, final AbstractAlertDefinitionsView alertDefView,
- AlertDefinition alertDefinition) {
- super(locatorId);
+ public SingleAlertDefinitionView(final AbstractAlertDefinitionsView alertDefView, AlertDefinition alertDefinition) {
+ super();
this.alertDefinition = alertDefinition;
this.isAuthorizedToModifyAlertDefinitions = alertDefView.isAuthorizedToModifyAlertDefinitions();
@@ -100,7 +99,7 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
recoveryTab.setPane(recovery);
Tab dampeningTab = new LocatableTab(tabSet.extendLocatorId("Dampening"), MSG.view_alert_common_tab_dampening());
- dampening = new DampeningAlertDefinitionForm(this.getLocatorId(), alertDefinition);
+ dampening = new DampeningAlertDefinitionForm(alertDefinition);
dampeningTab.setPane(dampening);
tabSet.setTabs(generalPropertiesTab, conditionsTab, notificationsTab, recoveryTab, dampeningTab);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java
index 5555546..88b5153 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java
@@ -28,15 +28,18 @@ import com.smartgwt.client.widgets.layout.SectionStackSection;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.authz.Permission;
-import org.rhq.enterprise.gui.coregui.client.*;
+import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
+import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.PermissionsLoadedListener;
+import org.rhq.enterprise.gui.coregui.client.PermissionsLoader;
+import org.rhq.enterprise.gui.coregui.client.ViewId;
+import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.bundle.list.BundleView;
import org.rhq.enterprise.gui.coregui.client.bundle.list.BundlesListView;
import org.rhq.enterprise.gui.coregui.client.bundle.tree.BundleTreeView;
-import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.content.repository.tree.ContentRepositoryTreeView;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -46,7 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
* @author Greg Hinkle
* @author John Mazzitelli
*/
-public class BundleTopView extends LocatableHLayout implements BookmarkableView {
+public class BundleTopView extends EnhancedHLayout implements BookmarkableView {
public static final ViewName VIEW_ID = new ViewName("Bundles", MSG.view_bundle_bundles(), IconEnum.BUNDLE);
@@ -57,8 +60,8 @@ public class BundleTopView extends LocatableHLayout implements BookmarkableView
private BundleView bundleView; // if the user is viewing an individual bundle, this is that right-side view
private BundlesListView bundlesListView; // if the user is not viewing an indiv. bundle, this is the right-side list
- public BundleTopView(String locatorId) {
- super(locatorId);
+ public BundleTopView() {
+ super();
setOverflow(Overflow.AUTO);
setWidth100();
setHeight100();
@@ -74,14 +77,14 @@ public class BundleTopView extends LocatableHLayout implements BookmarkableView
&& permissions.contains(Permission.MANAGE_INVENTORY);
boolean canManageBundles = permissions != null && permissions.contains(Permission.MANAGE_BUNDLE);
- SectionStack sectionStack = new LocatableSectionStack(getLocatorId());
+ SectionStack sectionStack = new SectionStack();
sectionStack.setShowResizeBar(true);
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth(250);
sectionStack.setHeight100();
SectionStackSection bundlesSection = new SectionStackSection(MSG.view_bundle_bundles());
- bundleTreeView = new BundleTreeView(extendLocatorId("BundleTree"), canManageBundles);
+ bundleTreeView = new BundleTreeView(canManageBundles);
bundlesSection.addItem(bundleTreeView);
sectionStack.addSection(bundlesSection);
@@ -89,7 +92,7 @@ public class BundleTopView extends LocatableHLayout implements BookmarkableView
if (canManageInventory) {
SectionStackSection repositoriesSection = new SectionStackSection(MSG
.common_title_repositories());
- ContentRepositoryTreeView repoTree = new ContentRepositoryTreeView(extendLocatorId("RepoTree"));
+ ContentRepositoryTreeView repoTree = new ContentRepositoryTreeView();
repositoriesSection.addItem(repoTree);
sectionStack.addSection(repositoriesSection);
}
@@ -117,13 +120,13 @@ public class BundleTopView extends LocatableHLayout implements BookmarkableView
bundlesListView.refresh();
} else {
currentNextPath = null;
- bundlesListView = new BundlesListView(extendLocatorId("BundleList"), permissions);
+ bundlesListView = new BundlesListView(permissions);
setContent(bundlesListView);
}
} else {
if (!viewPath.getNext().equals(currentNextPath)) {
currentNextPath = viewPath.getNext();
- bundleView = new BundleView(extendLocatorId("Bundle"), permissions);
+ bundleView = new BundleView(permissions);
setContent(bundleView);
bundleView.renderView(viewPath.next());
} else {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
index a9ed8df..219eef5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentListView.java
@@ -45,7 +45,6 @@ import org.rhq.enterprise.gui.coregui.client.components.table.EscapedHtmlCellFor
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
/**
* @author Greg Hinkle
@@ -62,8 +61,8 @@ public class BundleDeploymentListView extends Table<BundleDeploymentDataSource>
}
@Override
- protected LocatableListGrid createListGrid(String locatorId) {
- LocatableListGrid grid = super.createListGrid(locatorId);
+ protected ListGrid createListGrid() {
+ ListGrid grid = super.createListGrid();
grid.setSortField(BundleDeploymentDataSource.FIELD_DEPLOY_TIME);
grid.setSortDirection(SortDirection.DESCENDING);
return grid;
@@ -128,7 +127,7 @@ public class BundleDeploymentListView extends Table<BundleDeploymentDataSource>
String err = event.getRecord().getAttribute(BundleDeploymentDataSource.FIELD_ERROR_MESSAGE);
if (err != null && err.length() > 0) {
err = "<pre>" + err + "</pre>";
- new ErrorMessageWindow(extendLocatorId("errWin"), MSG.common_severity_error(), err).show();
+ new ErrorMessageWindow(MSG.common_severity_error(), err).show();
}
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
index 0e0ca16..c32dabe 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleDeploymentView.java
@@ -97,7 +97,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
private final HashMap<String, String> statusIcons;
public BundleDeploymentView(String locatorId, boolean canManageBundles) {
- super(locatorId);
+ super();
this.canManageBundles = canManageBundles;
setWidth100();
setHeight100();
@@ -119,9 +119,8 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
this.version = bundleDeployment.getBundleVersion();
this.bundle = bundleDeployment.getBundleVersion().getBundle();
- addMember(new BackButton(extendLocatorId("BackButton"), MSG.view_bundle_deploy_backButton() + ": "
- + deployment.getDestination().getName(), LinkManager.getBundleDestinationLink(version.getBundle().getId(),
- deployment.getDestination().getId())));
+ addMember(new BackButton(MSG.view_bundle_deploy_backButton() + ": " + deployment.getDestination().getName(),
+ LinkManager.getBundleDestinationLink(version.getBundle().getId(), deployment.getDestination().getId())));
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleDeployment_24.png"), deployment.getName()));
//conditionally add tags. Defaults to true, not available in JON builds.
@@ -198,8 +197,8 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
status.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
- ErrorMessageWindow win = new ErrorMessageWindow(extendLocatorId("errWin"), MSG
- .common_severity_error(), "<pre>" + deployment.getErrorMessage() + "</pre>");
+ ErrorMessageWindow win = new ErrorMessageWindow(MSG.common_severity_error(), "<pre>"
+ + deployment.getErrorMessage() + "</pre>");
win.show();
}
});
@@ -337,7 +336,7 @@ public class BundleDeploymentView extends LocatableVLayout implements Bookmarkab
Table table = new Table(extendLocatorId("Deployments"), MSG.view_bundle_deploy_deploymentPlatforms());
table.setShowFooterRefresh(false);
- TitleBar titleBar = new TitleBar(this, MSG.view_bundle_deploy_selectARow());
+ TitleBar titleBar = new TitleBar(MSG.view_bundle_deploy_selectARow());
table.setTitleBar(titleBar);
// resource icon field
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
index 3a0c117..94a3cb3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deployment/BundleResourceDeploymentHistoryListView.java
@@ -54,7 +54,6 @@ import org.rhq.core.domain.bundle.BundleResourceDeployment;
import org.rhq.core.domain.bundle.BundleResourceDeploymentHistory;
import org.rhq.enterprise.gui.coregui.client.ErrorMessageWindow;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -66,7 +65,7 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout {
private HashMap<String, String> statusIcons;
public BundleResourceDeploymentHistoryListView(String locatorId, BundleResourceDeployment resourceDeployment) {
- super(locatorId);
+ super();
setWidth100();
setHeight100();
this.resourceDeployment = resourceDeployment;
@@ -87,7 +86,7 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout {
protected void onInit() {
super.onInit();
- final ListGrid grid = new LocatableListGrid(this.getLocatorId());
+ final ListGrid grid = new ListGrid();
grid.setWidth100();
grid.setHeight100();
grid.setSelectionType(SelectionStyle.SINGLE);
@@ -188,7 +187,7 @@ public class BundleResourceDeploymentHistoryListView extends LocatableVLayout {
form.setItems(timestamp, action, category, user, status, info, message, detail);
form.editRecord(record);
- Window win = new ErrorMessageWindow(extendLocatorId("detailsWin"), MSG.view_bundle_deploy_installDetails(),
+ Window win = new ErrorMessageWindow(MSG.view_bundle_deploy_installDetails(),
form);
win.setWidth(500);
win.show();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
index 57be374..00922a8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationListView.java
@@ -45,11 +45,11 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
*/
public class BundleDestinationListView extends Table<BundleDestinationDataSource> {
- public BundleDestinationListView(String locatorId) {
- this(locatorId, null);
+ public BundleDestinationListView() {
+ this(null);
}
- public BundleDestinationListView(String locatorId, Criteria criteria) {
+ public BundleDestinationListView(Criteria criteria) {
super(MSG.view_bundle_bundleDestinations(), criteria);
setHeaderIcon("subsystems/bundle/BundleDestination_24.png");
setDataSource(new BundleDestinationDataSource());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 468830c..ec543ee 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -77,7 +77,7 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
private boolean canManageBundles;
public BundleDestinationView(String locatorId, boolean canManageBundles) {
- super(locatorId);
+ super();
this.canManageBundles = canManageBundles;
setWidth100();
setHeight100();
@@ -91,8 +91,8 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
this.destination = bundleDestination;
this.bundle = bundleDestination.getBundle();
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_bundle_dest_backToBundle()
- + ": " + StringUtility.escapeHtml(bundle.getName()), "Bundles/Bundle/" + bundle.getId());
+ BackButton backButton = new BackButton(MSG.view_bundle_dest_backToBundle() + ": "
+ + StringUtility.escapeHtml(bundle.getName()), "Bundles/Bundle/" + bundle.getId());
HeaderLabel header = new HeaderLabel(Canvas.getImgURL(IconEnum.BUNDLE_DESTINATION.getIcon24x24Path()),
StringUtility.escapeHtml(destination.getName()));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
index d43cce0..f26ff64 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
@@ -82,8 +82,8 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
private Bundle bundle;
private final boolean canManageBundles;
- public BundleView(String locatorId, Set<Permission> perms) {
- super(locatorId);
+ public BundleView(Set<Permission> perms) {
+ super();
this.canManageBundles = (perms != null) ? perms.contains(Permission.MANAGE_BUNDLE) : false;
setWidth100();
setHeight100();
@@ -97,8 +97,7 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
this.bundle = bundle;
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_bundle_list_backToAll(),
- BundleTopView.VIEW_ID.getTitle());
+ BackButton backButton = new BackButton(MSG.view_bundle_list_backToAll(), BundleTopView.VIEW_ID.getTitle());
headerLabel = new HeaderLabel(IconEnum.BUNDLE.getIcon24x24Path(), StringUtility.escapeHtml(bundle.getName()));
tabs = new LocatableTabSet(getLocatorId());
versionsTab = createVersionsTab();
@@ -153,7 +152,7 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
LocatableTab destinationsTab = new LocatableTab(extendLocatorId("Destinations"), MSG.view_bundle_destinations());
Criteria criteria = new Criteria();
criteria.addCriteria("bundleId", bundle.getId());
- destinationsTab.setPane(new BundleDestinationListView(destinationsTab.getLocatorId(), criteria));
+ destinationsTab.setPane(new BundleDestinationListView(criteria));
return destinationsTab;
}
@@ -161,7 +160,7 @@ public class BundleView extends LocatableVLayout implements BookmarkableView {
LocatableTab versionsTab = new LocatableTab(extendLocatorId("Versions"), MSG.view_bundle_versions());
Criteria criteria = new Criteria();
criteria.addCriteria("bundleId", bundleBeingViewed);
- bundleVersionsTable = new BundleVersionListView(versionsTab.getLocatorId(), criteria);
+ bundleVersionsTable = new BundleVersionListView(criteria);
versionsTab.setPane(bundleVersionsTable);
return versionsTab;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
index 927ed21..4452671 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java
@@ -69,11 +69,11 @@ public class BundlesListView extends Table<BundlesWithLatestVersionDataSource> {
* @param locatorId
* @param perms if perms is null, no button actions will be shown in the table
*/
- public BundlesListView(String locatorId, Set<Permission> perms) {
- this(locatorId, null, perms);
+ public BundlesListView(Set<Permission> perms) {
+ this(null, perms);
}
- public BundlesListView(String locatorId, Criteria criteria, Set<Permission> perms) {
+ public BundlesListView(Criteria criteria, Set<Permission> perms) {
super(MSG.view_bundle_bundles(), criteria, IconEnum.BUNDLE.getIcon24x24Path());
this.permissions = perms;
setHeaderIcon(IconEnum.BUNDLE.getIcon24x24Path());
@@ -135,7 +135,7 @@ public class BundlesListView extends Table<BundlesWithLatestVersionDataSource> {
boolean hasAuth = permissions.contains(Permission.MANAGE_BUNDLE);
- addTableAction(extendLocatorId("New"), MSG.common_button_new(), null, new AbstractTableAction(
+ addTableAction(MSG.common_button_new(), null, new AbstractTableAction(
(hasAuth) ? TableActionEnablement.ALWAYS : TableActionEnablement.NEVER) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
new BundleCreateWizard().startWizard();
@@ -184,7 +184,7 @@ public class BundlesListView extends Table<BundlesWithLatestVersionDataSource> {
// can change this back to SINGLE selection when we feel like it. currently allowing the wizard to
// select the bundle.
- addTableAction(extendLocatorId("Deploy"), MSG.view_bundle_deploy(), null, new AbstractTableAction(
+ addTableAction(MSG.view_bundle_deploy(), null, new AbstractTableAction(
(hasAuth) ? TableActionEnablement.ALWAYS : TableActionEnablement.NEVER) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
if (selection.length == 0) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
index 530f77a..242f0ef 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeView.java
@@ -28,6 +28,7 @@ import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.widgets.grid.events.DataArrivedEvent;
import com.smartgwt.client.widgets.grid.events.DataArrivedHandler;
import com.smartgwt.client.widgets.tree.Tree;
+import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
import com.smartgwt.client.widgets.tree.events.NodeClickEvent;
import com.smartgwt.client.widgets.tree.events.NodeClickHandler;
@@ -35,19 +36,18 @@ import com.smartgwt.client.widgets.tree.events.NodeClickHandler;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
/**
* @author Greg Hinkle
*/
-public class BundleTreeView extends LocatableTreeGrid {
+public class BundleTreeView extends TreeGrid {
// We may need to wait for tree data to be fetched before we can complete processing the selected path.
// If so, hold it here and retry after the datasource pulls the data.
private ViewPath pendingPath = null;
- public BundleTreeView(String locatorId, boolean canManageBundles) {
- super(locatorId);
+ public BundleTreeView(boolean canManageBundles) {
+ super();
setWidth100();
setHeight100();
setLeaveScrollbarGap(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
index 0c063df..25e0daf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionListView.java
@@ -41,11 +41,11 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table;
*/
public class BundleVersionListView extends Table<BundleVersionDataSource> {
- public BundleVersionListView(String locatorId) {
- this(locatorId, null);
+ public BundleVersionListView() {
+ this(null);
}
- public BundleVersionListView(String locatorId, Criteria criteria) {
+ public BundleVersionListView(Criteria criteria) {
super(MSG.view_bundle_bundleVersions(), criteria);
setHeaderIcon("subsystems/bundle/BundleVersion_24.png");
setDataSource(new BundleVersionDataSource());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
index 2b09470..38b5e4d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
@@ -74,7 +74,7 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
private boolean canManageBundles = false;
public BundleVersionView(String locatorId, boolean canManageBundles) {
- super(locatorId);
+ super();
this.canManageBundles = canManageBundles;
setWidth100();
setHeight100();
@@ -87,8 +87,8 @@ public class BundleVersionView extends LocatableVLayout implements BookmarkableV
this.version = version;
- addMember(new BackButton(extendLocatorId("BackButton"), MSG.view_bundle_version_backToBundle() + ": "
- + version.getBundle().getName(), LinkManager.getBundleLink(version.getBundle().getId())));
+ addMember(new BackButton(MSG.view_bundle_version_backToBundle() + ": " + version.getBundle().getName(),
+ LinkManager.getBundleLink(version.getBundle().getId())));
addMember(new HeaderLabel(Canvas.getImgURL("subsystems/bundle/BundleVersion_24.png"), version.getName() + ": "
+ version.getVersion()));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java
index 5afe667..f5bf1ff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java
@@ -56,7 +56,7 @@ public class FileListView extends LocatableVLayout {
private int bundleVersionId;
public FileListView(String locatorId, int bundleVersionId) {
- super(locatorId);
+ super();
this.bundleVersionId = bundleVersionId;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java
index ceb8594..f0b44c0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java
@@ -31,8 +31,8 @@ import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -92,7 +92,7 @@ public class AboutModalWindow extends Window {
htmlPane.setHeight(220);
contentPane.addMember(htmlPane);
- LocatableHLayout buttonBar = new LocatableHLayout(contentPane.extendLocatorId("ButtonBar"));
+ EnhancedHLayout buttonBar = new EnhancedHLayout();
buttonBar.setHeight(30);
buttonBar.setAlign(Alignment.RIGHT);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java
index c70c3fb..6eed341 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java
@@ -22,8 +22,7 @@ package org.rhq.enterprise.gui.coregui.client.components;
import com.smartgwt.client.types.VerticalAlignment;
import com.smartgwt.client.widgets.Label;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -35,16 +34,16 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class TitleBar extends LocatableToolStrip {
private Label label;
- public TitleBar(Locatable parent) {
- this(parent, null, null);
+ public TitleBar() {
+ this(null, null);
}
- public TitleBar(Locatable parent, String title) {
- this(parent, title, null);
+ public TitleBar(String title) {
+ this(title, null);
}
- public TitleBar(Locatable parent, String title, String icon) {
- super(parent.extendLocatorId("TitleBar"));
+ public TitleBar(String title, String icon) {
+ super();
setWidth100();
setHeight(30);
@@ -53,7 +52,7 @@ public class TitleBar extends LocatableToolStrip {
vLayout.setAlign(VerticalAlignment.CENTER);
vLayout.setLayoutMargin(6);
- LocatableHLayout hLayout = new LocatableHLayout(vLayout.extendLocatorId("HLayout"));
+ EnhancedHLayout hLayout = new EnhancedHLayout();
vLayout.addMember(hLayout);
this.label = new Label();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java
index aaa6688..efab26d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/buttons/BackButton.java
@@ -22,24 +22,24 @@
*/
package org.rhq.enterprise.gui.coregui.client.components.buttons;
+import com.smartgwt.client.widgets.StretchImgButton;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableStretchImgButton;
/**
* @author Greg Hinkle
*/
-public class BackButton extends LocatableStretchImgButton {
+public class BackButton extends StretchImgButton {
- public BackButton(String locatorId) {
- super(locatorId);
+ public BackButton() {
+ super();
setSrc("buttons/back/back.png");
}
- public BackButton(String locatorId, String title, final String anchor) {
- this(locatorId);
+ public BackButton(String title, final String anchor) {
+ this();
setTitle("<b>" + title + "</b>");
addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java
index d49aa8e..636ae95 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/BookmarkableCarousel.java
@@ -19,7 +19,6 @@
package org.rhq.enterprise.gui.coregui.client.components.carousel;
-import java.util.logging.Logger;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.AnimationEffect;
import com.smartgwt.client.types.VerticalAlignment;
@@ -49,16 +48,16 @@ public abstract class BookmarkableCarousel extends Carousel implements Bookmarka
private Canvas detailsView;
private String basePath;
- public BookmarkableCarousel(String locatorId) {
- super(locatorId);
+ public BookmarkableCarousel() {
+ super();
}
- public BookmarkableCarousel(String locatorId, String titleString) {
- super(locatorId, titleString);
+ public BookmarkableCarousel(String titleString) {
+ super(titleString);
}
- public BookmarkableCarousel(String locatorId, String titleString, Criteria criteria) {
- super(locatorId, titleString, criteria);
+ public BookmarkableCarousel(String titleString, Criteria criteria) {
+ super(titleString, criteria);
}
@Override
@@ -67,7 +66,7 @@ public abstract class BookmarkableCarousel extends Carousel implements Bookmarka
this.initialDisplay = true;
- detailsHolder = new LocatableVLayout(extendLocatorId("carousel"));
+ detailsHolder = new LocatableVLayout();
detailsHolder.setAlign(VerticalAlignment.TOP);
detailsHolder.setMargin(4);
detailsHolder.hide();
@@ -168,10 +167,9 @@ public abstract class BookmarkableCarousel extends Carousel implements Bookmarka
if (!isEditable) {
// Only add the "Back to List" button if the details are definitely not editable, because if they are
// editable, a Cancel button should already be provided by the details view.
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_tableSection_backButton(),
- basePath);
+ BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), basePath);
detailsHolder.addMember(backButton);
- VLayout verticalSpacer = new LocatableVLayout(extendLocatorId("verticalSpacer"));
+ VLayout verticalSpacer = new LocatableVLayout();
verticalSpacer.setHeight(8);
detailsHolder.addMember(verticalSpacer);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java
index 107ca40..0dbea46 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/carousel/Carousel.java
@@ -64,8 +64,8 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.RefreshableView;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedSearchBarItem;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -78,7 +78,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
* @author Jay Shaughnessy
*/
@SuppressWarnings("unchecked")
-public abstract class Carousel extends LocatableHLayout implements RefreshableView {
+public abstract class Carousel extends EnhancedHLayout implements RefreshableView {
private static final String FILTER_CAROUSEL_START = "CarouselStart";
private static final String FILTER_CAROUSEL_SIZE = "CarouselSize";
@@ -96,7 +96,7 @@ public abstract class Carousel extends LocatableHLayout implements RefreshableVi
private CarouselFilter filterForm;
- private LocatableHLayout carouselHolder;
+ private EnhancedHLayout carouselHolder;
private Label carouselInfo;
@@ -130,16 +130,16 @@ public abstract class Carousel extends LocatableHLayout implements RefreshableVi
private Integer carouselSizeFilter = getDefaultCarouselSize();
private boolean carouselUsingFixedWidths = false;
- public Carousel(String locatorId) {
- this(locatorId, null, null);
+ public Carousel() {
+ this(null, null);
}
- public Carousel(String locatorId, String titleString) {
- this(locatorId, titleString, null);
+ public Carousel(String titleString) {
+ this(titleString, null);
}
- public Carousel(String locatorId, String titleString, Criteria criteria) {
- super(locatorId);
+ public Carousel(String titleString, Criteria criteria) {
+ super();
setWidth100();
setHeight100();
@@ -175,7 +175,7 @@ public abstract class Carousel extends LocatableHLayout implements RefreshableVi
protected void onInit() {
super.onInit();
- contents = new LocatableVLayout(extendLocatorId("Contents"));
+ contents = new LocatableVLayout();
contents.setWidth100();
contents.setHeight100();
@@ -198,7 +198,7 @@ public abstract class Carousel extends LocatableHLayout implements RefreshableVi
}
}
- carouselHolder = new LocatableHLayout(extendLocatorId("Holder"));
+ carouselHolder = new EnhancedHLayout();
carouselHolder.setOverflow(Overflow.AUTO);
carouselHolder.setWidth100();
contents.addMember(carouselHolder);
@@ -222,7 +222,7 @@ public abstract class Carousel extends LocatableHLayout implements RefreshableVi
setTitleString(this.titleString);
if (showTitle) {
- titleLayout = new LocatableHLayout(contents.extendLocatorId("Title"));
+ titleLayout = new EnhancedHLayout();
titleLayout.setAutoHeight();
titleLayout.setAlign(VerticalAlignment.BOTTOM);
titleLayout.setMembersMargin(4);
@@ -243,14 +243,14 @@ public abstract class Carousel extends LocatableHLayout implements RefreshableVi
// A second toolstrip that optionally appears before the main footer - it will contain extra widgets.
// This is hidden from view unless extra widgets are actually added to the carousel above the main footer.
- this.footerExtraWidgets = new LocatableToolStrip(contents.extendLocatorId("FooterExtraWidgets"));
+ this.footerExtraWidgets = new LocatableToolStrip();
footerExtraWidgets.setPadding(5);
footerExtraWidgets.setWidth100();
footerExtraWidgets.setMembersMargin(15);
footerExtraWidgets.hide();
contents.addMember(footerExtraWidgets);
- this.footer = new LocatableToolStrip(contents.extendLocatorId("Footer"));
+ this.footer = new LocatableToolStrip();
footer.setPadding(5);
footer.setWidth100();
footer.setMembersMargin(15);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index eac1585..6e8f060 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -127,10 +127,8 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -428,7 +426,7 @@ public class ConfigurationEditor extends LocatableVLayout {
layout.addMember(form);
} else {
// One or more prop groups, so create a section stack with one section per group.
- final SectionStack sectionStack = new LocatableSectionStack(layout.extendLocatorId("Sections"));
+ final SectionStack sectionStack = new SectionStack();
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth100();
sectionStack.setHeight100();
@@ -471,7 +469,7 @@ public class ConfigurationEditor extends LocatableVLayout {
}
private LocatableToolStrip buildToolStrip(LocatableVLayout layout, final SectionStack sectionStack) {
- LocatableToolStrip toolStrip = new LocatableToolStrip(layout.extendLocatorId("Tools"));
+ LocatableToolStrip toolStrip = new LocatableToolStrip();
toolStrip.setBackgroundImage(null);
toolStrip.setWidth100();
toolStrip.setMembersMargin(3);
@@ -779,7 +777,7 @@ public class ConfigurationEditor extends LocatableVLayout {
if (isDynamic && !isReadOnly(propertyDefinitionMap, propertyMap)) {
// Map is not read-only - add footer with New and Delete buttons to allow user to add or remove members.
- LocatableToolStrip buttonBar = new LocatableToolStrip(layout.extendLocatorId("ButtonBar"));
+ LocatableToolStrip buttonBar = new LocatableToolStrip();
buttonBar.setPadding(5);
buttonBar.setMembersMargin(15);
@@ -814,7 +812,7 @@ public class ConfigurationEditor extends LocatableVLayout {
spacer.setWidth(12);
buttonBar.addMember(spacer);
- LocatableHLayout deleteControlsLayout = new LocatableHLayout(buttonBar.extendLocatorId("DeleteControls"));
+ EnhancedHLayout deleteControlsLayout = new EnhancedHLayout();
deleteControlsLayout.setMargin(3);
deleteControlsLayout.setMembersMargin(3);
deleteControlsLayout.setWidth100();
@@ -922,7 +920,7 @@ public class ConfigurationEditor extends LocatableVLayout {
final PropertyDefinitionList propertyDefinitionList, final PropertyList propertyList) {
Log.debug("Building list-of-maps grid for " + propertyList + "...");
- final LocatableListGrid summaryTable = new LocatableListGrid("TODO");
+ final ListGrid summaryTable = new ListGrid();
summaryTable.setAlternateRecordStyles(true);
summaryTable.setShowAllRecords(true);
// [BZ 822173 - Table layout problem on configuration page.]
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java
index fb92d24..faf6e84 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java
@@ -253,7 +253,7 @@ public class GroupConfigurationEditor extends ConfigurationEditor {
// create the header strip - will contain "set all values to" form
LocatableToolStrip headerStrip = null;
if (!propertyIsReadOnly) {
- headerStrip = new LocatableToolStrip(extendLocatorId("headerStrip"));
+ headerStrip = new LocatableToolStrip();
headerStrip.setWidth100();
headerStrip.setPadding(5);
headerStrip.setMembersMargin(10);
@@ -356,7 +356,7 @@ public class GroupConfigurationEditor extends ConfigurationEditor {
layout.addMember(memberValuesGrid);
// create the footer strip - will contain ok and cancel buttons
- LocatableToolStrip footerStrip = new LocatableToolStrip(extendLocatorId("footerStrip"));
+ LocatableToolStrip footerStrip = new LocatableToolStrip();
footerStrip.setWidth100();
footerStrip.setPadding(5);
footerStrip.setMembersMargin(10);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
index e71f06e..51aa001 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
@@ -49,8 +49,8 @@ import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
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.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
@@ -81,8 +81,8 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc
private LocatableVLayout contentPane;
private boolean postFetchHandlerExecutedAlready;
- public AbstractRecordEditor(String locatorId, DS dataSource, int recordId, String dataTypeName, String headerIcon) {
- super(locatorId);
+ public AbstractRecordEditor(DS dataSource, int recordId, String dataTypeName, String headerIcon) {
+ super();
this.dataSource = dataSource;
this.recordId = recordId;
this.dataTypeName = capitalize(dataTypeName);
@@ -94,7 +94,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc
addMember(LOADING_LABEL);
// Add title bar. We'll set the actual title later.
- this.titleBar = new TitleBar(this, null, headerIcon);
+ this.titleBar = new TitleBar(null, headerIcon);
this.titleBar.hide();
addMember(this.titleBar);
}
@@ -445,7 +445,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc
private IButton cancelButton;
ButtonBar() {
- super(AbstractRecordEditor.this.extendLocatorId("ButtonBar"));
+ super();
setWidth100();
setHeight(35);
@@ -454,7 +454,7 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc
vLayout.setAlign(VerticalAlignment.CENTER);
vLayout.setLayoutMargin(4);
- LocatableHLayout hLayout = new LocatableHLayout(vLayout.extendLocatorId("HLayout"));
+ EnhancedHLayout hLayout = new EnhancedHLayout();
hLayout.setMembersMargin(10);
vLayout.addMember(hLayout);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java
index bc4da30..184f147 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/AbstractMeasurementRangeEditor.java
@@ -93,7 +93,7 @@ public abstract class AbstractMeasurementRangeEditor extends DynamicForm impleme
lastValues = new String[] { "4", "8", "12", "24", "30", "36", "48", "60", "90", "120" };
}
- public AbstractMeasurementRangeEditor(String locatorId) {
+ public AbstractMeasurementRangeEditor() {
super();
setNumCols(10);
setWrapItemTitles(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java
index f349f5d..a6cadd8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/CustomConfigMeasurementRangeEditor.java
@@ -41,8 +41,8 @@ public class CustomConfigMeasurementRangeEditor extends AbstractMeasurementRange
private ConfigurationMeasurementPreferences measurementPrefs;
- public CustomConfigMeasurementRangeEditor(String locatorId, Configuration config) {
- super(locatorId);
+ public CustomConfigMeasurementRangeEditor(Configuration config) {
+ super();
measurementPrefs = new ConfigurationMeasurementPreferences(config);
setDisplaySetButton(false);
setDisplayEnableButton(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java
index 02733e8..f13b1d8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/UserPreferencesMeasurementRangeEditor.java
@@ -28,8 +28,8 @@ public class UserPreferencesMeasurementRangeEditor extends AbstractMeasurementRa
private MeasurementUserPreferences measurementUserPrefs;
- public UserPreferencesMeasurementRangeEditor(String locatorId) {
- super(locatorId);
+ public UserPreferencesMeasurementRangeEditor() {
+ super();
measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
index 8793faf..6f3e9f8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
@@ -65,8 +65,6 @@ import com.smartgwt.client.widgets.layout.VStack;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTransferImgButton;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack;
@@ -89,8 +87,8 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria
protected List<Record> availableRecords;
protected DynamicForm availableFilterForm;
protected HLayout hlayout;
- protected LocatableListGrid availableGrid;
- protected LocatableListGrid assignedGrid;
+ protected ListGrid availableGrid;
+ protected ListGrid assignedGrid;
protected RPCDataSource<T, C> datasource;
private Set<AssignedItemsChangedHandler> assignedItemsChangedHandlers = new HashSet<AssignedItemsChangedHandler>();
@@ -118,12 +116,12 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria
setMargin(7);
this.hlayout = new HLayout();
- this.assignedGrid = new LocatableListGrid(extendLocatorId("assignedGrid"));
+ this.assignedGrid = new ListGrid();
if (this.isReadOnly) {
this.assignedGrid.setSelectionType(SelectionStyle.NONE);
} else {
- this.availableGrid = new LocatableListGrid(extendLocatorId("availableGrid"));
+ this.availableGrid = new ListGrid();
}
}
@@ -254,7 +252,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria
}
private SectionStack buildAvailableItemsStack() {
- SectionStack availableSectionStack = new LocatableSectionStack(extendLocatorId("Available"));
+ SectionStack availableSectionStack = new SectionStack();
availableSectionStack.setWidth("*");
availableSectionStack.setHeight100();
@@ -441,7 +439,7 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria
}
private SectionStack buildAssignedItemsStack() {
- SectionStack assignedSectionStack = new LocatableSectionStack(extendLocatorId("Assigned"));
+ SectionStack assignedSectionStack = new SectionStack();
assignedSectionStack.setWidth("*");
assignedSectionStack.setHeight100();
assignedSectionStack.setAlign(Alignment.LEFT);
@@ -610,12 +608,12 @@ public abstract class AbstractSelector<T, C extends org.rhq.core.domain.criteria
}
@Deprecated
- public LocatableListGrid getAvailableGrid() {
+ public ListGrid getAvailableGrid() {
return availableGrid;
}
@Deprecated
- public LocatableListGrid getAssignedGrid() {
+ public ListGrid getAssignedGrid() {
return assignedGrid;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java
index 134f8f4..f405d27 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java
@@ -27,6 +27,7 @@ import com.google.gwt.event.shared.HandlerRegistration;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.types.SelectionStyle;
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.RecordDropEvent;
@@ -35,7 +36,6 @@ import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.SectionStack;
import com.smartgwt.client.widgets.layout.SectionStackSection;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -45,7 +45,7 @@ public class ReorderableList extends LocatableVLayout {
protected ListGridRecord[] initialSelection;
protected HLayout hlayout;
- protected LocatableListGrid listGrid;
+ protected ListGrid listGrid;
/** an icon displayed next to each item in the list grids, or null if no icon should be displayed */
private String itemIcon;
/** the item title (i.e. display name), which should be plural and capitalized, e.g. "Resource Groups", "Roles". */
@@ -69,7 +69,7 @@ public class ReorderableList extends LocatableVLayout {
public ReorderableList(String locatorId, boolean isReadOnly, ListGridRecord[] records, String itemTitle,
String itemIcon, HoverCustomizer nameHoverCustomizer) {
- super(locatorId);
+ super();
this.isReadOnly = isReadOnly;
@@ -77,7 +77,7 @@ public class ReorderableList extends LocatableVLayout {
setMargin(7);
this.hlayout = new HLayout();
- this.listGrid = new LocatableListGrid(extendLocatorId("listGrid"));
+ this.listGrid = new ListGrid();
this.initialSelection = records;
this.listGrid.setRecords(records);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
index 50b6348..c828ca9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
@@ -11,8 +11,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
*/
public class NamedTabSet extends LocatableTabSet {
- public NamedTabSet(String locatorId) {
- super(locatorId);
+ public NamedTabSet() {
+ super();
}
public void setTabs(NamedTab... tabs) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
index c46337f..a9c5ef7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
@@ -162,7 +162,6 @@ public class SubTab implements Locatable {
destroyButton();
}
- @Override
public String extendLocatorId(String extension) {
return this.locatorId + "_" + extension;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
index 43ddc03..c7cd05e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
@@ -56,8 +56,8 @@ public class SubTabLayout extends LocatableVLayout {
private SubTab tail;
- public SubTabLayout(String locatorId) {
- super(locatorId);
+ public SubTabLayout() {
+ super();
setOverflow(Overflow.AUTO);
}
@@ -70,7 +70,7 @@ public class SubTabLayout extends LocatableVLayout {
setMargin(0);
setPadding(0);
- buttonBar = new LocatableToolStrip(extendLocatorId("ButtonBar"));
+ buttonBar = new LocatableToolStrip();
buttonBar.setBackgroundColor("grey");
buttonBar.setWidth100();
buttonBar.setBorder(null);
@@ -223,8 +223,8 @@ public class SubTabLayout extends LocatableVLayout {
}
private void buildSubTabList(SubTab[] tabs) {
-// head = tabs[0];
-// tail = tabs[tabs.length - 1];
+ // head = tabs[0];
+ // tail = tabs[tabs.length - 1];
SubTab current = tabs[0];
for (int i = 1; i < tabs.length; ++i) {
current.setActualNext(tabs[i]);
@@ -233,12 +233,11 @@ public class SubTabLayout extends LocatableVLayout {
}
}
-
-// public void registerSubTab(SubTab subTab) {
-// String locatorId = subTab.getLocatorId();
-//
-// subTabs.put(locatorId, subTab);
-// }
+ // public void registerSubTab(SubTab subTab) {
+ // String locatorId = subTab.getLocatorId();
+ //
+ // subTabs.put(locatorId, subTab);
+ // }
/**
* Walks the list of visible tabs to find the closest, visible predecessor. Because it
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
index 020dc92..922ec35 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.components.tab;
import com.smartgwt.client.widgets.Canvas;
+
import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
@@ -43,13 +44,13 @@ public class TwoLevelTab extends NamedTab {
public TwoLevelTab(String locatorId, ViewName viewName, String icon) {
super(locatorId, viewName, icon);
- layout = new SubTabLayout(locatorId);
+ layout = new SubTabLayout();
}
public TwoLevelTab(String locatorId, ViewName viewName, IconEnum iconEnum) {
super(locatorId, viewName, iconEnum.getIcon16x16DisabledPath());
- layout = new SubTabLayout(locatorId);
+ layout = new SubTabLayout();
}
public void registerSubTabs(SubTab... subTabs) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
index 573c543..9cd0ca7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
@@ -18,6 +18,9 @@
*/
package org.rhq.enterprise.gui.coregui.client.components.tab;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import com.google.gwt.event.shared.HandlerManager;
import com.google.gwt.event.shared.HandlerRegistration;
import com.google.gwt.user.client.History;
@@ -25,9 +28,6 @@ import com.smartgwt.client.widgets.tab.Tab;
import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
/**
* A tab set where each {@link TwoLevelTab tab} has one or more {@link SubTab subtab}s.
*
@@ -37,9 +37,9 @@ import java.util.Map;
public class TwoLevelTabSet extends NamedTabSet implements TabSelectedHandler, TwoLevelTabSelectedHandler {
private Map<String, TwoLevelTab> hiddenTabs = new LinkedHashMap<String, TwoLevelTab>();
-
+
private boolean ignoreSelectEvents = false;
-
+
private TwoLevelTab head;
/**
@@ -48,8 +48,8 @@ public class TwoLevelTabSet extends NamedTabSet implements TabSelectedHandler, T
*/
private TwoLevelTab tail;
- public TwoLevelTabSet(String locatorId) {
- super(locatorId);
+ public TwoLevelTabSet() {
+ super();
// Need to set destroyPanes property to false so that we do not lose tab
// content when hiding a tab.
setDestroyPanes(false);
@@ -61,7 +61,7 @@ public class TwoLevelTabSet extends NamedTabSet implements TabSelectedHandler, T
tab.getLayout().addTwoLevelTabSelectedHandler(this);
updateTab(tab, tab.getPane());
}
- buildTabList();
+ buildTabList();
addTabSelectedHandler(this);
}
@@ -76,7 +76,7 @@ public class TwoLevelTabSet extends NamedTabSet implements TabSelectedHandler, T
TwoLevelTab[] tabs = getTabs();
head = tabs[0];
tail = tabs[tabs.length - 1];
- TwoLevelTab current = head;
+ TwoLevelTab current = head;
for (int i = 1; i < tabs.length; ++i) {
current.setActualNext(tabs[i]);
current.setVisibleNext(tabs[i]);
@@ -126,7 +126,7 @@ public class TwoLevelTabSet extends NamedTabSet implements TabSelectedHandler, T
tab.setVisibleNext(null);
// Note that removing the tab does *not* destroy its content pane
// since we set the destroyPanes property to false in the
- removeTab(tab);
+ removeTab(tab);
hiddenTabs.put(tab.getLocatorId(), tab);
} else {
if (!hiddenTabs.containsKey(tab.getLocatorId())) {
@@ -159,7 +159,7 @@ public class TwoLevelTabSet extends NamedTabSet implements TabSelectedHandler, T
if (tab == head) {
return null;
}
-
+
TwoLevelTab current = head;
while (current != tab) {
// if we have reached the visible tail or the immediate predecessor
@@ -193,7 +193,7 @@ public class TwoLevelTabSet extends NamedTabSet implements TabSelectedHandler, T
// if we reach this point then that means we will be inserting at the tail
return null;
}
-
+
public void destroyViews() {
for (TwoLevelTab tab : getTabs()) {
tab.getLayout().destroyViews();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
index 57d96e1..9735e2b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
@@ -109,7 +109,7 @@ public abstract class AbstractTableSection<DS extends RPCDataSource, ID> extends
this.initialDisplay = true;
- detailsHolder = new LocatableVLayout(extendLocatorId("tableSection"));
+ detailsHolder = new LocatableVLayout();
detailsHolder.setAlign(VerticalAlignment.TOP);
//detailsHolder.setWidth100();
//detailsHolder.setHeight100();
@@ -386,10 +386,9 @@ public abstract class AbstractTableSection<DS extends RPCDataSource, ID> extends
if (!isEditable) {
// Only add the "Back to List" button if the details are definitely not editable, because if they are
// editable, a Cancel button should already be provided by the details view.
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_tableSection_backButton(),
- basePath);
+ BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), basePath);
detailsHolder.addMember(backButton);
- VLayout verticalSpacer = new LocatableVLayout(extendLocatorId("verticalSpacer"));
+ VLayout verticalSpacer = new LocatableVLayout();
verticalSpacer.setHeight(8);
detailsHolder.addMember(verticalSpacer);
}
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 0579973..0df8621 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
@@ -83,9 +83,8 @@ 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.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -103,7 +102,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
* @author Ian Springer
*/
@SuppressWarnings("rawtypes")
-public class Table<DS extends RPCDataSource> extends LocatableHLayout implements RefreshableView, InitializableView {
+public class Table<DS extends RPCDataSource> extends EnhancedHLayout implements RefreshableView, InitializableView {
private static final int DATA_PAGE_SIZE = 50;
@@ -248,7 +247,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
*/
protected LocatableVLayout createTableContents() {
if (null == contents) {
- contents = new LocatableVLayout(extendLocatorId("Contents"));
+ contents = new LocatableVLayout();
}
return contents;
@@ -314,7 +313,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
}
}
- listGrid = createListGrid(contents.extendLocatorId("ListGrid"));
+ listGrid = createListGrid();
configureListGrid(listGrid);
listGrid.setAutoFetchData(autoFetchData);
@@ -439,14 +438,14 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
// A second toolstrip that optionally appears before the main footer - it will contain extra widgets.
// This is hidden from view unless extra widgets are actually added to the table above the main footer.
- this.footerExtraWidgets = new LocatableToolStrip(contents.extendLocatorId("FooterExtraWidgets"));
+ this.footerExtraWidgets = new LocatableToolStrip();
footerExtraWidgets.setPadding(5);
footerExtraWidgets.setWidth100();
footerExtraWidgets.setMembersMargin(15);
footerExtraWidgets.hide();
contents.addMember(footerExtraWidgets);
- this.footer = new LocatableToolStrip(contents.extendLocatorId("Footer"));
+ this.footer = new LocatableToolStrip();
footer.setPadding(5);
footer.setWidth100();
footer.setMembersMargin(15);
@@ -540,7 +539,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
private void drawHeader() {
// just use the first icon (not sure use case for multiple icons in title)
- titleBar = new TitleBar(titleLayout, titleString);
+ titleBar = new TitleBar(titleString);
if (titleIcon != null) {
titleBar.setIcon(titleIcon);
}
@@ -851,14 +850,12 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
/**
* Creates this Table's list grid (called by onInit()). Subclasses can override this if they require a custom
- * subclass of LocatableListGrid.
+ * subclass of ListGrid.
*
- * @param locatorId the locatorId that should be set on the returned LocatableListGrid
- *
- * @return this Table's list grid (must be an instance of LocatableListGrid)
+ * @return this Table's list grid (must be an instance of ListGrid)
*/
- protected LocatableListGrid createListGrid(String locatorId) {
- return new LocatableListGrid(locatorId);
+ protected ListGrid createListGrid() {
+ return new ListGrid();
}
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
index 76ab79d..e626457 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tagging/TagEditorView.java
@@ -32,6 +32,7 @@ import com.google.gwt.event.dom.client.KeyCodes;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.TextMatchStyle;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.Dialog;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.events.ClickEvent;
@@ -53,9 +54,7 @@ import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDialog;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableImg;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLayout;
/**
@@ -71,7 +70,7 @@ public class TagEditorView extends LocatableLayout {
private boolean readOnly;
private TagsChangedCallback callback;
private HTMLFlow tagTitleLabel;
- private ArrayList<LocatableHLayout> tagLayouts;
+ private ArrayList<EnhancedHLayout> tagLayouts;
private Img addImg;
private TagInputDialog tagInputDialog;
@@ -82,7 +81,7 @@ public class TagEditorView extends LocatableLayout {
public TagEditorView(String locatorId, Set<Tag> tags, boolean readOnly, TagsChangedCallback callback,
boolean vertical) {
- super(locatorId);
+ super();
setVertical(vertical);
setAutoWidth();
@@ -101,9 +100,9 @@ public class TagEditorView extends LocatableLayout {
tagTitleLabel.setAutoWidth();
if (!this.readOnly) {
- tagInputDialog = new TagInputDialog(extendLocatorId("tagInputDialog"));
+ tagInputDialog = new TagInputDialog();
- addImg = new LocatableImg(extendLocatorId("addImg"), "[skin]/images/actions/add.png", 16, 16);
+ addImg = new Img("[skin]/images/actions/add.png", 16, 16);
addImg.setTooltip(MSG.view_tags_tooltip_2());
addImg.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
@@ -134,7 +133,7 @@ public class TagEditorView extends LocatableLayout {
private void setup() {
// destroy dated tagLayouts
if (tagLayouts != null) {
- for (LocatableHLayout tagLayout : tagLayouts) {
+ for (EnhancedHLayout tagLayout : tagLayouts) {
removeMember(tagLayout);
tagLayout.destroy();
}
@@ -149,7 +148,7 @@ public class TagEditorView extends LocatableLayout {
addMember(tagTitleLabel);
tagLayouts = createTagLayouts();
- for (LocatableHLayout tagLayout : tagLayouts) {
+ for (EnhancedHLayout tagLayout : tagLayouts) {
addMember(tagLayout);
}
@@ -161,11 +160,11 @@ public class TagEditorView extends LocatableLayout {
markForRedraw();
}
- private ArrayList<LocatableHLayout> createTagLayouts() {
- ArrayList<LocatableHLayout> tagLayouts = new ArrayList<LocatableHLayout>(tags.size());
+ private ArrayList<EnhancedHLayout> createTagLayouts() {
+ ArrayList<EnhancedHLayout> tagLayouts = new ArrayList<EnhancedHLayout>(tags.size());
for (final Tag tag : tags) {
- LocatableHLayout tagLayout = new LocatableHLayout(extendLocatorId(tag.getName()));
+ EnhancedHLayout tagLayout = new EnhancedHLayout();
tagLayout.setHeight(18);
tagLayout.setHeight(16);
@@ -179,8 +178,7 @@ public class TagEditorView extends LocatableLayout {
spacer.setHeight(16);
spacer.setWidth(16);
- final Img remove = new LocatableImg(tagLayout.extendLocatorId("Remove"),
- "[skin]/images/actions/remove.png", 16, 16);
+ final Img remove = new Img("[skin]/images/actions/remove.png", 16, 16);
remove.setTooltip(MSG.view_tags_tooltip_1());
remove.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
@@ -243,11 +241,11 @@ public class TagEditorView extends LocatableLayout {
TagEditorView.this.setup();
}
- private class TagInputDialog extends LocatableDialog {
+ private class TagInputDialog extends Dialog {
private ComboBoxItem tagInputItem;
- public TagInputDialog(String locatorId) {
- super(locatorId);
+ public TagInputDialog() {
+ super();
setIsModal(true);
setShowHeader(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
index c3de106..e613674 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
@@ -96,7 +96,7 @@ public class JobTriggerEditor extends LocatableVLayout {
* @param locatorId
*/
public JobTriggerEditor(String locatorId, boolean isReadOnly) {
- super(locatorId);
+ super();
this.isReadOnly = isReadOnly;
}
@@ -108,7 +108,7 @@ public class JobTriggerEditor extends LocatableVLayout {
* @param jobTrigger
*/
public JobTriggerEditor(String locatorId, JobTrigger jobTrigger) {
- super(locatorId);
+ super();
this.jobTrigger = jobTrigger;
this.isReadOnly = true;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java
index 29dd9ce..a623f54 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/view/AbstractSectionedLeftNavigationView.java
@@ -48,9 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import org.rhq.enterprise.gui.coregui.client.components.tree.EnhancedTreeNode;
import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -61,7 +59,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Ian Springer
* @author Jay Shaughnessy
*/
-public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayout implements BookmarkableView,
+public abstract class AbstractSectionedLeftNavigationView extends EnhancedHLayout implements BookmarkableView,
InitializableView {
private String viewId;
@@ -80,7 +78,7 @@ public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayo
private Set<Permission> globalPermissions = EnumSet.noneOf(Permission.class);
public AbstractSectionedLeftNavigationView(String viewId) {
- super(viewId);
+ super();
this.viewId = viewId;
}
@@ -95,7 +93,7 @@ public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayo
contentCanvas.setWidth("*");
contentCanvas.setHeight100();
- sectionStack = new LocatableSectionStack(this.getLocatorId());
+ sectionStack = new SectionStack();
sectionStack.setShowResizeBar(true);
sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE);
sectionStack.setWidth(250);
@@ -133,7 +131,7 @@ public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayo
protected abstract List<NavigationSection> getNavigationSections();
private TreeGrid buildTreeGridForSection(NavigationSection navigationSection) {
- final TreeGrid treeGrid = new LocatableTreeGrid(navigationSection.getName());
+ final TreeGrid treeGrid = new TreeGrid();
treeGrid.setLeaveScrollbarGap(false);
treeGrid.setShowHeader(false);
treeGrid.setSelectionType(SelectionStyle.SINGLE);
@@ -297,12 +295,12 @@ public abstract class AbstractSectionedLeftNavigationView extends LocatableHLayo
}
private LocatableVLayout decorateWithTitleBar(ViewName viewName, Canvas pageBody){
- LocatableVLayout vLayout = new LocatableVLayout(extendLocatorId(viewName.getName()));
+ LocatableVLayout vLayout = new LocatableVLayout();
vLayout.setWidth100();
vLayout.setHeight100();
// default to 24x24 otherwise use 16x16
String iconPath = (viewName.getIcon().getIcon24x24Path() != null) ? viewName.getIcon().getIcon24x24Path() : viewName.getIcon().getIcon16x16Path();
- vLayout.addMember( new TitleBar(vLayout,viewName.getTitle(), iconPath));
+ vLayout.addMember(new TitleBar(viewName.getTitle(), iconPath));
vLayout.addMember(pageBody);
return vLayout;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
index 7fd7a13..a89873d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
@@ -40,7 +40,6 @@ import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHTMLFlow;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -123,7 +122,7 @@ public class WizardView extends LocatableVLayout {
messageBar.setHeight(20);
messageBar.setPadding(2);
messageBar.setBackgroundColor("#F0F0F0");
- messageLabel = new LocatableHTMLFlow(extendLocatorId("Message"));
+ messageLabel = new HTMLFlow();
messageLabel.setWidth("*");
messageLabel.setLeft(20);
messageBar.addMember(messageLabel);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java
index ffaf0e3..1a0aecc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/content/repository/tree/ContentRepositoryTreeView.java
@@ -25,6 +25,7 @@ package org.rhq.enterprise.gui.coregui.client.content.repository.tree;
import com.google.gwt.core.client.GWT;
import com.google.gwt.core.client.RunAsyncCallback;
import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
import com.smartgwt.client.widgets.tree.events.NodeClickEvent;
import com.smartgwt.client.widgets.tree.events.NodeClickHandler;
@@ -32,15 +33,14 @@ import com.smartgwt.client.widgets.tree.events.NodeClickHandler;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
/**
* @author Greg Hinkle
*/
-public class ContentRepositoryTreeView extends LocatableTreeGrid {
+public class ContentRepositoryTreeView extends TreeGrid {
- public ContentRepositoryTreeView(String locatorId) {
- super(locatorId);
+ public ContentRepositoryTreeView() {
+ super();
setWidth100();
setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
index df7310a..f0693d6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
@@ -143,7 +143,7 @@ public class DashboardView extends LocatableVLayout {
public DashboardView(String locatorId, DashboardContainer dashboardContainer, Dashboard storedDashboard,
EntityContext context, Object composite) {
- super(locatorId);
+ super();
this.dashboardContainer = dashboardContainer;
this.storedDashboard = storedDashboard;
@@ -547,9 +547,8 @@ public class DashboardView extends LocatableVLayout {
private void loadPortletWindows() {
for (int i = 0; i < storedDashboard.getColumns(); i++) {
for (DashboardPortlet storedPortlet : storedDashboard.getPortlets(i)) {
- String locatorId = getPortletLocatorId(portalLayout, storedPortlet);
- PortletWindow portletWindow = new PortletWindow(locatorId, this, storedPortlet, context);
+ PortletWindow portletWindow = new PortletWindow(this, storedPortlet, context);
portletWindow.setTitle(storedPortlet.getName());
portletWindow.setHeight(storedPortlet.getHeight());
portletWindow.setVisible(true);
@@ -560,38 +559,11 @@ public class DashboardView extends LocatableVLayout {
}
}
- /**
- * LocatorIds need to be repeatable and non-duplicated. The natural key for a portlet is the Id but the Id
- * is not a good locatorId as it may change (it's a sequence generated id) on subsequent test runs. A portlet has
- * an internal identifier (portletKey) and a name, but the key-name tuple is not guaranteed to be unique as
- * multiple instances of the same portlet type may be present on the same, or across multiple dashboards. There
- * is one tuple that is guaranteed unique and useful for a repeatable locator Id: DashBoard-Position. This
- * means that the on a single dashboard each portlet has a unique column-columnIndex pair. Although portlets
- * can move, and the positions can change at runtime, it's still valid for a locatorId because it is
- * unique and repeatable for test purposes. We also add the portletKey for an easier visual cue.
- * The portalLayout's locatorId already incorporates the dashboardName, so we need only extend it with the
- * positioning information.
- *
- * @param portalLayout
- * @param dashboardPortlet
- * @return The locatorId for the portlet. Form PortleyKey_DashboardId_Column_ColumnIndex
- */
- private String getPortletLocatorId(PortalLayout portalLayout, DashboardPortlet dashboardPortlet) {
- StringBuilder locatorId = new StringBuilder(dashboardPortlet.getPortletKey());
- locatorId.append("_");
- locatorId.append(dashboardPortlet.getColumn());
- locatorId.append("_");
- locatorId.append(dashboardPortlet.getIndex());
-
- return portalLayout.extendLocatorId(locatorId.toString());
- }
-
protected void addPortlet(String portletKey, String portletName) {
DashboardPortlet storedPortlet = new DashboardPortlet(portletName, portletKey, 250);
storedDashboard.addPortlet(storedPortlet);
- String locatorId = getPortletLocatorId(portalLayout, storedPortlet);
- final PortletWindow newPortletWindow = new PortletWindow(locatorId, this, storedPortlet, context);
+ final PortletWindow newPortletWindow = new PortletWindow(this, storedPortlet, context);
newPortletWindow.setTitle(portletName);
newPortletWindow.setHeight(350);
newPortletWindow.setVisible(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
index f384a3e..3ac6274 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java
@@ -108,8 +108,8 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain
private boolean initialized = false;
- public DashboardsView(String locatorId) {
- super(locatorId);
+ public DashboardsView() {
+ super();
setOverflow(Overflow.AUTO);
setPadding(5);
setWidth100();
@@ -178,7 +178,7 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain
this.dashboardsByName.put(dashboard.getName(), dashboard);
}
- tabSet = new NamedTabSet(getLocatorId());
+ tabSet = new NamedTabSet();
tabSet.setWidth100();
tabSet.setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
index d2ef13c..3da3145 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
@@ -37,14 +37,14 @@ import com.smartgwt.client.widgets.events.ResizedHandler;
import org.rhq.core.domain.dashboard.Dashboard;
import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
* @author Jay Shaughnessy
*/
-public class PortalLayout extends LocatableHLayout {
+public class PortalLayout extends EnhancedHLayout {
private DashboardView dashboardView;
private Integer dragResizeColumnCount;
@@ -57,7 +57,7 @@ public class PortalLayout extends LocatableHLayout {
* evenly. If null column 0 defaults to 30%.
*/
public PortalLayout(String locatorId, DashboardView dashboardView, int numColumns, String[] columnWidths) {
- super(locatorId);
+ super();
if (numColumns < 1) {
throw new IllegalArgumentException("Invalid number of columns [" + numColumns + "]");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
index ecf11e8..cbddfd5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
@@ -122,8 +122,7 @@ public class PortletWindow extends Window {
}
});
- public PortletWindow(String locatorId, DashboardView dashboardView, DashboardPortlet dashboardPortlet,
- EntityContext context) {
+ public PortletWindow(DashboardView dashboardView, DashboardPortlet dashboardPortlet, EntityContext context) {
super();
this.dashboardView = dashboardView;
@@ -137,8 +136,7 @@ public class PortletWindow extends Window {
// setShowEdges(false);
//configure HeaderControls with toolTips
- HeaderControl RssHeader = new HeaderControl(new HeaderIcon(
- "[SKIN]/headerIcons/clipboard.png"), rssHandler);
+ HeaderControl RssHeader = new HeaderControl(new HeaderIcon("[SKIN]/headerIcons/clipboard.png"), rssHandler);
RssHeader.setTooltip(RSS);
//detect customized Header icon
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java
index 2223717..1301923 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java
@@ -213,7 +213,7 @@ public class PortletConfigurationEditorComponent {
* @return
*/
public static CustomConfigMeasurementRangeEditor getMeasurementRangeEditor(Configuration portletConfig) {
- return new CustomConfigMeasurementRangeEditor("timeFrame", portletConfig);
+ return new CustomConfigMeasurementRangeEditor(portletConfig);
}
public static SelectItem getOperationStatusEditor(Configuration portletConfig) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
index 9f443c6..a38d807 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/inventory/queue/AutodiscoveryPortlet.java
@@ -40,7 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.AutodiscoveryQueueDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.ResourceAutodiscoveryView;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
/**
* @author Simeon Pinder
@@ -122,7 +122,7 @@ public class AutodiscoveryPortlet extends ResourceAutodiscoveryView implements C
final DashboardPortlet storedPortlet = portletWindow.getStoredPortlet();
//horizontal display component
- LocatableHLayout row = new LocatableHLayout(extendLocatorId("auto-discovery.configuration"));
+ EnhancedHLayout row = new EnhancedHLayout();
//-------------combobox for number of platforms to display on the dashboard
final SelectItem maximumPlatformsComboBox = new SelectItem(AUTODISCOVERY_PLATFORM_MAX);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
index 666c2dc..8c707b1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java
@@ -25,6 +25,7 @@ import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.grid.CellFormatter;
+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.layout.HLayout;
@@ -47,7 +48,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
+
public class PlatformSummaryPortlet extends Table<PlatformMetricDataSource> implements Portlet, HasViewName {
@@ -131,8 +132,8 @@ public class PlatformSummaryPortlet extends Table<PlatformMetricDataSource> impl
}
@Override
- protected LocatableListGrid createListGrid(String locatorId) {
- return new LocatableListGrid(locatorId) {
+ protected ListGrid createListGrid() {
+ return new ListGrid() {
{
setShowRecordComponents(true);
setShowRecordComponentsByCell(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
index 4e80698..77cfb60 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
@@ -32,6 +32,7 @@ import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import com.smartgwt.client.widgets.grid.CellFormatter;
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.layout.VStack;
@@ -53,8 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.operation.ScheduledOperationsDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -84,7 +84,7 @@ public class OperationSchedulePortlet extends LocatableVLayout implements Custom
private PortletWindow portletWindow;
//ListGrids for operations
- private LocatableListGrid scheduledOperationsGrid = null;
+ private ListGrid scheduledOperationsGrid = null;
private ScheduledOperationsDataSource dataSourceScheduled;
public static String unlimited = "-1";
@@ -94,13 +94,8 @@ public class OperationSchedulePortlet extends LocatableVLayout implements Custom
private Timer refreshTimer;
- //default no-args constructor for serialization.
- private OperationSchedulePortlet() {
- super("(uninitialized)");
- }
-
- public OperationSchedulePortlet(String locatorId) {
- super(locatorId);
+ public OperationSchedulePortlet() {
+ super();
this.dataSourceScheduled = new ScheduledOperationsDataSource(this);
}
@@ -108,7 +103,7 @@ public class OperationSchedulePortlet extends LocatableVLayout implements Custom
protected void onInit() {
super.onInit();
- this.scheduledOperationsGrid = new LocatableListGrid(extendLocatorId("Scheduled"));
+ this.scheduledOperationsGrid = new ListGrid();
scheduledOperationsGrid.setDataSource(getDataSourceScheduled());
scheduledOperationsGrid.setAutoFetchData(true);
scheduledOperationsGrid.setWidth100();
@@ -259,7 +254,7 @@ public class OperationSchedulePortlet extends LocatableVLayout implements Custom
VStack column = new VStack();
//horizontal layout
- LocatableHLayout sheduledOperationsLayout = new LocatableHLayout(extendLocatorId("EnableScheduledOperations"));
+ EnhancedHLayout sheduledOperationsLayout = new EnhancedHLayout();
final CheckboxItem enableScheduledOperationsGrouping = new CheckboxItem();
enableScheduledOperationsGrouping.setName(OPERATIONS_RANGE_SCHEDULED_ENABLED);
@@ -378,7 +373,7 @@ public class OperationSchedulePortlet extends LocatableVLayout implements Custom
return this.dataSourceScheduled;
}
- public LocatableListGrid getScheduledOperationsGrid() {
+ public ListGrid getScheduledOperationsGrid() {
return this.scheduledOperationsGrid;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
index 75a0b34..bcf2370 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
@@ -31,6 +31,7 @@ import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
@@ -60,8 +61,7 @@ import org.rhq.enterprise.gui.coregui.client.dashboard.PortletWindow;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.resource.ProblemResourcesDataSource;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
@@ -119,7 +119,7 @@ public class ProblemResourcesPortlet extends Table<ProblemResourcesDataSource> i
protected void configureTable() {
ListGrid listGrid = getListGrid();
if (listGrid != null) {
- addExtraWidget(new TimeRange(extendLocatorId("TimeRange"), this), false);
+ addExtraWidget(new TimeRange(this), false);
}
ListGridField resourceField = new ListGridField(RESOURCE.propertyName(), RESOURCE.title());
@@ -364,12 +364,12 @@ public class ProblemResourcesPortlet extends Table<ProblemResourcesDataSource> i
*
* @author spinder
*/
-class TimeRange extends LocatableHLayout implements TableWidget {
- private LocatableLabel label = new LocatableLabel(extendLocatorId("timeRange"));
+class TimeRange extends EnhancedHLayout implements TableWidget {
+ private Label label = new Label();
private ProblemResourcesPortlet portlet = null;
- public TimeRange(String locatorId, ProblemResourcesPortlet problemResourcesPortlet) {
- super(locatorId);
+ public TimeRange(ProblemResourcesPortlet problemResourcesPortlet) {
+ super();
this.portlet = problemResourcesPortlet;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
index dcbdab2..dfb4a0b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
@@ -120,11 +120,11 @@ public class ResourceConfigurationUpdatesPortlet extends GroupConfigurationUpdat
criteria.addSortStatus(PageOrdering.DESC);
criteria.addFilterResourceIds(resourceId);
- resourceHistoryTable = new ResourceConfigurationHistoryCriteriaView(extendLocatorId("Table"),
- resourceComposite.getResourcePermission().isConfigureWrite(), resourceId);
+ resourceHistoryTable = new ResourceConfigurationHistoryCriteriaView(resourceComposite
+ .getResourcePermission().isConfigureWrite(), resourceId);
} else {
- resourceHistoryTable = new ResourceConfigurationHistoryCriteriaView(extendLocatorId("Table"),
- resourceComposite.getResourcePermission().isConfigureWrite(), -1);
+ resourceHistoryTable = new ResourceConfigurationHistoryCriteriaView(resourceComposite
+ .getResourcePermission().isConfigureWrite(), -1);
}
resourceHistoryTable.setDataSource(new ConfigurationUdpatesCriteriaDataSource(portletConfig));
resourceHistoryTable.setShowHeader(false);
@@ -143,8 +143,8 @@ public class ResourceConfigurationUpdatesPortlet extends GroupConfigurationUpdat
class ResourceConfigurationHistoryCriteriaView extends ResourceConfigurationHistoryListView {
- public ResourceConfigurationHistoryCriteriaView(String locatorId, boolean hasWritePerm, int resourceId) {
- super(locatorId, hasWritePerm, resourceId);
+ public ResourceConfigurationHistoryCriteriaView(boolean hasWritePerm, int resourceId) {
+ super(hasWritePerm, resourceId);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java
index 411a23b..447e57f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselMemberView.java
@@ -58,16 +58,16 @@ public class DriftCarouselMemberView extends DriftHistoryView implements Carouse
private Criteria carouselCriteria;
private ArrayList<DriftSelectionListener> driftSelectionListeners = new ArrayList<DriftSelectionListener>();
- public static DriftCarouselMemberView get(String locatorId, ResourceComposite composite,
- DriftChangeSet driftChangeSet, Criteria initialCriteria) {
+ public static DriftCarouselMemberView get(ResourceComposite composite, DriftChangeSet driftChangeSet,
+ Criteria initialCriteria) {
EntityContext context = EntityContext.forResource(composite.getResource().getId());
boolean hasWriteAccess = composite.getResourcePermission().isDrift();
- return new DriftCarouselMemberView(locatorId, context, driftChangeSet, hasWriteAccess, initialCriteria);
+ return new DriftCarouselMemberView(context, driftChangeSet, hasWriteAccess, initialCriteria);
}
- public DriftCarouselMemberView(String locatorId, EntityContext context, DriftChangeSet driftChangeSet,
- boolean hasWriteAccess, Criteria initialCriteria) {
+ public DriftCarouselMemberView(EntityContext context, DriftChangeSet driftChangeSet, boolean hasWriteAccess,
+ Criteria initialCriteria) {
super(null, context, hasWriteAccess, initialCriteria);
@@ -150,8 +150,8 @@ public class DriftCarouselMemberView extends DriftHistoryView implements Carouse
public void updateTitleCanvas(String titleString) {
int resourceId = getContext().getResourceId();
String imageHtml = Canvas.imgHTML(ImageManager.getViewIcon());
- String link = LinkManager.getDriftCarouselSnapshotLink(resourceId, changeSet.getDriftDefinitionId(), changeSet
- .getVersion());
+ String link = LinkManager.getDriftCarouselSnapshotLink(resourceId, changeSet.getDriftDefinitionId(),
+ changeSet.getVersion());
StringBuilder sb = new StringBuilder();
sb.append("<a href=\"").append(link).append("\">");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
index 88e280d..6772273 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftCarouselView.java
@@ -72,8 +72,8 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
private DriftGWTServiceAsync driftService = GWTServiceLookup.getDriftService();
- public DriftCarouselView(String locatorId, EntityContext entityContext, int driftDefId, boolean hasWriteAccess) {
- super(locatorId);
+ public DriftCarouselView(EntityContext entityContext, int driftDefId, boolean hasWriteAccess) {
+ super();
this.context = entityContext;
this.driftDefId = driftDefId;
@@ -136,8 +136,8 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
Criteria initialCriteria = getInitialMemberCriteria(isRefresh ? getCurrentCriteria() : null);
for (DriftChangeSet changeSet : result) {
- DriftCarouselMemberView view = new DriftCarouselMemberView(extendLocatorId(changeSet.getId()),
- context, changeSet, hasWriteAccess, initialCriteria);
+ DriftCarouselMemberView view = new DriftCarouselMemberView(context, changeSet, hasWriteAccess,
+ initialCriteria);
addCarouselMember(view);
view.addDriftSelectionListener(new DriftSelectionListener() {
@@ -253,7 +253,7 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
private void buildTitle(DriftDefinition driftDef) {
setTitleString(driftDef.getName());
- setTitleBackButton(new BackButton(extendLocatorId("BackButton"), MSG.view_tableSection_backButton(),
+ setTitleBackButton(new BackButton(MSG.view_tableSection_backButton(),
LinkManager.getDriftDefinitionsLink(this.context.getResourceId())));
}
@@ -365,10 +365,9 @@ public class DriftCarouselView extends BookmarkableCarousel implements DetailsVi
@Override
public Canvas getDetailsView(String id) {
if (this.useDriftDetailsView) {
- return new DriftDetailsView(extendLocatorId("Drift"), id);
+ return new DriftDetailsView(id);
}
- return new DriftSnapshotView(extendLocatorId("Snapshot"), null, context.getResourceId(), driftDefId,
- Integer.valueOf(id), hasWriteAccess);
+ return new DriftSnapshotView(null, context.getResourceId(), driftDefId, Integer.valueOf(id), hasWriteAccess);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java
index 6b11fe6..4ee32db 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionEditView.java
@@ -62,8 +62,8 @@ public class DriftDefinitionEditView extends LocatableVLayout implements Propert
private boolean refreshing = false;
- public DriftDefinitionEditView(String locatorId, EntityContext context, int driftDefId, boolean hasWriteAccess) {
- super(locatorId);
+ public DriftDefinitionEditView(EntityContext context, int driftDefId, boolean hasWriteAccess) {
+ super();
this.context = context;
this.driftDefId = driftDefId;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java
index ec8a818..d057a9c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateEditView.java
@@ -63,8 +63,8 @@ public class DriftDefinitionTemplateEditView extends LocatableVLayout implements
private boolean refreshing = false;
- public DriftDefinitionTemplateEditView(String locatorId, int driftTemplateId, boolean hasWriteAccess) {
- super(locatorId);
+ public DriftDefinitionTemplateEditView(int driftTemplateId, boolean hasWriteAccess) {
+ super();
this.driftTemplateId = driftTemplateId;
this.hasWriteAccess = hasWriteAccess;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateSnapshotView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateSnapshotView.java
index 998d872..70ee3e8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateSnapshotView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplateSnapshotView.java
@@ -29,8 +29,8 @@ public class DriftDefinitionTemplateSnapshotView extends DriftSnapshotView imple
private int templateId;
- public DriftDefinitionTemplateSnapshotView(String locatorId, int templateId) {
- super(locatorId, null, templateId, false);
+ public DriftDefinitionTemplateSnapshotView(int templateId) {
+ super(null, templateId, false);
this.templateId = templateId;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
index 0b686b0..38bb2d4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
@@ -63,7 +63,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
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.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
@@ -121,8 +120,8 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
}
@Override
- protected LocatableListGrid createListGrid(String locatorId) {
- return new DriftDefinitionTemplatesListGrid(locatorId);
+ protected ListGrid createListGrid() {
+ return new DriftDefinitionTemplatesListGrid();
}
public static String getTitle(ResourceType type) {
@@ -232,21 +231,21 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
public Canvas getDetailsView(Integer driftTemplateId) {
if (this.useSnapshotDetailsView) {
if (null == snapshotDriftDetailsId) {
- return new DriftDefinitionTemplateSnapshotView(extendLocatorId("TemplateSnapshot"), driftTemplateId);
+ return new DriftDefinitionTemplateSnapshotView(driftTemplateId);
}
- return new DriftDetailsView(extendLocatorId("TemplateSnapshotDrift"), snapshotDriftDetailsId);
+ return new DriftDetailsView(snapshotDriftDetailsId);
}
- return new DriftDefinitionTemplateEditView(extendLocatorId("TemplateEdit"), driftTemplateId, hasWriteAccess);
+ return new DriftDefinitionTemplateEditView(driftTemplateId, hasWriteAccess);
}
/**
* The expandable list grid
*/
- private class DriftDefinitionTemplatesListGrid extends LocatableListGrid {
+ private class DriftDefinitionTemplatesListGrid extends ListGrid {
- public DriftDefinitionTemplatesListGrid(String locatorId) {
- super(locatorId);
+ public DriftDefinitionTemplatesListGrid() {
+ super();
setCanExpandRecords(true);
setCanExpandMultipleRecords(true);
@@ -258,7 +257,7 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
int templateId = record.getAttributeAsInt(DriftDefinitionTemplateDataSource.ATTR_ID);
String templateName = record.getAttribute(DriftDefinitionTemplateDataSource.ATTR_NAME);
- return new TemplateDefinitionsView(extendLocatorId(templateName), templateId);
+ return new TemplateDefinitionsView(templateId);
}
}
@@ -269,7 +268,7 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
private int templateId;
private TemplateDefinitionsDataSource dataSource;
- public TemplateDefinitionsView(String locatorId, int templateId) {
+ public TemplateDefinitionsView(int templateId) {
super(null, true);
this.templateId = templateId;
@@ -306,8 +305,8 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
}
@Override
- protected LocatableListGrid createListGrid(String locatorId) {
- return new TemplateDefinitionsListGrid(locatorId);
+ protected ListGrid createListGrid() {
+ return new TemplateDefinitionsListGrid();
}
@Override
@@ -319,10 +318,10 @@ public class DriftDefinitionTemplatesView extends TableSection<DriftDefinitionTe
/**
* The definitions list grid
*/
- private class TemplateDefinitionsListGrid extends LocatableListGrid {
+ private class TemplateDefinitionsListGrid extends ListGrid {
- public TemplateDefinitionsListGrid(String locatorId) {
- super(locatorId);
+ public TemplateDefinitionsListGrid() {
+ super();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java
index 7b93c3e..65c253b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionsView.java
@@ -86,19 +86,19 @@ public class DriftDefinitionsView extends TableSection<DriftDefinitionDataSource
}
// for subsystem views
- public DriftDefinitionsView(String locatorId) {
- this(locatorId, SUBSYSTEM_VIEW_ID.getTitle(), EntityContext.forSubsystemView(), false);
+ public DriftDefinitionsView() {
+ this(SUBSYSTEM_VIEW_ID.getTitle(), EntityContext.forSubsystemView(), false);
}
- public DriftDefinitionsView(String locatorId, EntityContext entityContext) {
- this(locatorId, SUBSYSTEM_VIEW_ID.getTitle(), entityContext, false);
+ public DriftDefinitionsView(EntityContext entityContext) {
+ this(SUBSYSTEM_VIEW_ID.getTitle(), entityContext, false);
}
- public DriftDefinitionsView(String locatorId, String tableTitle, EntityContext entityContext) {
- this(locatorId, tableTitle, entityContext, false);
+ public DriftDefinitionsView(String tableTitle, EntityContext entityContext) {
+ this(tableTitle, entityContext, false);
}
- protected DriftDefinitionsView(String locatorId, String tableTitle, EntityContext context, boolean hasWriteAccess) {
+ protected DriftDefinitionsView(String tableTitle, EntityContext context, boolean hasWriteAccess) {
super(tableTitle, INITIAL_CRITERIA, new SortSpecifier[] { DEFAULT_SORT_SPECIFIER });
this.context = context;
this.hasWriteAccess = hasWriteAccess;
@@ -266,14 +266,13 @@ public class DriftDefinitionsView extends TableSection<DriftDefinitionDataSource
public Canvas getDetailsView(Integer driftDefId) {
switch (detailsView) {
case Edit:
- return new DriftDefinitionEditView(extendLocatorId("Edit"), context, driftDefId, hasWriteAccess);
+ return new DriftDefinitionEditView(context, driftDefId, hasWriteAccess);
case InitialSnapshot:
- return new DriftSnapshotView(extendLocatorId("InitialSnapshot"), null, context.getResourceId(), driftDefId,
- 0, hasWriteAccess);
+ return new DriftSnapshotView(null, context.getResourceId(), driftDefId, 0, hasWriteAccess);
default:
- return new DriftCarouselView(extendLocatorId("Carousel"), context, driftDefId, hasWriteAccess);
+ return new DriftCarouselView(context, driftDefId, hasWriteAccess);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
index a40a571..5eae9e5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDetailsView.java
@@ -58,8 +58,8 @@ public class DriftDetailsView extends LocatableVLayout {
private String driftId;
- public DriftDetailsView(String locatorId, String driftId) {
- super(locatorId);
+ public DriftDetailsView(String driftId) {
+ super();
this.driftId = driftId;
setMembersMargin(10);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java
index d07e4cf..798caf6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java
@@ -185,7 +185,7 @@ public class DriftHistoryView extends StringIDTableSection<DriftDataSource> {
@Override
public Canvas getDetailsView(String driftId) {
- return new DriftDetailsView(extendLocatorId("Details"), driftId);
+ return new DriftDetailsView(driftId);
}
public EntityContext getContext() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDriftDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDriftDetailsView.java
index 70bffff..299826c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDriftDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotDriftDetailsView.java
@@ -36,8 +36,8 @@ import org.rhq.core.domain.drift.DriftDetails;
*/
public class DriftSnapshotDriftDetailsView extends DriftDetailsView {
- public DriftSnapshotDriftDetailsView(String locatorId, String driftId) {
- super(locatorId, driftId);
+ public DriftSnapshotDriftDetailsView(String driftId) {
+ super(driftId);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java
index 19fc354..ed6e5eb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftSnapshotView.java
@@ -65,7 +65,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
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.selenium.LocatableListGrid;
/**
* A view that displays a nested table view of a snapshot. The outer table is a list of directories in the snapshot
@@ -89,20 +88,18 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> {
protected DriftSnapshotDataSource dataSource;
protected DriftSnapshotListGrid listGrid;
- public DriftSnapshotView(String locatorId, String tableTitle, int templateId, boolean hasWriteAccess) {
- this(locatorId, (null == tableTitle) ? DEFAULT_TITLE : tableTitle, templateId, null, null, null, hasWriteAccess);
+ public DriftSnapshotView(String tableTitle, int templateId, boolean hasWriteAccess) {
+ this((null == tableTitle) ? DEFAULT_TITLE : tableTitle, templateId, null, null, null, hasWriteAccess);
}
- public DriftSnapshotView(String locatorId, String tableTitle, int resourceId, int driftDefId, int version,
- boolean hasWriteAccess) {
- this(locatorId, (null == tableTitle) ? DEFAULT_TITLE : tableTitle, null, resourceId, driftDefId, version,
- hasWriteAccess);
+ public DriftSnapshotView(String tableTitle, int resourceId, int driftDefId, int version, boolean hasWriteAccess) {
+ this((null == tableTitle) ? DEFAULT_TITLE : tableTitle, null, resourceId, driftDefId, version, hasWriteAccess);
}
- private DriftSnapshotView(String locatorId, String tableTitle, Integer templateId, Integer resourceId,
- Integer driftDefId, Integer version, boolean hasWriteAccess) {
+ private DriftSnapshotView(String tableTitle, Integer templateId, Integer resourceId, Integer driftDefId,
+ Integer version, boolean hasWriteAccess) {
- super(locatorId, tableTitle);
+ super(tableTitle);
this.templateId = templateId;
this.resourceId = resourceId;
@@ -127,8 +124,8 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> {
}
@Override
- protected LocatableListGrid createListGrid(String locatorId) {
- return new DriftSnapshotListGrid(locatorId);
+ protected ListGrid createListGrid() {
+ return new DriftSnapshotListGrid();
}
@Override
@@ -246,10 +243,10 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> {
DriftSnapshotView.this.refreshTableInfo();
}
- private class DriftSnapshotListGrid extends LocatableListGrid {
+ private class DriftSnapshotListGrid extends ListGrid {
- public DriftSnapshotListGrid(String locatorId) {
- super(locatorId);
+ public DriftSnapshotListGrid() {
+ super();
setCanExpandRecords(true);
setCanExpandMultipleRecords(true);
@@ -260,7 +257,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> {
protected Canvas getExpansionComponent(ListGridRecord record) {
String dirPath = record.getAttribute(DriftSnapshotDataSource.ATTR_DIR_PATH);
- return new DirectoryView(extendLocatorId(dirPath), dirPath);
+ return new DirectoryView(dirPath);
}
}
@@ -269,7 +266,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> {
private String directory;
private DirectoryViewDataSource dataSource;
- public DirectoryView(String locatorId, String directory) {
+ public DirectoryView(String directory) {
super(null, true);
this.directory = directory;
@@ -313,14 +310,14 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> {
}
@Override
- protected LocatableListGrid createListGrid(String locatorId) {
- return new DirectoryViewListGrid(locatorId);
+ protected ListGrid createListGrid() {
+ return new DirectoryViewListGrid();
}
- private class DirectoryViewListGrid extends LocatableListGrid {
+ private class DirectoryViewListGrid extends ListGrid {
- public DirectoryViewListGrid(String locatorId) {
- super(locatorId);
+ public DirectoryViewListGrid() {
+ super();
setCanExpandRecords(true);
setCanExpandMultipleRecords(true);
@@ -359,7 +356,7 @@ public class DriftSnapshotView extends Table<DriftSnapshotDataSource> {
protected Canvas getExpansionComponent(ListGridRecord record) {
String driftId = record.getAttribute(DriftDataSource.ATTR_ID);
- return new DriftSnapshotDriftDetailsView(extendLocatorId(driftId), driftId);
+ return new DriftSnapshotDriftDetailsView(driftId);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftDefinitionsView.java
index a32638a..68575a9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/ResourceDriftDefinitionsView.java
@@ -26,15 +26,14 @@ import org.rhq.core.domain.resource.composite.ResourceComposite;
* @author Jay Shaughnessy
*/
public class ResourceDriftDefinitionsView extends DriftDefinitionsView {
- public static ResourceDriftDefinitionsView get(String locatorId, ResourceComposite composite) {
+ public static ResourceDriftDefinitionsView get(ResourceComposite composite) {
String tableTitle = MSG.view_drift_table_resourceDef();
EntityContext context = EntityContext.forResource(composite.getResource().getId());
boolean hasWriteAccess = composite.getResourcePermission().isDrift();
- return new ResourceDriftDefinitionsView(locatorId, tableTitle, context, hasWriteAccess);
+ return new ResourceDriftDefinitionsView(tableTitle, context, hasWriteAccess);
}
- private ResourceDriftDefinitionsView(String locatorId, String tableTitle, EntityContext context,
- boolean hasWriteAccess) {
- super(locatorId, tableTitle, context, hasWriteAccess);
+ private ResourceDriftDefinitionsView(String tableTitle, EntityContext context, boolean hasWriteAccess) {
+ super(tableTitle, context, hasWriteAccess);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java
index daa2d54..4f034f8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/SubsystemResourceDriftView.java
@@ -29,7 +29,7 @@ import org.rhq.enterprise.gui.coregui.client.components.ReportExporter;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
public class SubsystemResourceDriftView extends DriftHistoryView {
- public SubsystemResourceDriftView(String locatorId, boolean hasWriteAccess) {
+ public SubsystemResourceDriftView(boolean hasWriteAccess) {
super(MSG.common_title_recent_drifts(), EntityContext.forSubsystemView(), hasWriteAccess);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java
index 4ac08c2..7f58d37 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java
@@ -77,11 +77,11 @@ public class HelpView extends AbstractSectionedLeftNavigationView {
@Override
protected LocatableVLayout defaultView() {
- LocatableVLayout vLayout = new LocatableVLayout(this.extendLocatorId("Default"));
+ LocatableVLayout vLayout = new LocatableVLayout();
vLayout.setWidth100();
// TODO: Help icon.
- TitleBar titleBar = new TitleBar(this, MSG.common_title_help(), VIEW_ID.getIcon().getIcon24x24Path());
+ TitleBar titleBar = new TitleBar(MSG.common_title_help(), VIEW_ID.getIcon().getIcon24x24Path());
vLayout.addMember(titleBar);
Label label = new Label(MSG.view_helpTop_description());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
index 003dfeb..69b7c94 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
@@ -109,11 +109,11 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
}
protected Canvas defaultView() {
- LocatableVLayout vLayout = new LocatableVLayout(this.extendLocatorId("Default"));
+ LocatableVLayout vLayout = new LocatableVLayout();
vLayout.setWidth100();
// TODO: Admin icon.
- TitleBar titleBar = new TitleBar(this, MSG.common_title_inventory(), IconEnum.INVENTORY.getIcon24x24Path());
+ TitleBar titleBar = new TitleBar(MSG.common_title_inventory(), IconEnum.INVENTORY.getIcon24x24Path());
vLayout.addMember(titleBar);
Label label = new Label(MSG.view_inventory_sectionHelp());
@@ -210,13 +210,13 @@ public class InventoryView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildGroupsSection() {
NavigationItem dynagroupDefinitionsItem = new NavigationItem(PAGE_DYNAGROUP_DEFINITIONS, new ViewFactory() {
public Canvas createView() {
- return new GroupDefinitionListView(extendLocatorId(PAGE_DYNAGROUP_DEFINITIONS.getName()));
+ return new GroupDefinitionListView();
}
}, this.globalPermissions.contains(Permission.MANAGE_INVENTORY));
NavigationItem allGroupsItem = new NavigationItem(PAGE_ALL_GROUPS, new ViewFactory() {
public Canvas createView() {
- return new ResourceGroupListView(extendLocatorId(PAGE_ALL_GROUPS.getName()));
+ return new ResourceGroupListView();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListDetailView.java
index 817b5fe..0e52ad0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListDetailView.java
@@ -45,8 +45,8 @@ public abstract class AbstractMeasurementDataTraitListDetailView extends Table<A
//new SortSpecifier(MeasurementDataTraitCriteria.SORT_FIELD_DISPLAY_NAME, SortDirection.ASCENDING)
};
- public AbstractMeasurementDataTraitListDetailView(String locatorId, String title,
- AbstractMeasurementDataTraitDataSource dataSource, Criteria criteria) {
+ public AbstractMeasurementDataTraitListDetailView(String title, AbstractMeasurementDataTraitDataSource dataSource,
+ Criteria criteria) {
super(title, criteria, SORT_SPECIFIERS, EXCLUDED_FIELD_NAMES);
setDataSource(dataSource);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
index 17ab3e3..e4acfa4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
@@ -35,7 +35,6 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
/**
* A view that displays a non-paginated table of {@link org.rhq.core.domain.measurement.MeasurementDataTrait trait}s,
@@ -77,12 +76,12 @@ public abstract class AbstractMeasurementDataTraitListView extends TableSection<
ListGridField displayNameField = listGrid.getField(MeasurementDataTraitCriteria.SORT_FIELD_DISPLAY_NAME);
displayNameField.setWidth("20%");
- addTableAction(extendLocatorId("liveValue"), MSG.view_measureTable_getLive(), getLiveValueAction());
+ addTableAction(MSG.view_measureTable_getLive(), getLiveValueAction());
}
protected abstract TableAction getLiveValueAction();
- protected abstract LocatableListGrid decorateLiveDataGrid(List<ListGridRecord> records);
+ protected abstract ListGrid decorateLiveDataGrid(List<ListGridRecord> records);
@Override
protected String getDetailsLinkColumnName() {
@@ -112,7 +111,7 @@ public abstract class AbstractMeasurementDataTraitListView extends TableSection<
}
});
- LocatableListGrid liveDataGrid = decorateLiveDataGrid(records);
+ ListGrid liveDataGrid = decorateLiveDataGrid(records);
liveDataWindow.addItem(liveDataGrid);
liveDataWindow.show();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
index 173684b..f91962d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
@@ -44,6 +44,7 @@ import com.smartgwt.client.types.AnimationEffect;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Img;
import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.WidgetCanvas;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
@@ -54,10 +55,8 @@ import com.smartgwt.client.widgets.layout.HLayout;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableImg;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWidgetCanvas;
/**
* @author Greg Hinkle
@@ -163,7 +162,7 @@ public abstract class AbstractMetricGraphView extends LocatableVLayout {
protected void drawGraph() {
- HLayout titleHLayout = new LocatableHLayout(extendLocatorId("HTitle"));
+ HLayout titleHLayout = new EnhancedHLayout();
if (definition != null) {
titleHLayout.setAutoHeight();
@@ -176,7 +175,7 @@ public abstract class AbstractMetricGraphView extends LocatableVLayout {
}
if (supportsLiveGraphViewDialog()) {
- Img liveGraph = new LocatableImg(extendLocatorId("Live"), "subsystems/monitor/Monitor_16.png", 16, 16);
+ Img liveGraph = new Img("subsystems/monitor/Monitor_16.png", 16, 16);
liveGraph.setTooltip(MSG.view_resource_monitor_graph_live_tooltip());
liveGraph.addClickHandler(new ClickHandler() {
@@ -268,7 +267,7 @@ public abstract class AbstractMetricGraphView extends LocatableVLayout {
// put it on a panel
- addMember(new LocatableWidgetCanvas(extendLocatorId("Plot"), plot));
+ addMember(new WidgetCanvas(plot));
plot.setSize(String.valueOf(getInnerContentWidth()),
String.valueOf(getInnerContentHeight() - titleHLayout.getHeight() - 50));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java
index 303a451..c85bbc8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractSchedulesView.java
@@ -81,7 +81,7 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> {
protected void setupTableInteractions(final boolean hasWriteAccess) {
- addTableAction(extendLocatorId("Enable"), MSG.common_button_enable(), null, new TableAction() {
+ addTableAction(MSG.common_button_enable(), null, new TableAction() {
public boolean isEnabled(ListGridRecord[] selection) {
return ((selection.length >= 1) && hasWriteAccess);
}
@@ -90,7 +90,7 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> {
enableSchedules();
}
});
- addTableAction(extendLocatorId("Disable"), MSG.common_button_disable(), null, new TableAction() {
+ addTableAction(MSG.common_button_disable(), null, new TableAction() {
public boolean isEnabled(ListGridRecord[] selection) {
return ((selection.length >= 1) && hasWriteAccess);
}
@@ -99,7 +99,7 @@ public abstract class AbstractSchedulesView extends Table<SchedulesDataSource> {
disableSchedules();
}
});
- addExtraWidget(new UpdateCollectionIntervalWidget(this.getLocatorId(), this), true);
+ addExtraWidget(new UpdateCollectionIntervalWidget(this), true);
}
protected abstract void enableSchedules(int[] measurementDefinitionIds,
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java
index e2c6e53..b84ebf2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java
@@ -33,7 +33,7 @@ import com.smartgwt.client.widgets.form.validator.IntegerRangeValidator;
import com.smartgwt.client.widgets.grid.ListGrid;
import org.rhq.enterprise.gui.coregui.client.components.table.TableWidget;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
/**
* Widget for updating the collection intervals for the selected metrics. It displays two form fields for
@@ -42,7 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
*
* @author Ian Springer
*/
-public class UpdateCollectionIntervalWidget extends LocatableHLayout implements TableWidget {
+public class UpdateCollectionIntervalWidget extends EnhancedHLayout implements TableWidget {
private static final String ITEM_INTERVAL = "interval";
private static final String ITEM_UNITS = "units";
@@ -63,8 +63,8 @@ public class UpdateCollectionIntervalWidget extends LocatableHLayout implements
private DynamicForm form;
private Button setButton;
- public UpdateCollectionIntervalWidget(String locatorId, AbstractSchedulesView schedulesView) {
- super(locatorId);
+ public UpdateCollectionIntervalWidget(AbstractSchedulesView schedulesView) {
+ super();
this.schedulesView = schedulesView;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
index 2d7717f..e6f408a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
@@ -59,8 +59,8 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
private U titleBar;
protected Set<Permission> globalPermissions;
- public AbstractTwoLevelTabSetView(String locatorId, String baseViewPath) {
- super(locatorId);
+ public AbstractTwoLevelTabSetView(String baseViewPath) {
+ super();
this.baseViewPath = baseViewPath;
setWidth100();
@@ -69,7 +69,7 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
this.titleBar = createTitleBar();
addMember(this.titleBar);
- this.tabSet = new TwoLevelTabSet(extendLocatorId("TabSet"));
+ this.tabSet = new TwoLevelTabSet();
this.tabSet.setTabBarPosition(Side.TOP);
this.tabSet.setWidth100();
this.tabSet.setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java
index c58870b..efe107d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/monitoring/IFrameWithMeasurementRangeEditorView.java
@@ -47,11 +47,11 @@ public class IFrameWithMeasurementRangeEditorView extends LocatableVLayout imple
addMember(iframe);
- LocatableToolStrip footer = new LocatableToolStrip("toolStrip");
+ LocatableToolStrip footer = new LocatableToolStrip();
footer.setWidth100();
addMember(footer);
- editor = new UserPreferencesMeasurementRangeEditor(extendLocatorId("range")) {
+ editor = new UserPreferencesMeasurementRangeEditor() {
@Override
public void setMetricRangeProperties(MetricRangePreferences prefs) {
super.setMetricRangeProperties(prefs);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java
index dbcf04c..0308564 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java
@@ -60,8 +60,8 @@ public abstract class AbstractOperationHistoryDetailsView<T extends OperationHis
private DynamicForm form;
- public AbstractOperationHistoryDetailsView(String locatorId) {
- super(locatorId);
+ public AbstractOperationHistoryDetailsView() {
+ super();
setWidth100();
setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
index 466554d..ab0bbf1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
@@ -70,7 +70,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation
import org.rhq.enterprise.gui.coregui.client.util.FormUtility;
import org.rhq.enterprise.gui.coregui.client.util.TypeConversionUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -92,7 +92,7 @@ public abstract class AbstractOperationScheduleDetailsView extends
private Map<String, ConfigurationDefinition> operationNameToParametersDefinitionMap = new HashMap<String, ConfigurationDefinition>();
private StaticTextItem operationDescriptionItem;
private StaticTextItem operationParametersItem;
- private LocatableHLayout operationParametersConfigurationHolder;
+ private EnhancedHLayout operationParametersConfigurationHolder;
private ConfigurationEditor operationParametersConfigurationEditor;
private Configuration operationParameters;
private JobTriggerEditor triggerEditor;
@@ -101,9 +101,9 @@ public abstract class AbstractOperationScheduleDetailsView extends
private ViewPath viewPath;
private boolean isImmediateExecution;
- public AbstractOperationScheduleDetailsView(String locatorId, AbstractOperationScheduleDataSource dataSource,
+ public AbstractOperationScheduleDetailsView(AbstractOperationScheduleDataSource dataSource,
ResourceType resourceType, int scheduleId) {
- super(locatorId, dataSource, scheduleId, MSG.view_operationScheduleDetails_operationSchedule(), null);
+ super(dataSource, scheduleId, MSG.view_operationScheduleDetails_operationSchedule(), null);
this.setMembersMargin(5);
@@ -236,7 +236,7 @@ public abstract class AbstractOperationScheduleDetailsView extends
protected LocatableVLayout buildContentPane() {
LocatableVLayout contentPane = super.buildContentPane();
- this.operationParametersConfigurationHolder = new LocatableHLayout(extendLocatorId("ConfigHolder"));
+ this.operationParametersConfigurationHolder = new EnhancedHLayout();
this.operationParametersConfigurationHolder.setVisible(false);
contentPane.addMember(this.operationParametersConfigurationHolder);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
index d9e4666..01ae8ca 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
@@ -59,7 +59,7 @@ public abstract class AbstractOperationScheduleListView extends TableSection<Abs
setListGridFields(true, idField, operationField, subjectField, nextFireTimeField, descriptionField);
- addTableAction(extendLocatorId("New"), MSG.common_button_new(), new TableAction() {
+ addTableAction(MSG.common_button_new(), new TableAction() {
public boolean isEnabled(ListGridRecord[] selection) {
return hasControlPermission();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index c62e17c..09a7963 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -67,8 +67,8 @@ import org.rhq.enterprise.gui.coregui.client.util.BrowserUtility;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.measurement.GwtMonitorUtils;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -78,9 +78,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
public abstract class AbstractActivityView extends LocatableVLayout implements RefreshableView {
//contains the activity display region
- private LocatableHLayout columnSection = new LocatableHLayout("ActivityRegion");
+ private EnhancedHLayout columnSection = new EnhancedHLayout();
- //Locatable ui references
protected VLayout leftPane = new VLayout();
protected VLayout rightPane = new VLayout();
@@ -123,7 +122,7 @@ public abstract class AbstractActivityView extends LocatableVLayout implements R
public AbstractActivityView(String locatorId, ResourceGroupComposite groupComposite,
ResourceComposite resourceComposite) {
- super(locatorId);
+ super();
if (groupComposite != null) {
this.groupComposite = groupComposite;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 8e07c4c..36b8094 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -208,8 +208,7 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc
}
if (this.showNewButton) {
- addTableAction(extendLocatorId("New"), MSG.common_button_new(), new AuthorizedTableAction(this,
- Permission.MANAGE_INVENTORY) {
+ addTableAction(MSG.common_button_new(), new AuthorizedTableAction(this, Permission.MANAGE_INVENTORY) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
GroupCategory category = null;
String categoryString = getInitialCriteria() == null ? null : getInitialCriteria().getAttribute(
@@ -228,35 +227,34 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc
}
if (this.resourceIdToModify != null) {
- addTableAction(extendLocatorId("Membership"), MSG.view_tabs_common_group_membership() + "...",
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- ResourceResourceGroupsView membershipView = new ResourceResourceGroupsView(
- ResourceGroupListView.this.extendLocatorId("MembershipView"),
- ResourceGroupListView.this.resourceIdToModify.intValue());
-
- final PopupWindow winModal = new PopupWindow(membershipView);
- winModal.setTitle(MSG.view_tabs_common_group_membership());
- winModal.setWidth(700);
- winModal.setHeight(450);
- winModal.addCloseClickHandler(new CloseClickHandler() {
- public void onCloseClick(CloseClickEvent event) {
- refreshTableInfo(); // make sure we re-enable the footer buttons in case user canceled
- }
- });
-
- membershipView.setSaveButtonHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- winModal.markForDestroy();
- CoreGUI.refresh();
- }
- });
-
- winModal.show();
- }
- });
+ addTableAction(MSG.view_tabs_common_group_membership() + "...", new AbstractTableAction(
+ TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ ResourceResourceGroupsView membershipView = new ResourceResourceGroupsView(
+ ResourceGroupListView.this.resourceIdToModify.intValue());
+
+ final PopupWindow winModal = new PopupWindow(membershipView);
+ winModal.setTitle(MSG.view_tabs_common_group_membership());
+ winModal.setWidth(700);
+ winModal.setHeight(450);
+ winModal.addCloseClickHandler(new CloseClickHandler() {
+ public void onCloseClick(CloseClickEvent event) {
+ refreshTableInfo(); // make sure we re-enable the footer buttons in case user canceled
+ }
+ });
+
+ membershipView.setSaveButtonHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ winModal.markForDestroy();
+ CoreGUI.refresh();
+ }
+ });
+
+ winModal.show();
+ }
+ });
}
setListGridDoubleClickHandler(new DoubleClickHandler() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
index 8a735e6..ac470aa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
@@ -53,7 +53,7 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
*/
public class GroupDefinitionListView extends TableSection<GroupDefinitionDataSource> {
- public GroupDefinitionListView(String locatorId) {
+ public GroupDefinitionListView() {
super(null);
setDataSource(GroupDefinitionDataSource.getInstance());
@@ -147,14 +147,13 @@ public class GroupDefinitionListView extends TableSection<GroupDefinitionDataSou
}
});
- addTableAction(extendLocatorId("New"), MSG.common_button_new(), null, new AbstractTableAction() {
+ addTableAction(MSG.common_button_new(), null, new AbstractTableAction() {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
newDetails();
}
});
- addTableAction(extendLocatorId("Recalculate"), MSG.view_dynagroup_recalculate(), null, new AbstractTableAction(
- TableActionEnablement.ANY) {
+ addTableAction(MSG.view_dynagroup_recalculate(), null, new AbstractTableAction(TableActionEnablement.ANY) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
final int[] groupDefinitionIds = TableUtility.getIds(selection);
ResourceGroupGWTServiceAsync resourceGroupManager = GWTServiceLookup.getResourceGroupService();
@@ -184,8 +183,7 @@ public class GroupDefinitionListView extends TableSection<GroupDefinitionDataSou
@Override
public Canvas getDetailsView(Integer id) {
- final SingleGroupDefinitionView singleGroupDefinitionView = new SingleGroupDefinitionView(
- this.extendLocatorId("Details"));
+ final SingleGroupDefinitionView singleGroupDefinitionView = new SingleGroupDefinitionView();
return singleGroupDefinitionView;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
index a7b99a4..93ee568 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java
@@ -120,8 +120,8 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm
private TextAreaItem expression;
private SpinnerItem recalculationInterval;
- public SingleGroupDefinitionView(String locatorId) {
- super(locatorId);
+ public SingleGroupDefinitionView() {
+ super();
buildForm();
setWidth100();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java
index 349c5e7..d31397a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/CustomResourceGroupTreeGrid.java
@@ -19,21 +19,21 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail;
import com.smartgwt.client.data.Record;
+import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
/**
* Tree grid used to render the left hand group tree.
*
* @author John Mazzitelli
*/
-public class CustomResourceGroupTreeGrid extends LocatableTreeGrid {
+public class CustomResourceGroupTreeGrid extends TreeGrid {
- public CustomResourceGroupTreeGrid(String locatorId) {
- super(locatorId);
+ public CustomResourceGroupTreeGrid() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java
index 24e2e9d..bc13894 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/GeneralProperties.java
@@ -60,7 +60,7 @@ public class GeneralProperties extends LocatableVLayout {
public GeneralProperties(String locatorId, ResourceGroupComposite groupComposite, ResourceGroupTitleBar titleBar,
boolean isEditable) {
- super(locatorId);
+ super();
this.groupComposite = groupComposite;
this.titleBar = titleBar;
this.isEditable = isEditable;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index df2bc7f..d3fc036 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -124,8 +124,8 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
private String currentTabName;
private String currentSubTabName;
- public ResourceGroupDetailView(String locatorId, String baseViewPath) {
- super(locatorId, baseViewPath);
+ public ResourceGroupDetailView(String baseViewPath) {
+ super(baseViewPath);
this.hide();
}
@@ -345,8 +345,7 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
viewFactory = (!visible) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new CalltimeView(monitorCallTime.extendLocatorId("CalltimeView"),
- EntityContext.forGroup(groupComposite.getResourceGroup()));
+ return new CalltimeView(EntityContext.forGroup(groupComposite.getResourceGroup()));
}
};
updateSubTab(this.monitoringTab, this.monitorCallTime, visible, true, viewFactory);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
index 7db3b3f..404607d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTitleBar.java
@@ -45,8 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.components.tagging.TagEditorView;
import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallback;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableImg;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -74,7 +73,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
private GeneralProperties generalProperties;
public ResourceGroupTitleBar(String locatorId, boolean isAutoGroup, boolean isAutoCluster) {
- super(locatorId);
+ super();
this.isAutoGroup = isAutoGroup;
this.isAutoCluster = isAutoCluster;
@@ -91,7 +90,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
child.destroy();
}
- final LocatableHLayout hlayout = new LocatableHLayout(extendLocatorId("hlayout"));
+ final EnhancedHLayout hlayout = new EnhancedHLayout();
addMember(hlayout);
this.title = new HTMLFlow();
@@ -100,7 +99,7 @@ public class ResourceGroupTitleBar extends LocatableVLayout {
this.availabilityImage = new Img(ImageManager.getAvailabilityLargeIcon(null), 24, 24);
if (this.supportsFavorite) {
- this.favoriteButton = new LocatableImg(this.extendLocatorId("Favorite"), NOT_FAV_ICON, 24, 24);
+ this.favoriteButton = new Img(NOT_FAV_ICON, 24, 24);
this.favoriteButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java
index 086cbda..2e61023 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTopView.java
@@ -27,12 +27,12 @@ import com.smartgwt.client.widgets.Canvas;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
/**
* @author Greg Hinkle
*/
-public class ResourceGroupTopView extends LocatableHLayout implements BookmarkableView {
+public class ResourceGroupTopView extends EnhancedHLayout implements BookmarkableView {
public static final ViewName VIEW_ID = new ViewName("ResourceGroup", MSG.common_title_resource_group());
private Canvas contentCanvas;
@@ -40,13 +40,13 @@ public class ResourceGroupTopView extends LocatableHLayout implements Bookmarkab
private ResourceGroupDetailView detailView;
private boolean isAutoClusterView = false;
- public ResourceGroupTopView(String locatorId) {
- super(locatorId);
+ public ResourceGroupTopView() {
+ super();
setWidth100();
setHeight100();
- treeView = new ResourceGroupTreeView(extendLocatorId("Tree"));
+ treeView = new ResourceGroupTreeView();
addMember(treeView);
contentCanvas = new Canvas();
@@ -70,10 +70,9 @@ public class ResourceGroupTopView extends LocatableHLayout implements Bookmarkab
if (null == detailView) {
if (isAutoClusterPath) {
- detailView = new ResourceGroupDetailView(this.extendLocatorId("AutoClusterDetail"),
- ResourceGroupDetailView.AUTO_CLUSTER_VIEW);
+ detailView = new ResourceGroupDetailView(ResourceGroupDetailView.AUTO_CLUSTER_VIEW);
} else {
- detailView = new ResourceGroupDetailView(this.extendLocatorId("groupDetail"), VIEW_ID.getName());
+ detailView = new ResourceGroupDetailView(VIEW_ID.getName());
}
isAutoClusterView = isAutoClusterPath;
this.setContent(detailView);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java
index 9fe66a9..b0a7b66 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeContextMenu.java
@@ -39,7 +39,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGro
*/
public class ResourceGroupTreeContextMenu extends ResourceGroupContextMenu {
- public ResourceGroupTreeContextMenu(String locatorId) {
+ public ResourceGroupTreeContextMenu() {
super();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 76f40e8..763ba9d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -134,8 +134,8 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
};
- public ResourceGroupTreeView(String locatorId) {
- super(locatorId);
+ public ResourceGroupTreeView() {
+ super();
setWidth(250);
setHeight100();
@@ -147,7 +147,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
protected void onInit() {
super.onInit();
- treeGrid = new CustomResourceGroupTreeGrid(extendLocatorId("groupTree"));
+ treeGrid = new CustomResourceGroupTreeGrid();
treeGrid.setWidth100();
treeGrid.setHeight100();
treeGrid.setAnimateFolders(false);
@@ -169,7 +169,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
}
});
- contextMenu = new ResourceGroupTreeContextMenu(extendLocatorId("contextMenu"));
+ contextMenu = new ResourceGroupTreeContextMenu();
treeGrid.setContextMenu(contextMenu);
treeGrid.addNodeContextClickHandler(new NodeContextClickHandler() {
@@ -573,8 +573,7 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
// label the tree node so the user knows this cluster node is not representative of the entire group membership
double percentage = (double) memberCount / (double) clusterSize;
String percentageStr = NumberFormat.getFormat("0%").format(percentage);
- String title = childName + " <span style=\"color: red; font-style: italic\">(" + percentageStr
- + ")</span>";
+ String title = childName + " <span style=\"color: red; font-style: italic\">(" + percentageStr + ")</span>";
node.setTitle(title);
// "1 out of 2 group members have "foo" child resources"
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
index fd60d3e..dc76e9b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
@@ -79,7 +79,7 @@ public class GroupResourceConfigurationEditView extends LocatableVLayout impleme
private boolean refreshing = false;
public GroupResourceConfigurationEditView(String locatorId, ResourceGroupComposite groupComposite) {
- super(locatorId);
+ super();
this.group = groupComposite.getResourceGroup();
this.resourcePermission = groupComposite.getResourcePermission();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
index 1ba63bc..664c8dd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
@@ -76,7 +76,7 @@ public class HistoryGroupResourceConfigurationMembers extends LocatableVLayout {
public HistoryGroupResourceConfigurationMembers(String locatorId, ResourceGroupComposite groupComposite,
int updateId) {
- super(locatorId);
+ super();
this.group = groupComposite.getResourceGroup();
this.groupPerms = groupComposite.getResourcePermission();
this.groupUpdateId = updateId;
@@ -85,11 +85,10 @@ public class HistoryGroupResourceConfigurationMembers extends LocatableVLayout {
setMembersMargin(5);
String backPath = LinkManager.getGroupResourceConfigurationUpdateHistoryLink(
EntityContext.forGroup(this.group), null);
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_tableSection_backButton(),
- backPath);
+ BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backPath);
addMember(backButton);
- MembersTable table = new MembersTable(extendLocatorId("Table"));
+ MembersTable table = new MembersTable();
addMember(table);
}
@@ -99,8 +98,8 @@ public class HistoryGroupResourceConfigurationMembers extends LocatableVLayout {
}
private class MembersTable extends Table<MembersTable.DataSource> {
- public MembersTable(String locatorId) {
- super(locatorId, MSG.view_group_resConfig_members_title());
+ public MembersTable() {
+ super(MSG.view_group_resConfig_members_title());
setDataSource(new DataSource());
}
@@ -155,8 +154,8 @@ public class HistoryGroupResourceConfigurationMembers extends LocatableVLayout {
fieldStatus.addRecordClickHandler(new RecordClickHandler() {
@Override
public void onRecordClick(RecordClickEvent event) {
- new ErrorMessageWindow("statusDetailsWin", MSG.view_group_resConfig_members_statusDetails(),
- "<pre>" + getStatusHtmlString(event.getRecord()) + "</pre>").show();
+ new ErrorMessageWindow(MSG.view_group_resConfig_members_statusDetails(), "<pre>"
+ + getStatusHtmlString(event.getRecord()) + "</pre>").show();
}
});
fieldStatus.setShowHover(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java
index d013647..80aa5d0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java
@@ -61,7 +61,7 @@ public class HistoryGroupResourceConfigurationSettings extends LocatableVLayout
public HistoryGroupResourceConfigurationSettings(String locatorId, ResourceGroupComposite groupComposite,
int updateId) {
- super(locatorId);
+ super();
this.group = groupComposite.getResourceGroup();
this.groupPerms = groupComposite.getResourcePermission();
this.groupUpdateId = updateId;
@@ -70,8 +70,7 @@ public class HistoryGroupResourceConfigurationSettings extends LocatableVLayout
setMembersMargin(5);
String backPath = LinkManager.getGroupResourceConfigurationUpdateHistoryLink(
EntityContext.forGroup(this.group), null);
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_tableSection_backButton(),
- backPath);
+ BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backPath);
addMember(backButton);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java
index d99db70..2997047 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java
@@ -102,8 +102,7 @@ public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceC
fieldStatus.addRecordClickHandler(new RecordClickHandler() {
@Override
public void onRecordClick(RecordClickEvent event) {
- new ErrorMessageWindow("errWin", MSG.common_severity_error(), getStatusHtmlString(event.getRecord()))
- .show();
+ new ErrorMessageWindow(MSG.common_severity_error(), getStatusHtmlString(event.getRecord())).show();
}
});
fieldStatus.setShowHover(true);
@@ -156,27 +155,27 @@ public class HistoryGroupResourceConfigurationTable extends Table<GroupResourceC
}
});
- addTableAction(extendLocatorId("viewSettingsAction"), MSG.view_group_resConfig_table_viewSettings(),
- new AbstractTableAction(TableActionEnablement.SINGLE) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- CoreGUI.goToView(LinkManager.getGroupResourceConfigurationUpdateHistoryLink(
- EntityContext.forGroup(HistoryGroupResourceConfigurationTable.this.group), null)
- + "/" + selection[0].getAttribute(GroupResourceConfigurationDataSource.Field.ID) + "/Settings");
- refreshTableInfo();
- }
- });
+ addTableAction(MSG.view_group_resConfig_table_viewSettings(), new AbstractTableAction(
+ TableActionEnablement.SINGLE) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ CoreGUI.goToView(LinkManager.getGroupResourceConfigurationUpdateHistoryLink(
+ EntityContext.forGroup(HistoryGroupResourceConfigurationTable.this.group), null)
+ + "/" + selection[0].getAttribute(GroupResourceConfigurationDataSource.Field.ID) + "/Settings");
+ refreshTableInfo();
+ }
+ });
- addTableAction(extendLocatorId("viewMemberHistoryAction"), MSG.view_group_resConfig_table_viewMemberHistory(),
- new AbstractTableAction(TableActionEnablement.SINGLE) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- CoreGUI.goToView(LinkManager.getGroupResourceConfigurationUpdateHistoryLink(
- EntityContext.forGroup(HistoryGroupResourceConfigurationTable.this.group), null)
- + "/" + selection[0].getAttribute(GroupResourceConfigurationDataSource.Field.ID) + "/Members");
- refreshTableInfo();
- }
- });
+ addTableAction(MSG.view_group_resConfig_table_viewMemberHistory(), new AbstractTableAction(
+ TableActionEnablement.SINGLE) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ CoreGUI.goToView(LinkManager.getGroupResourceConfigurationUpdateHistoryLink(
+ EntityContext.forGroup(HistoryGroupResourceConfigurationTable.this.group), null)
+ + "/" + selection[0].getAttribute(GroupResourceConfigurationDataSource.Field.ID) + "/Members");
+ refreshTableInfo();
+ }
+ });
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java
index 0d8b76a..7c2ba98 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java
@@ -36,7 +36,7 @@ public class HistoryGroupResourceConfigurationView extends LocatableVLayout impl
private Canvas detailsCanvas = null;
public HistoryGroupResourceConfigurationView(String locatorId, ResourceGroupComposite groupComposite) {
- super(locatorId);
+ super();
this.groupComposite = groupComposite;
groupHistoryTable = new HistoryGroupResourceConfigurationTable(extendLocatorId("Table"), groupComposite);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
index 24da7fc..bd1d5e8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
@@ -77,7 +77,7 @@ public class GroupPluginConfigurationEditView extends LocatableVLayout implement
private boolean refreshing = false;
public GroupPluginConfigurationEditView(String locatorId, ResourceGroupComposite groupComposite) {
- super(locatorId);
+ super();
this.group = groupComposite.getResourceGroup();
this.resourcePermission = groupComposite.getResourcePermission();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
index d473398..5e6ca96 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
@@ -74,8 +74,8 @@ public class HistoryGroupPluginConfigurationMembers extends LocatableVLayout {
private final ResourcePermission groupPerms;
private final int groupUpdateId;
- public HistoryGroupPluginConfigurationMembers(String locatorId, ResourceGroupComposite groupComposite, int updateId) {
- super(locatorId);
+ public HistoryGroupPluginConfigurationMembers(ResourceGroupComposite groupComposite, int updateId) {
+ super();
this.group = groupComposite.getResourceGroup();
this.groupPerms = groupComposite.getResourcePermission();
this.groupUpdateId = updateId;
@@ -84,11 +84,10 @@ public class HistoryGroupPluginConfigurationMembers extends LocatableVLayout {
setMembersMargin(5);
String backPath = LinkManager.getGroupPluginConfigurationUpdateHistoryLink(EntityContext.forGroup(this.group),
null);
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_tableSection_backButton(),
- backPath);
+ BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backPath);
addMember(backButton);
- MembersTable table = new MembersTable(extendLocatorId("Table"));
+ MembersTable table = new MembersTable();
addMember(table);
}
@@ -98,8 +97,8 @@ public class HistoryGroupPluginConfigurationMembers extends LocatableVLayout {
}
private class MembersTable extends Table<MembersTable.DataSource> {
- public MembersTable(String locatorId) {
- super(locatorId, MSG.view_group_pluginConfig_members_title());
+ public MembersTable() {
+ super(MSG.view_group_pluginConfig_members_title());
setDataSource(new DataSource());
}
@@ -154,8 +153,8 @@ public class HistoryGroupPluginConfigurationMembers extends LocatableVLayout {
fieldStatus.addRecordClickHandler(new RecordClickHandler() {
@Override
public void onRecordClick(RecordClickEvent event) {
- new ErrorMessageWindow("statusDetailsWin", MSG.view_group_pluginConfig_members_statusDetails(),
- "<pre>" + getStatusHtmlString(event.getRecord()) + "</pre>").show();
+ new ErrorMessageWindow(MSG.view_group_pluginConfig_members_statusDetails(), "<pre>"
+ + getStatusHtmlString(event.getRecord()) + "</pre>").show();
}
});
fieldStatus.setShowHover(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java
index bcd345d..eb5937a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java
@@ -60,7 +60,7 @@ public class HistoryGroupPluginConfigurationSettings extends LocatableVLayout {
private GroupConfigurationEditor editor;
public HistoryGroupPluginConfigurationSettings(String locatorId, ResourceGroupComposite groupComposite, int updateId) {
- super(locatorId);
+ super();
this.group = groupComposite.getResourceGroup();
this.groupPerms = groupComposite.getResourcePermission();
this.groupUpdateId = updateId;
@@ -69,8 +69,7 @@ public class HistoryGroupPluginConfigurationSettings extends LocatableVLayout {
setMembersMargin(5);
String backPath = LinkManager.getGroupPluginConfigurationUpdateHistoryLink(EntityContext.forGroup(this.group),
null);
- BackButton backButton = new BackButton(extendLocatorId("BackButton"), MSG.view_tableSection_backButton(),
- backPath);
+ BackButton backButton = new BackButton(MSG.view_tableSection_backButton(), backPath);
addMember(backButton);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
index 1d6ac34..5453b6c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java
@@ -93,20 +93,19 @@ public class HistoryGroupPluginConfigurationTable extends Table<HistoryGroupPlug
fieldStatus.setType(ListGridFieldType.ICON);
HashMap<String, String> statusIcons = new HashMap<String, String>(4);
- statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(), ImageManager
- .getPluginConfigurationIcon(ConfigurationUpdateStatus.SUCCESS));
- statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(), ImageManager
- .getPluginConfigurationIcon(ConfigurationUpdateStatus.FAILURE));
- statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(), ImageManager
- .getPluginConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS));
- statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(), ImageManager
- .getPluginConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE));
+ statusIcons.put(ConfigurationUpdateStatus.SUCCESS.name(),
+ ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.SUCCESS));
+ statusIcons.put(ConfigurationUpdateStatus.FAILURE.name(),
+ ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.FAILURE));
+ statusIcons.put(ConfigurationUpdateStatus.INPROGRESS.name(),
+ ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.INPROGRESS));
+ statusIcons.put(ConfigurationUpdateStatus.NOCHANGE.name(),
+ ImageManager.getPluginConfigurationIcon(ConfigurationUpdateStatus.NOCHANGE));
fieldStatus.setValueIcons(statusIcons);
fieldStatus.addRecordClickHandler(new RecordClickHandler() {
@Override
public void onRecordClick(RecordClickEvent event) {
- new ErrorMessageWindow("errWin", MSG.common_severity_error(), getStatusHtmlString(event.getRecord()))
- .show();
+ new ErrorMessageWindow(MSG.common_severity_error(), getStatusHtmlString(event.getRecord())).show();
}
});
fieldStatus.setShowHover(true);
@@ -144,8 +143,8 @@ public class HistoryGroupPluginConfigurationTable extends Table<HistoryGroupPlug
public void onSuccess(Void result) {
refresh();
Message message = new Message(MSG.view_group_pluginConfig_table_deleteSuccessful(String
- .valueOf(selection.length)), Message.Severity.Info, EnumSet.of(
- Message.Option.Transient));
+ .valueOf(selection.length)), Message.Severity.Info, EnumSet
+ .of(Message.Option.Transient));
CoreGUI.getMessageCenter().notify(message);
}
@@ -159,21 +158,23 @@ public class HistoryGroupPluginConfigurationTable extends Table<HistoryGroupPlug
}
});
- addTableAction(extendLocatorId("viewSettingsAction"), MSG.view_group_pluginConfig_table_viewSettings(),
- new AbstractTableAction(TableActionEnablement.SINGLE) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- CoreGUI.goToView(LinkManager.getGroupPluginConfigurationUpdateHistoryLink(EntityContext.forGroup(HistoryGroupPluginConfigurationTable.this.group), null)
- + "/" + selection[0].getAttribute(DataSource.Field.ID) + "/Settings");
- refreshTableInfo();
- }
- });
+ addTableAction(MSG.view_group_pluginConfig_table_viewSettings(), new AbstractTableAction(
+ TableActionEnablement.SINGLE) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ CoreGUI.goToView(LinkManager.getGroupPluginConfigurationUpdateHistoryLink(
+ EntityContext.forGroup(HistoryGroupPluginConfigurationTable.this.group), null)
+ + "/" + selection[0].getAttribute(DataSource.Field.ID) + "/Settings");
+ refreshTableInfo();
+ }
+ });
- addTableAction(extendLocatorId("viewMemberHistoryAction"), MSG
- .view_group_pluginConfig_table_viewMemberHistory(), new AbstractTableAction(TableActionEnablement.SINGLE) {
+ addTableAction(MSG.view_group_pluginConfig_table_viewMemberHistory(), new AbstractTableAction(
+ TableActionEnablement.SINGLE) {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
- CoreGUI.goToView(LinkManager.getGroupPluginConfigurationUpdateHistoryLink(EntityContext.forGroup(HistoryGroupPluginConfigurationTable.this.group), null)
+ CoreGUI.goToView(LinkManager.getGroupPluginConfigurationUpdateHistoryLink(
+ EntityContext.forGroup(HistoryGroupPluginConfigurationTable.this.group), null)
+ "/" + selection[0].getAttribute(DataSource.Field.ID) + "/Members");
refreshTableInfo();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java
index 6e0d7c1..1420859 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java
@@ -36,7 +36,7 @@ public class HistoryGroupPluginConfigurationView extends LocatableVLayout implem
private Canvas detailsCanvas = null;
public HistoryGroupPluginConfigurationView(String locatorId, ResourceGroupComposite groupComposite) {
- super(locatorId);
+ super();
this.groupComposite = groupComposite;
groupHistoryTable = new HistoryGroupPluginConfigurationTable(extendLocatorId("Table"), groupComposite);
@@ -76,8 +76,7 @@ public class HistoryGroupPluginConfigurationView extends LocatableVLayout implem
detailsCanvas = new HistoryGroupPluginConfigurationSettings(extendLocatorId("SettingsView"),
this.groupComposite, groupHistoryId);
} else {
- detailsCanvas = new HistoryGroupPluginConfigurationMembers(extendLocatorId("MembersView"),
- this.groupComposite, groupHistoryId);
+ detailsCanvas = new HistoryGroupPluginConfigurationMembers(this.groupComposite, groupHistoryId);
}
addMember(detailsCanvas);
setVisibleMember(detailsCanvas);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
index ed6df4a..a4292c6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/MembersView.java
@@ -57,13 +57,13 @@ public class MembersView extends ResourceSearchView {
protected void configureTable() {
super.configureTable();
- Log.debug("MembersView canModifyMembers: "+ canModifyMembers);
- if(canModifyMembers){
- addTableAction(extendLocatorId("Members"), MSG.view_groupInventoryMembers_button_updateMembership(),
- new AbstractTableAction( TableActionEnablement.ALWAYS ) {
+ Log.debug("MembersView canModifyMembers: " + canModifyMembers);
+ if (canModifyMembers) {
+ addTableAction(MSG.view_groupInventoryMembers_button_updateMembership(), new AbstractTableAction(
+ TableActionEnablement.ALWAYS) {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
- final Window winModal = new Window();
+ final Window winModal = new Window();
winModal.setTitle(MSG.view_groupInventoryMembers_title_updateMembership());
winModal.setOverflow(Overflow.VISIBLE);
winModal.setShowMinimizeButton(false);
@@ -83,10 +83,10 @@ public class MembersView extends ResourceSearchView {
}
});
- ResourceGroupMembershipView membershipView = new ResourceGroupMembershipView(MembersView.this
- .extendLocatorId("View"), MembersView.this.groupId);
+ ResourceGroupMembershipView membershipView = new ResourceGroupMembershipView(
+ MembersView.this.groupId);
- membershipView.setSaveButtonHandler(new ClickHandler() {
+ membershipView.setSaveButtonHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
winModal.markForDestroy();
@@ -95,7 +95,7 @@ public class MembersView extends ResourceSearchView {
}
});
- membershipView.setCancelButtonHandler(new ClickHandler() {
+ membershipView.setCancelButtonHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
winModal.destroy();
@@ -109,5 +109,4 @@ public class MembersView extends ResourceSearchView {
});
}
}
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java
index 56fe427..8aef886 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/ResourceGroupMembershipView.java
@@ -48,8 +48,8 @@ public class ResourceGroupMembershipView extends LocatableVLayout {
private ClickHandler saveButtonHandler;
private ClickHandler cancelButtonHandler;
- public ResourceGroupMembershipView(String locatorId, int resourceGroupId) {
- super(locatorId);
+ public ResourceGroupMembershipView(int resourceGroupId) {
+ super();
this.resourceGroupId = resourceGroupId;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java
index 8ddf6a7..b33af08 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMeasurementTableView.java
@@ -43,7 +43,7 @@ public class GroupMeasurementTableView extends Table<GroupMeasurementTableDataSo
private final int groupId;
public GroupMeasurementTableView(String locatorId, ResourceGroupComposite groupComposite, int groupId) {
- super(locatorId);
+ super();
this.groupId = groupId;
setDataSource(new GroupMeasurementTableDataSource(groupComposite, groupId));
//disable fields used when is full screen
@@ -72,6 +72,6 @@ public class GroupMeasurementTableView extends Table<GroupMeasurementTableDataSo
}
});
setListGridFields(fields.toArray(new ListGridField[getDataSource().getListGridFields().size()]));
- addExtraWidget(new UserPreferencesMeasurementRangeEditor(extendLocatorId("range")), true);
+ addExtraWidget(new UserPreferencesMeasurementRangeEditor(), true);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
index d269ba6..f2d8814 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMembersHealthView.java
@@ -58,7 +58,7 @@ public class GroupMembersHealthView extends MembersView {
setListGridFields(fields.toArray(new ListGridField[fields.size()]));
//add chart selected metric action
- addTableAction(extendLocatorId("chartValues"), MSG.common_title_compare_metrics(), new TableAction() {
+ addTableAction(MSG.common_title_compare_metrics(), new TableAction() {
@Override
public boolean isEnabled(ListGridRecord[] selection) {
return selection != null && selection.length > 1;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java
index 67a16de..b65bf0b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java
@@ -37,7 +37,7 @@ public class GroupMonitoringTablesView extends LocatableVLayout implements Refre
* @param locatorId
*/
public GroupMonitoringTablesView(String locatorId, ResourceGroupComposite groupComposite) {
- super(locatorId);
+ super();
metrics = new GroupMeasurementTableView(extendLocatorId("ViewMetrics"), groupComposite, groupComposite.getResourceGroup().getId());
memberHealth = new GroupMembersHealthView(extendLocatorId("ViewHealth"), groupComposite.getResourceGroup().getId(), false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
index e93a1cb..4a5a906 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
@@ -37,8 +37,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
* @author Ian Springer
*/
public class TraitsDetailView extends AbstractMeasurementDataTraitListDetailView {
- public TraitsDetailView(String locatorId, int groupId, int definitionId) {
- super(locatorId, null, new TraitsDataSource(groupId), createCriteria(groupId, definitionId));
+ public TraitsDetailView(int groupId, int definitionId) {
+ super(null, new TraitsDataSource(groupId), createCriteria(groupId, definitionId));
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
index 44b24ce..306bf30 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
@@ -47,7 +47,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
@@ -93,7 +92,7 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
@Override
public Canvas getDetailsView(Integer definitionId) {
- return new TraitsDetailView(extendLocatorId("Detail"), this.groupId, definitionId);
+ return new TraitsDetailView(this.groupId, definitionId);
}
private static Criteria createCriteria(int groupId) {
@@ -166,8 +165,8 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
}
@Override
- protected LocatableListGrid decorateLiveDataGrid(List<ListGridRecord> records) {
- LocatableListGrid liveDataGrid = new LocatableListGrid(extendLocatorId("liveDataListGrid"));
+ protected ListGrid decorateLiveDataGrid(List<ListGridRecord> records) {
+ ListGrid liveDataGrid = new ListGrid();
liveDataGrid.setShowAllRecords(true);
liveDataGrid.setData(records.toArray(new ListGridRecord[records.size()]));
liveDataGrid.setSelectionType(SelectionStyle.NONE);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
index ee4c411..68de917 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
@@ -81,7 +81,7 @@ public class GroupMemberResourceOperationHistoryListView extends
@Override
public Canvas getDetailsView(Integer id) {
- return new ResourceOperationHistoryDetailsView(extendLocatorId("DetailsView"), true);
+ return new ResourceOperationHistoryDetailsView(true);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java
index 7d7f7ce..8622d98 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryDetailsView.java
@@ -40,8 +40,8 @@ public class GroupOperationHistoryDetailsView extends AbstractOperationHistoryDe
private ResourceGroupComposite groupComposite;
- public GroupOperationHistoryDetailsView(String locatorId, ResourceGroupComposite groupComposite) {
- super(locatorId);
+ public GroupOperationHistoryDetailsView(ResourceGroupComposite groupComposite) {
+ super();
this.groupComposite = groupComposite;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java
index f07c881..99b9439 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupOperationHistoryListView.java
@@ -46,7 +46,7 @@ public class GroupOperationHistoryListView extends AbstractOperationHistoryListV
@Override
public Canvas getDetailsView(Integer id) {
- return new GroupOperationHistoryDetailsView(extendLocatorId("DetailsView"), this.groupComposite);
+ return new GroupOperationHistoryDetailsView(this.groupComposite);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
index 85b581f..936e554 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
@@ -49,9 +49,9 @@ public class GroupOperationScheduleDetailsView extends AbstractOperationSchedule
private EnhancedDynamicForm executionModeForm;
private ReorderableList memberExecutionOrderer;
- public GroupOperationScheduleDetailsView(String locatorId, ResourceGroupComposite groupComposite, int scheduleId) {
- super(locatorId, new GroupOperationScheduleDataSource(groupComposite), groupComposite.getResourceGroup()
- .getResourceType(), scheduleId);
+ public GroupOperationScheduleDetailsView(ResourceGroupComposite groupComposite, int scheduleId) {
+ super(new GroupOperationScheduleDataSource(groupComposite),
+ groupComposite.getResourceGroup().getResourceType(), scheduleId);
this.groupComposite = groupComposite;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
index 6561291..1d634d7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
@@ -47,7 +47,7 @@ public class GroupOperationScheduleListView extends AbstractOperationScheduleLis
@Override
public Canvas getDetailsView(Integer scheduleId) {
- return new GroupOperationScheduleDetailsView(extendLocatorId("DetailsView"), this.groupComposite, scheduleId);
+ return new GroupOperationScheduleDetailsView(this.groupComposite, scheduleId);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
index 39239be..344fffb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
@@ -93,7 +93,7 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
public ActivityView(String locatorId, ResourceGroupComposite groupComposite, boolean isAutoCluster,
boolean isAutoGroup) {
- super(locatorId);
+ super();
this.groupComposite = groupComposite;
this.isAutoCluster = isAutoCluster;
this.isAutoGroup = isAutoGroup;
@@ -146,7 +146,7 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
groupComposite);
addMember(dashboardView);
- footer = new LocatableToolStrip(extendLocatorId("Footer"));
+ footer = new LocatableToolStrip();
footer.setPadding(5);
footer.setWidth100();
footer.setMembersMargin(15);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java
index b1e0047..49b1dbb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryDetails.java
@@ -39,14 +39,14 @@ public class ChildHistoryDetails extends LocatableVLayout {
private CreateResourceHistory createHistory;
private DeleteResourceHistory deleteHistory;
- public ChildHistoryDetails(String locatorId, CreateResourceHistory history) {
- super(locatorId);
+ public ChildHistoryDetails(CreateResourceHistory history) {
+ super();
createHistory = history;
deleteHistory = null;
}
- public ChildHistoryDetails(String locatorId, DeleteResourceHistory history) {
- super(locatorId);
+ public ChildHistoryDetails(DeleteResourceHistory history) {
+ super();
createHistory = null;
deleteHistory = history;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java
index 0c10e41..745f7af 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java
@@ -124,8 +124,8 @@ public class ChildHistoryView extends Table<ChildHistoryView.DataSource> {
ListGridField createdField = new ListGridField(DataSource.Field.CREATED_DATE, MSG.common_title_dateCreated());
TimestampCellFormatter.prepareDateField(createdField);
- ListGridField modifiedField = new ListGridField(DataSource.Field.LAST_MODIFIED_TIME, MSG
- .common_title_lastUpdated());
+ ListGridField modifiedField = new ListGridField(DataSource.Field.LAST_MODIFIED_TIME,
+ MSG.common_title_lastUpdated());
TimestampCellFormatter.prepareDateField(modifiedField);
ListGridField subjectField = new ListGridField(DataSource.Field.SUBJECT_NAME, MSG.common_title_user());
@@ -183,13 +183,13 @@ public class ChildHistoryView extends Table<ChildHistoryView.DataSource> {
if (DataSource.TYPE_CREATE.equals(typeString)) {
CreateResourceHistory history = (CreateResourceHistory) selectedRows[0]
.getAttributeAsObject(DataSource.Field.OBJECT);
- detailsView = new ChildHistoryDetails(extendLocatorId("details"), history);
+ detailsView = new ChildHistoryDetails(history);
} else if (DataSource.TYPE_DELETE.equals(typeString)) {
DeleteResourceHistory history = (DeleteResourceHistory) selectedRows[0]
.getAttributeAsObject(DataSource.Field.OBJECT);
- detailsView = new ChildHistoryDetails(extendLocatorId("details"), history);
+ detailsView = new ChildHistoryDetails(history);
}
- new DetailsWindow(extendLocatorId("detailsWin"), detailsView).show();
+ new DetailsWindow(detailsView).show();
}
}
});
@@ -317,7 +317,7 @@ public class ChildHistoryView extends Table<ChildHistoryView.DataSource> {
}
class DetailsWindow extends Window {
- public DetailsWindow(String locatorId, Canvas canvas) {
+ public DetailsWindow(Canvas canvas) {
super();
setTitle(MSG.common_title_details());
setShowMinimizeButton(false);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
index 034dd05..d751587 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/CustomResourceTreeGrid.java
@@ -19,21 +19,21 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail;
import com.smartgwt.client.data.Record;
+import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.resource.Resource;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.ResourceTreeNode;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.SubCategoryTreeNode;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
/**
* @author Greg Hinkle
*/
-public class CustomResourceTreeGrid extends LocatableTreeGrid {
+public class CustomResourceTreeGrid extends TreeGrid {
- public CustomResourceTreeGrid(String locatorId) {
- super(locatorId);
+ public CustomResourceTreeGrid() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
index e17ace8..917bc57 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
@@ -156,8 +156,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
private SubTab contentSubscrip;
private SubTab contentHistory;
- public ResourceDetailView(String locatorId) {
- super(locatorId, BASE_VIEW_PATH);
+ public ResourceDetailView() {
+ super(BASE_VIEW_PATH);
// hide until we have our tabs in place
this.hide();
@@ -274,7 +274,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
}
protected ResourceTitleBar createTitleBar() {
- return new ResourceTitleBar(extendLocatorId("TitleBar"));
+ return new ResourceTitleBar();
}
protected void updateTabContent(ResourceComposite resourceComposite, boolean isRefresh) {
@@ -365,8 +365,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!visible) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new PluginConfigurationHistoryListView(inventoryConnHistory.extendLocatorId("View"),
- resourceComposite.getResourcePermission().isInventory(), resourceComposite.getResource().getId());
+ return new PluginConfigurationHistoryListView(resourceComposite.getResourcePermission().isInventory(),
+ resourceComposite.getResource().getId());
}
};
updateSubTab(this.inventoryTab, this.inventoryConnHistory, visible, true, viewFactory);
@@ -454,8 +454,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!visible) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new CalltimeView(monitoringTab.extendLocatorId("CalltimeView"),
- EntityContext.forResource(resource.getId()));
+ return new CalltimeView(EntityContext.forResource(resource.getId()));
}
};
updateSubTab(this.monitoringTab, this.monitorCallTime, visible, true, viewFactory);
@@ -494,8 +493,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.operationsTab, this.operationsHistory, true, true, new ViewFactory() {
@Override
public Canvas createView() {
- return new ResourceOperationHistoryListView(operationsTab.extendLocatorId("HistoryView"),
- resourceComposite);
+ return new ResourceOperationHistoryListView(resourceComposite);
}
});
}
@@ -517,8 +515,8 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.configurationTab, this.configHistory, true, true, new ViewFactory() {
@Override
public Canvas createView() {
- return new ResourceConfigurationHistoryListView(configurationTab.extendLocatorId("ConfigHistView"),
- resourceComposite.getResourcePermission().isConfigureWrite(), resource.getId());
+ return new ResourceConfigurationHistoryListView(resourceComposite.getResourcePermission()
+ .isConfigureWrite(), resource.getId());
}
});
}
@@ -540,7 +538,7 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.driftTab, this.driftDefinitions, true, true, new ViewFactory() {
@Override
public Canvas createView() {
- return ResourceDriftDefinitionsView.get(driftDefinitions.extendLocatorId("View"), resourceComposite);
+ return ResourceDriftDefinitionsView.get(resourceComposite);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
index 1a13aa6..fb111b5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTitleBar.java
@@ -54,8 +54,7 @@ import org.rhq.enterprise.gui.coregui.client.components.tagging.TagsChangedCallb
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableImg;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -65,9 +64,9 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class ResourceTitleBar extends LocatableVLayout {
//represents row of Resource title details[icon,title,show-details,tags,availability,favorites]
- private LocatableHLayout top;
+ private EnhancedHLayout top;
//represents normally closed region of Resource details[to verbosely describe resource across all tabs]
- private LocatableHLayout details;
+ private EnhancedHLayout details;
private static final String FAV_ICON = "Favorite_24_Selected.png";
private static final String NOT_FAV_ICON = "Favorite_24.png";
private static final String EXPANDED_ICON = "[SKIN]/ListGrid/row_expanded.png";
@@ -85,19 +84,19 @@ public class ResourceTitleBar extends LocatableVLayout {
private HTMLFlow title;
private Img availabilityImage;
private boolean favorite;
- private LocatableHLayout detailsForm;
+ private EnhancedHLayout detailsForm;
private OverviewForm detailsFormSummary;
private Img pluginErrors;
- public ResourceTitleBar(String locatorId) {
- super(locatorId);
+ public ResourceTitleBar() {
+ super();
//define two rows of content
- top = new LocatableHLayout(locatorId + "_Top");
+ top = new EnhancedHLayout();
top.setPadding(0);
top.setMembersMargin(0);
top.setHeight(30);
- details = new LocatableHLayout(locatorId + "_Details");
+ details = new EnhancedHLayout();
details.setWidth100();
//modify VLayout settings
@@ -123,7 +122,7 @@ public class ResourceTitleBar extends LocatableVLayout {
}
});
- this.favoriteButton = new LocatableImg(this.extendLocatorId("Favorite"), NOT_FAV_ICON, 24, 24);
+ this.favoriteButton = new Img(NOT_FAV_ICON, 24, 24);
this.favoriteButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
@@ -238,7 +237,7 @@ public class ResourceTitleBar extends LocatableVLayout {
top.addMember(availabilityImage);
top.addMember(favoriteButton);
- detailsForm = new LocatableHLayout(extendLocatorId("_Resource_Details"));
+ detailsForm = new EnhancedHLayout();
detailsForm.setWidth100();
detailsForm.setHeight(10);
detailsForm.setAlign(Alignment.LEFT);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java
index 1044a5d..ed715f2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTopView.java
@@ -24,13 +24,13 @@ import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
/**
* @author Jay Shaughnessy
* @author Greg Hinkle
*/
-public class ResourceTopView extends LocatableHLayout implements BookmarkableView {
+public class ResourceTopView extends EnhancedHLayout implements BookmarkableView {
public static final ViewName VIEW_ID = new ViewName("Resource", MSG.common_title_resource());
private Canvas contentCanvas;
@@ -38,13 +38,13 @@ public class ResourceTopView extends LocatableHLayout implements BookmarkableVie
private ResourceDetailView detailView;
private ResourceGroupDetailView autoGroupDetailView;
- public ResourceTopView(String locatorId) {
- super(locatorId);
+ public ResourceTopView() {
+ super();
setWidth100();
setHeight100();
- treeView = new ResourceTreeView(getLocatorId());
+ treeView = new ResourceTreeView();
addMember(treeView);
contentCanvas = new Canvas();
@@ -63,7 +63,7 @@ public class ResourceTopView extends LocatableHLayout implements BookmarkableVie
private void setToDetailView() {
- this.detailView = new ResourceDetailView(extendLocatorId("Detail"));
+ this.detailView = new ResourceDetailView();
this.detailView.addViewRenderedListener(new ResourceDetailView.ViewRenderedListener() {
public void onViewRendered() {
@@ -76,8 +76,7 @@ public class ResourceTopView extends LocatableHLayout implements BookmarkableVie
}
private void setToAutoGroupView() {
- this.autoGroupDetailView = new ResourceGroupDetailView(this.extendLocatorId("AutoGroupDetail"),
- ResourceGroupDetailView.AUTO_GROUP_VIEW);
+ this.autoGroupDetailView = new ResourceGroupDetailView(ResourceGroupDetailView.AUTO_GROUP_VIEW);
this.autoGroupDetailView.addViewRenderedListener(new ResourceGroupDetailView.ViewRenderedListener() {
public void onViewRendered() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index 4c705ca..102dfc9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -122,8 +122,8 @@ public class ResourceTreeView extends LocatableVLayout {
// Maps autogroup/type backing group ids to the corresponding autogroup/type nodes.
private Map<Integer, AutoGroupTreeNode> autoGroupNodeMap = new HashMap<Integer, AutoGroupTreeNode>();
- public ResourceTreeView(String locatorId) {
- super(locatorId);
+ public ResourceTreeView() {
+ super();
setWidth("250");
setHeight100();
@@ -144,7 +144,7 @@ public class ResourceTreeView extends LocatableVLayout {
}
private void buildTree() {
- treeGrid = new CustomResourceTreeGrid(getLocatorId());
+ treeGrid = new CustomResourceTreeGrid();
treeGrid.setOpenerImage("resources/dir.png");
treeGrid.setOpenerIconSize(16);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
index cdce132..ac628cf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
@@ -196,7 +196,7 @@ public abstract class AbstractConfigurationHistoryDataSource<T extends AbstractR
String err = event.getRecord().getAttribute(Field.ERROR_MESSAGE);
if (err != null && err.length() > 0) {
err = "<pre>" + err + "</pre>";
- new ErrorMessageWindow("errWin", MSG.common_severity_error(), err).show();
+ new ErrorMessageWindow(MSG.common_severity_error(), err).show();
}
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java
index 42e9925..40c2c0b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java
@@ -58,7 +58,7 @@ public abstract class AbstractConfigurationHistoryListView<T extends AbstractCon
/**
* Use this constructor to view config histories for all viewable Resources.
*/
- public AbstractConfigurationHistoryListView(String locatorId, String title, boolean hasWritePerm) {
+ public AbstractConfigurationHistoryListView(String title, boolean hasWritePerm) {
super(title);
this.hasWritePerm = hasWritePerm;
this.resourceId = null;
@@ -69,7 +69,7 @@ public abstract class AbstractConfigurationHistoryListView<T extends AbstractCon
*
* @param resourceId a Resource ID
*/
- public AbstractConfigurationHistoryListView(String locatorId, String title, boolean hasWritePerm, int resourceId) {
+ public AbstractConfigurationHistoryListView(String title, boolean hasWritePerm, int resourceId) {
super(title, createCriteria(resourceId));
this.hasWritePerm = hasWritePerm;
this.resourceId = resourceId;
@@ -120,8 +120,7 @@ public abstract class AbstractConfigurationHistoryListView<T extends AbstractCon
}
});
- addTableAction(extendLocatorId("Compare"), MSG.common_button_compare(), null, new AbstractTableAction(
- TableActionEnablement.MULTIPLE) {
+ addTableAction(MSG.common_button_compare(), null, new AbstractTableAction(TableActionEnablement.MULTIPLE) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
// The config updates do not have their Configurations fetched, so we need to reload the selected
// config updates, specifying that their Configurations should be fetched, in order to compare the
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java
index 55d2fd7..c6ac7d9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java
@@ -40,8 +40,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*/
public class ConfigurationHistoryDetailView extends LocatableVLayout implements BookmarkableView {
- public ConfigurationHistoryDetailView(String locatorId) {
- super(locatorId);
+ public ConfigurationHistoryDetailView() {
+ super();
setWidth100();
setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
index e72384e..22104ab 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
@@ -69,7 +69,7 @@ public class ResourceConfigurationEditView extends LocatableVLayout implements P
private boolean refreshing = false;
public ResourceConfigurationEditView(String locatorId, ResourceComposite resourceComposite) {
- super(locatorId);
+ super();
this.resource = resourceComposite.getResource();
this.resourcePermission = resourceComposite.getResourcePermission();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java
index 7836e33..f02c4cb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationHistoryListView.java
@@ -35,16 +35,16 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
* @author Greg Hinkle
* @author John Mazzitelli
*/
-public class ResourceConfigurationHistoryListView extends AbstractConfigurationHistoryListView<ResourceConfigurationHistoryDataSource>
- implements HasViewName {
+public class ResourceConfigurationHistoryListView extends
+ AbstractConfigurationHistoryListView<ResourceConfigurationHistoryDataSource> implements HasViewName {
public static final ViewName VIEW_ID = new ViewName("ConfigurationHistoryView",
- MSG.view_configurationHistoryList_title(), IconEnum.CONFIGURATION_HISTORY);
+ MSG.view_configurationHistoryList_title(), IconEnum.CONFIGURATION_HISTORY);
/**
* Use this constructor to view config histories for all viewable Resources.
*/
- public ResourceConfigurationHistoryListView(String locatorId, boolean hasWritePerm) {
- super(locatorId, null, hasWritePerm);
+ public ResourceConfigurationHistoryListView(boolean hasWritePerm) {
+ super(null, hasWritePerm);
ResourceConfigurationHistoryDataSource datasource = new ResourceConfigurationHistoryDataSource();
setDataSource(datasource);
}
@@ -54,15 +54,15 @@ public class ResourceConfigurationHistoryListView extends AbstractConfigurationH
*
* @param resourceId a Resource ID
*/
- public ResourceConfigurationHistoryListView(String locatorId, boolean hasWritePerm, int resourceId) {
- super(locatorId, VIEW_ID.getTitle(), hasWritePerm, resourceId);
+ public ResourceConfigurationHistoryListView(boolean hasWritePerm, int resourceId) {
+ super(VIEW_ID.getTitle(), hasWritePerm, resourceId);
ResourceConfigurationHistoryDataSource datasource = new ResourceConfigurationHistoryDataSource();
setDataSource(datasource);
}
@Override
public Canvas getDetailsView(Integer id) {
- ConfigurationHistoryDetailView detailView = new ConfigurationHistoryDetailView(this.getLocatorId());
+ ConfigurationHistoryDetailView detailView = new ConfigurationHistoryDetailView();
return detailView;
}
@@ -102,7 +102,6 @@ public class ResourceConfigurationHistoryListView extends AbstractConfigurationH
});
}
-
@Override
public ViewName getViewName() {
return VIEW_ID;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
index 2db5fee..37eb27b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
@@ -63,7 +63,7 @@ public class PluginConfigurationEditView extends LocatableVLayout implements Pro
private boolean refreshingConfigDef = false;
public PluginConfigurationEditView(String locatorId, ResourceComposite resourceComposite) {
- super(locatorId);
+ super();
this.resource = resourceComposite.getResource();
this.resourcePermission = resourceComposite.getResourcePermission();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java
index 5c67cbf..4c6cc43 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java
@@ -40,8 +40,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*/
public class PluginConfigurationHistoryDetailView extends LocatableVLayout implements BookmarkableView {
- public PluginConfigurationHistoryDetailView(String locatorId) {
- super(locatorId);
+ public PluginConfigurationHistoryDetailView() {
+ super();
setWidth100();
setHeight100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java
index 5da9750..bbff660 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryListView.java
@@ -36,14 +36,14 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
*/
public class PluginConfigurationHistoryListView extends
AbstractConfigurationHistoryListView<PluginConfigurationHistoryDataSource> {
- public static final ViewName VIEW_ID = new ViewName("PluginConfigurationHistoryView", MSG
- .view_tabs_common_connectionSettingsHistory());
+ public static final ViewName VIEW_ID = new ViewName("PluginConfigurationHistoryView",
+ MSG.view_tabs_common_connectionSettingsHistory());
/**
* Use this constructor to view plugin config histories for all viewable Resources.
*/
- public PluginConfigurationHistoryListView(String locatorId, boolean hasWritePerm) {
- super(locatorId, VIEW_ID.getTitle(), hasWritePerm);
+ public PluginConfigurationHistoryListView(boolean hasWritePerm) {
+ super(VIEW_ID.getTitle(), hasWritePerm);
PluginConfigurationHistoryDataSource datasource = new PluginConfigurationHistoryDataSource();
setDataSource(datasource);
}
@@ -53,15 +53,15 @@ public class PluginConfigurationHistoryListView extends
*
* @param resourceId a Resource ID
*/
- public PluginConfigurationHistoryListView(String locatorId, boolean hasWritePerm, int resourceId) {
- super(locatorId, VIEW_ID.getTitle(), hasWritePerm, resourceId);
+ public PluginConfigurationHistoryListView(boolean hasWritePerm, int resourceId) {
+ super(VIEW_ID.getTitle(), hasWritePerm, resourceId);
PluginConfigurationHistoryDataSource datasource = new PluginConfigurationHistoryDataSource();
setDataSource(datasource);
}
@Override
public Canvas getDetailsView(Integer id) {
- PluginConfigurationHistoryDetailView detailView = new PluginConfigurationHistoryDetailView(this.getLocatorId());
+ PluginConfigurationHistoryDetailView detailView = new PluginConfigurationHistoryDetailView();
return detailView;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
index 284bc63..5cfadc2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
@@ -62,7 +62,7 @@ public class ResourceAgentView extends LocatableVLayout implements RefreshableVi
private boolean loading = false; // will be true if loadData is currently waiting for responses
public ResourceAgentView(String locatorId, int resourceId) {
- super(locatorId);
+ super();
this.resourceId = resourceId;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java
index 2daa0c8..6f1a7a8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceGroupsView.java
@@ -46,8 +46,8 @@ public class ResourceResourceGroupsView extends LocatableVLayout {
private ResourceResourceGroupSelector selector;
private ClickHandler saveButtonHandler;
- public ResourceResourceGroupsView(String locatorId, int resourceId) {
- super(locatorId);
+ public ResourceResourceGroupsView(int resourceId) {
+ super();
this.resourceId = resourceId;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java
index db7c9b5..eb9af82 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/CalltimeView.java
@@ -45,11 +45,11 @@ public class CalltimeView extends TableSection<CalltimeDataSource> implements Ha
private TextItem destinationFilter;
// for subsystem views
- public CalltimeView(String locatorId) {
- this(locatorId, EntityContext.forSubsystemView());
+ public CalltimeView() {
+ this(EntityContext.forSubsystemView());
}
- public CalltimeView(String locatorId, EntityContext context) {
+ public CalltimeView(EntityContext context) {
super(SUBSYSTEM_VIEW_ID.getTitle());
setDataSource(new CalltimeDataSource(context));
destinationFilter = new TextItem(CalltimeDataSource.FILTER_DESTINATION,
@@ -75,7 +75,7 @@ public class CalltimeView extends TableSection<CalltimeDataSource> implements Ha
protected void configureTable() {
ArrayList<ListGridField> dataSourceFields = getDataSource().getListGridFields();
getListGrid().setFields(dataSourceFields.toArray(new ListGridField[dataSourceFields.size()]));
- addExtraWidget(new UserPreferencesMeasurementRangeEditor(extendLocatorId("range")), true);
+ addExtraWidget(new UserPreferencesMeasurementRangeEditor(), true);
super.configureTable();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
index acd98cf..81c3e1a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
@@ -53,7 +53,7 @@ public class GraphListView extends LocatableVLayout implements ResourceSelectLis
private Label loadingLabel = new Label(MSG.common_msg_loading());
public GraphListView(String locatorId, Resource resource) {
- super(locatorId);
+ super();
this.resource = resource;
setOverflow(Overflow.AUTO);
@@ -69,7 +69,7 @@ public class GraphListView extends LocatableVLayout implements ResourceSelectLis
// addMember(loadingLabel);
- addMember(new UserPreferencesMeasurementRangeEditor(this.getLocatorId()));
+ addMember(new UserPreferencesMeasurementRangeEditor());
if (resource != null) {
buildGraphs();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
index 72c658e..841afc3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
@@ -48,6 +48,7 @@ import com.smartgwt.client.types.AnimationEffect;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.WidgetCanvas;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
@@ -64,7 +65,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWidgetCanvas;
/**
* @author Greg Hinkle
@@ -86,12 +86,12 @@ public class LiveGraphView extends LocatableVLayout {
@SuppressWarnings("unused")
private long min, max;
- public LiveGraphView(String locatorId) {
- super(locatorId);
+ public LiveGraphView() {
+ super();
}
public LiveGraphView(String locatorId, int resourceId, MeasurementDefinition def) {
- super(locatorId);
+ super();
this.resourceId = resourceId;
this.definition = def;
setHeight100();
@@ -205,7 +205,7 @@ public class LiveGraphView extends LocatableVLayout {
addMember(title);
}
- addMember(new LocatableWidgetCanvas(this.getLocatorId(), plot));
+ addMember(new WidgetCanvas(plot));
}
private String getHover(PlotItem item) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java
index 4d405e5..45a169f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java
@@ -81,7 +81,7 @@ public class ResourceAvailabilityView extends LocatableVLayout {
private StaticTextItem currentTimeField;
public ResourceAvailabilityView(String locatorId, ResourceComposite resourceComposite) {
- super(locatorId);
+ super();
this.resourceComposite = resourceComposite;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
index f6414f6..8a415ac 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
@@ -31,6 +31,7 @@ import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.CloseClickEvent;
import com.smartgwt.client.widgets.events.CloseClickHandler;
+import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -44,7 +45,6 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.summary.AbstractActivityView.ChartViewWindow;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
/**
* Views a resource's measurements in a tabular view.
@@ -56,7 +56,7 @@ public class MeasurementTableView extends Table<MeasurementTableDataSource> {
private final int resourceId;
public MeasurementTableView(String locatorId, int resourceId) {
- super(locatorId);
+ super();
this.resourceId = resourceId;
setDataSource(new MeasurementTableDataSource(resourceId));
}
@@ -64,8 +64,8 @@ public class MeasurementTableView extends Table<MeasurementTableDataSource> {
protected void configureTable() {
ArrayList<ListGridField> fields = getDataSource().getListGridFields();
setListGridFields(fields.toArray(new ListGridField[0]));
- addExtraWidget(new UserPreferencesMeasurementRangeEditor(extendLocatorId("range")), true);
- addTableAction(extendLocatorId("liveValue"), MSG.view_measureTable_getLive(), new TableAction() {
+ addExtraWidget(new UserPreferencesMeasurementRangeEditor(), true);
+ addTableAction(MSG.view_measureTable_getLive(), new TableAction() {
@Override
public boolean isEnabled(ListGridRecord[] selection) {
return selection != null && selection.length > 0;
@@ -137,7 +137,7 @@ public class MeasurementTableView extends Table<MeasurementTableDataSource> {
}
});
//add chart selected metric action
- addTableAction(extendLocatorId("chartValues"), MSG.view_measureTable_chartMetricValues(), new TableAction() {
+ addTableAction(MSG.view_measureTable_chartMetricValues(), new TableAction() {
@Override
public boolean isEnabled(ListGridRecord[] selection) {
return selection != null && selection.length > 0;
@@ -172,7 +172,7 @@ public class MeasurementTableView extends Table<MeasurementTableDataSource> {
for (int mId : definitionIds) {
destination += "&m=" + mId;
}
- ChartViewWindow window = new ChartViewWindow(extendLocatorId("ChartWindow"), "");
+ ChartViewWindow window = new ChartViewWindow("");
//generate and include iframed content
FullHTMLPane iframe = new FullHTMLPane(destination);
window.addItem(iframe);
@@ -205,7 +205,7 @@ public class MeasurementTableView extends Table<MeasurementTableDataSource> {
}
});
- LocatableListGrid liveDataGrid = new LocatableListGrid(extendLocatorId("liveDataListGrid"));
+ ListGrid liveDataGrid = new ListGrid();
liveDataGrid.setShowAllRecords(true);
liveDataGrid.setData(records.toArray(new ListGridRecord[records.size()]));
liveDataGrid.setSelectionType(SelectionStyle.NONE);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDetailView.java
index bac2d47..4de4ce7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsDetailView.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits;
import com.smartgwt.client.data.Criteria;
+
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListDetailView;
@@ -28,9 +29,8 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasuremen
* @author Ian Springer
*/
public class TraitsDetailView extends AbstractMeasurementDataTraitListDetailView {
- public TraitsDetailView(String locatorId, int resourceId, int definitionId) {
- super(locatorId, null, new TraitsDataSource(), createCriteria(resourceId, definitionId)
- );
+ public TraitsDetailView(int resourceId, int definitionId) {
+ super(null, new TraitsDataSource(), createCriteria(resourceId, definitionId));
}
private static Criteria createCriteria(int resourceId, int definitionId) {
@@ -46,6 +46,5 @@ public class TraitsDetailView extends AbstractMeasurementDataTraitListDetailView
protected void configureTable() {
super.configureTable();
-
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java
index 5f56c14..3fe81a1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java
@@ -31,6 +31,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.SelectionStyle;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -41,7 +42,6 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListView;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
/**
* The Resource Monitoring>Traits subtab.
@@ -58,7 +58,7 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
@Override
public Canvas getDetailsView(Integer definitionId) {
- return new TraitsDetailView(extendLocatorId("Detail"), this.resourceId, definitionId);
+ return new TraitsDetailView(this.resourceId, definitionId);
}
@Override
@@ -132,8 +132,8 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
}
@Override
- protected LocatableListGrid decorateLiveDataGrid(List<ListGridRecord> records) {
- LocatableListGrid liveDataGrid = new LocatableListGrid(extendLocatorId("liveDataListGrid"));
+ protected ListGrid decorateLiveDataGrid(List<ListGridRecord> records) {
+ ListGrid liveDataGrid = new ListGrid();
liveDataGrid.setShowAllRecords(true);
liveDataGrid.setData(records.toArray(new ListGridRecord[records.size()]));
liveDataGrid.setSelectionType(SelectionStyle.NONE);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
index 4e4a361..ea0ac97 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
@@ -54,17 +54,17 @@ public class ResourceOperationHistoryDetailsView extends AbstractOperationHistor
@SuppressWarnings("unused")
private ResourceComposite resourceComposite;
- public ResourceOperationHistoryDetailsView(String locatorId) {
- this(locatorId, false);
+ public ResourceOperationHistoryDetailsView() {
+ this(false);
}
- public ResourceOperationHistoryDetailsView(String locatorId, ResourceComposite resourceComposite) {
- this(locatorId);
+ public ResourceOperationHistoryDetailsView(ResourceComposite resourceComposite) {
+ this(false);
this.resourceComposite = resourceComposite;
}
- public ResourceOperationHistoryDetailsView(String locatorId, boolean showResourceField) {
- super(locatorId);
+ public ResourceOperationHistoryDetailsView(boolean showResourceField) {
+ super();
this.showResourceField = showResourceField;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryListView.java
index a222b73..c29e1f3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryListView.java
@@ -35,8 +35,8 @@ public class ResourceOperationHistoryListView extends OperationHistoryView {
private ResourceComposite resourceComposite;
- public ResourceOperationHistoryListView(String locatorId, ResourceComposite resourceComposite) {
- super(locatorId, null, EntityContext.forResource(resourceComposite.getResource().getId()));
+ public ResourceOperationHistoryListView(ResourceComposite resourceComposite) {
+ super(null, EntityContext.forResource(resourceComposite.getResource().getId()));
this.resourceComposite = resourceComposite;
}
@@ -48,7 +48,7 @@ public class ResourceOperationHistoryListView extends OperationHistoryView {
@Override
public Canvas getDetailsView(Integer id) {
- return new ResourceOperationHistoryDetailsView(this.extendLocatorId("DetailsView"));
+ return new ResourceOperationHistoryDetailsView();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
index 00f72ae..88cbbd1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
@@ -12,9 +12,9 @@ public class ResourceOperationScheduleDetailsView extends AbstractOperationSched
private ResourceComposite resourceComposite;
- public ResourceOperationScheduleDetailsView(String locatorId, ResourceComposite resourceComposite, int scheduleId) {
- super(locatorId, new ResourceOperationScheduleDataSource(resourceComposite),
- resourceComposite.getResource().getResourceType(), scheduleId);
+ public ResourceOperationScheduleDetailsView(ResourceComposite resourceComposite, int scheduleId) {
+ super(new ResourceOperationScheduleDataSource(resourceComposite), resourceComposite.getResource()
+ .getResourceType(), scheduleId);
this.resourceComposite = resourceComposite;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
index 859747a..55be11a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
@@ -47,8 +47,7 @@ public class ResourceOperationScheduleListView extends AbstractOperationSchedule
@Override
public Canvas getDetailsView(Integer scheduleId) {
- return new ResourceOperationScheduleDetailsView(extendLocatorId("DetailsView"), this.resourceComposite,
- scheduleId);
+ return new ResourceOperationScheduleDetailsView(this.resourceComposite, scheduleId);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
index 4d17c70..2dda7b6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
@@ -66,7 +66,7 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
private boolean isInitialized = false;
public ActivityView(String locatorId, ResourceComposite resourceComposite) {
- super(locatorId);
+ super();
this.resourceComposite = resourceComposite;
}
@@ -115,7 +115,7 @@ public class ActivityView extends LocatableVLayout implements DashboardContainer
EntityContext.forResource(resourceComposite.getResource().getId()), resourceComposite);
addMember(dashboardView);
- footer = new LocatableToolStrip(extendLocatorId("Footer"));
+ footer = new LocatableToolStrip();
footer.setPadding(5);
footer.setWidth100();
footer.setMembersMargin(15);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java
index c1b6281..87057c9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java
@@ -34,7 +34,7 @@ public class TimelineView extends LocatableVLayout {
private final ResourceComposite resourceComposite;
public TimelineView(String locatorId, ResourceComposite resourceComposite) {
- super(locatorId);
+ super();
this.resourceComposite = resourceComposite;
setMargin(10);
@@ -49,7 +49,7 @@ public class TimelineView extends LocatableVLayout {
// we create a simple subclass because we need to know when a new range has been set in order to refresh the timeline
class RangeEditor extends UserPreferencesMeasurementRangeEditor {
RangeEditor(String editorLocatorId) {
- super(editorLocatorId);
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
index 5aed463..309b8f5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/discovery/ResourceAutodiscoveryView.java
@@ -59,7 +59,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.util.TableUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -101,7 +100,7 @@ public class ResourceAutodiscoveryView extends LocatableVLayout implements Refre
protected void onInit() {
super.onInit();
- treeGrid = new LocatableTreeGrid(this.getLocatorId());
+ treeGrid = new TreeGrid();
treeGrid.setHeight100();
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 baa91a2..b29a93a 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
@@ -41,8 +41,8 @@ public class PluginTypeTreeView extends LocatableVLayout {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
- public PluginTypeTreeView(String locatorId) {
- super(locatorId);
+ public PluginTypeTreeView() {
+ super();
setWidth100();
setHeight100();
}
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 9a6375b..8e9b5f5 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
@@ -32,7 +32,6 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceTypeGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -42,8 +41,8 @@ public class ResourceTypeTreeView extends LocatableVLayout {
private ResourceTypeGWTServiceAsync resourceTypeService = GWTServiceLookup.getResourceTypeGWTService();
- public ResourceTypeTreeView(String locatorId) {
- super(locatorId);
+ public ResourceTypeTreeView() {
+ super();
setWidth100();
setHeight100();
@@ -53,7 +52,7 @@ public class ResourceTypeTreeView extends LocatableVLayout {
protected void onDraw() {
super.onDraw();
- final TreeGrid treeGrid = new CustomResourceTypeTreeGrid(this.getLocatorId());
+ final TreeGrid treeGrid = new CustomResourceTypeTreeGrid();
treeGrid.setHeight100();
@@ -87,10 +86,10 @@ public class ResourceTypeTreeView extends LocatableVLayout {
});
}
- public static class CustomResourceTypeTreeGrid extends LocatableTreeGrid {
+ public static class CustomResourceTypeTreeGrid extends TreeGrid {
- public CustomResourceTypeTreeGrid(String locatorId) {
- super(locatorId);
+ public CustomResourceTypeTreeGrid() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index 0833997..02aabbd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -46,7 +46,6 @@ import org.rhq.enterprise.gui.coregui.client.help.HelpView;
import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView;
import org.rhq.enterprise.gui.coregui.client.report.ReportTopView;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHStack;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
@@ -61,10 +60,10 @@ public class MenuBarView extends LocatableVLayout {
public static final ViewName LOGOUT_VIEW_ID = new ViewName("LogOut", MSG.view_menuBar_logout());
private String currentlySelectedSection = DashboardsView.VIEW_ID.getName();
- private LocatableLabel userLabel;
+ private Label userLabel;
- public MenuBarView(String locatorId) {
- super(locatorId);
+ public MenuBarView() {
+ super();
}
protected void onDraw() {
@@ -124,7 +123,7 @@ public class MenuBarView extends LocatableVLayout {
layout.setMargin(10);
layout.setAlign(Alignment.RIGHT);
- userLabel = new LocatableLabel(this.extendLocatorId("User"), UserSessionManager.getSessionSubject().getName());
+ userLabel = new Label(UserSessionManager.getSessionSubject().getName());
userLabel.setAutoWidth();
Label lineLabel = new Label(" | ");
@@ -133,7 +132,7 @@ public class MenuBarView extends LocatableVLayout {
String contents = "<a href='#" + LOGOUT_VIEW_ID.getName() + "' style='white-space: nowrap'>"
+ LOGOUT_VIEW_ID.getTitle() + "</a>";
- LocatableLabel logoutLink = new LocatableLabel(this.extendLocatorId("LogoutLink"), contents);
+ Label logoutLink = new Label(contents);
logoutLink.setAutoWidth();
layout.addMember(userLabel);
@@ -147,7 +146,7 @@ public class MenuBarView extends LocatableVLayout {
private final Map<String, VLayout> sectionNameToLinkVLayoutMap = new HashMap<String, VLayout>();
LinkBar() {
- super(MenuBarView.this.extendLocatorId("LinkBar"));
+ super();
setWidth100();
setHeight100();
@@ -164,7 +163,7 @@ public class MenuBarView extends LocatableVLayout {
String contents = "<a class='menuBar' href='#" + sectionName.getName() + "'>" + sectionName.getTitle()
+ "</a>";
- LocatableLabel link = new LocatableLabel(extendLocatorId(sectionName.getName()), contents);
+ Label link = new Label(contents);
link.setAutoHeight();
link.setAlign(Alignment.CENTER);
link.setStyleName("inheritColor");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java
index b9a91a8..578962b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryView.java
@@ -91,20 +91,19 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc
}
// for subsystem views
- public OperationHistoryView(String locatorId) {
- this(locatorId, SUBSYSTEM_VIEW_ID.getTitle(), EntityContext.forSubsystemView(), false);
+ public OperationHistoryView() {
+ this(SUBSYSTEM_VIEW_ID.getTitle(), EntityContext.forSubsystemView(), false);
}
- public OperationHistoryView(String locatorId, EntityContext entityContext) {
- this(locatorId, SUBSYSTEM_VIEW_ID.getTitle(), entityContext, false);
+ public OperationHistoryView(EntityContext entityContext) {
+ this(SUBSYSTEM_VIEW_ID.getTitle(), entityContext, false);
}
- public OperationHistoryView(String locatorId, String tableTitle, EntityContext entityContext) {
- this(locatorId, tableTitle, entityContext, false);
+ public OperationHistoryView(String tableTitle, EntityContext entityContext) {
+ this(tableTitle, entityContext, false);
}
- protected OperationHistoryView(String locatorId, String tableTitle, EntityContext context,
- boolean hasControlPermission) {
+ protected OperationHistoryView(String tableTitle, EntityContext context, boolean hasControlPermission) {
super(tableTitle, INITIAL_CRITERIA, new SortSpecifier[] { DEFAULT_SORT_SPECIFIER });
this.context = context;
this.hasControlPermission = hasControlPermission;
@@ -288,7 +287,7 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc
@Override
public Canvas getDetailsView(Integer id) {
- return new ResourceOperationHistoryDetailsView(extendLocatorId("Detail"));
+ return new ResourceOperationHistoryDetailsView();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
index 0ade877..6b5f110 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
@@ -22,6 +22,11 @@
*/
package org.rhq.enterprise.gui.coregui.client.report;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -30,9 +35,14 @@ import com.smartgwt.client.data.Record;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
-import com.smartgwt.client.widgets.grid.*;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+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 com.smartgwt.client.widgets.grid.events.RecordClickHandler;
+
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
@@ -58,11 +68,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
/**
* A tabular report that shows alert definitions on all resources in inventory.
*
@@ -70,12 +75,11 @@ import java.util.Map;
*/
public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.DataSource> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("AlertDefinitions",
- MSG.view_reports_alertDefinitions(), IconEnum.ALERT_DEFINITIONS);
-
+ public static final ViewName VIEW_ID = new ViewName("AlertDefinitions", MSG.view_reports_alertDefinitions(),
+ IconEnum.ALERT_DEFINITIONS);
- public AlertDefinitionReportView(String locatorId ) {
- super(locatorId);
+ public AlertDefinitionReportView() {
+ super();
setDataSource(new DataSource());
}
@@ -106,7 +110,7 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
}
private void addExportAction() {
- addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() {
+ addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() {
@Override
public boolean isEnabled(ListGridRecord[] selection) {
return enableIfRecordsExist(getListGrid());
@@ -225,7 +229,8 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
int typeId = result.get(0).getResourceType().getId();
CoreGUI.goToView(LinkManager.getAdminTemplatesEditLink(
AlertDefinitionTemplateTypeView.VIEW_ID.getName(), typeId)
- + "/" + templateId);
+ + "/"
+ + templateId);
}
}
@@ -236,7 +241,6 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
}
});
-
} else if (alertDef.getParentId() != null && alertDef.getParentId() == 0) {
// handle "View Group Definition"
int resourceId = alertDef.getResource().getId();
@@ -244,8 +248,8 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
CoreGUI.goToView(LinkManager.getSubsystemAlertDefinitionLink(resourceId, alertDefId));
} else if (alertDef.getGroupAlertDefinition() != null) {
AlertDefinition groupAlertDef = alertDef.getGroupAlertDefinition();
- CoreGUI.goToView(LinkManager.getEntityTabLink(EntityContext.forGroup(groupAlertDef
- .getResourceGroup()), "Alert", "Definitions")
+ CoreGUI.goToView(LinkManager.getEntityTabLink(
+ EntityContext.forGroup(groupAlertDef.getResourceGroup()), "Alert", "Definitions")
+ "/" + groupAlertDef.getId());
}
@@ -256,8 +260,7 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
ListGridField resourceField = new ListGridField(FIELD_RESOURCE, MSG.common_title_resource());
resourceField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord listGridRecord, int i, int i1) {
- String url = LinkManager
- .getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
+ String url = LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
return SeleniumUtility.getLocatableHref(url, StringUtility.escapeHtml(value.toString()), null);
}
});
@@ -359,8 +362,7 @@ public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.D
record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper);
// Build the decoded ancestry Strings now for display
- record
- .setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil.getAncestryValue(record));
+ record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_VALUE, AncestryUtil.getAncestryValue(record));
}
response.setData(records);
response.setTotalRows(result.getTotalSize()); // for paging to work we have to specify size of full result set
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
index 3576693..55fa1a6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
@@ -86,10 +86,10 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
@Override
protected VLayout defaultView() {
- LocatableVLayout vLayout = new LocatableVLayout(this.extendLocatorId("Default"));
+ LocatableVLayout vLayout = new LocatableVLayout();
vLayout.setWidth100();
- TitleBar titleBar = new TitleBar(this, MSG.view_reportsTop_title(), IconEnum.REPORT.getIcon24x24Path());
+ TitleBar titleBar = new TitleBar(MSG.view_reportsTop_title(), IconEnum.REPORT.getIcon24x24Path());
vLayout.addMember(titleBar);
Label label = new Label(MSG.view_reportsTop_description());
@@ -102,51 +102,47 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildSubsystemsSection() {
NavigationItem tagItem = new NavigationItem(TaggedView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new TaggedView(extendLocatorId(TaggedView.VIEW_ID.getName()));
+ return new TaggedView();
}
});
NavigationItem suspectMetricsItem = new NavigationItem(MeasurementOOBView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new MeasurementOOBView(extendLocatorId(MeasurementOOBView.VIEW_ID.getName()));
+ return new MeasurementOOBView();
}
});
NavigationItem recentConfigurationChangesItem = new NavigationItem(
ResourceConfigurationHistoryListView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new SubsystemConfigurationHistoryListView(
- extendLocatorId(ResourceConfigurationHistoryListView.VIEW_ID.getName()), getGlobalPermissions()
- .contains(Permission.MANAGE_INVENTORY));
+ return new SubsystemConfigurationHistoryListView(getGlobalPermissions().contains(
+ Permission.MANAGE_INVENTORY));
}
});
NavigationItem recentOperationsItem = new NavigationItem(OperationHistoryView.SUBSYSTEM_VIEW_ID,
new ViewFactory() {
public Canvas createView() {
- return new SubsystemOperationHistoryListView(
- extendLocatorId(OperationHistoryView.SUBSYSTEM_VIEW_ID.getName()), getGlobalPermissions()
- .contains(Permission.MANAGE_INVENTORY));
+ return new SubsystemOperationHistoryListView(getGlobalPermissions().contains(
+ Permission.MANAGE_INVENTORY));
}
});
NavigationItem recentAlertsItem = new NavigationItem(AlertHistoryView.SUBSYSTEM_VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new SubsystemRecentAlertsView(extendLocatorId(AlertHistoryView.SUBSYSTEM_VIEW_ID.getName()),
- getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
+ return new SubsystemRecentAlertsView(getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
}
});
NavigationItem alertDefinitionsItem = new NavigationItem(AlertDefinitionReportView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new AlertDefinitionReportView(extendLocatorId(AlertDefinitionReportView.VIEW_ID.getName()));
+ return new AlertDefinitionReportView();
}
});
NavigationItem recentDriftsItem = new NavigationItem(DriftHistoryView.SUBSYSTEM_VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new SubsystemResourceDriftView(extendLocatorId(DriftHistoryView.SUBSYSTEM_VIEW_ID.getName()),
- getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
+ return new SubsystemResourceDriftView(getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
}
});
@@ -165,7 +161,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildInventorySection() {
NavigationItem inventorySummaryItem = new NavigationItem(ResourceInstallReport.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new ResourceInstallReport(extendLocatorId(ResourceInstallReport.VIEW_ID.getName()));
+ return new ResourceInstallReport();
}
}, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
@@ -177,7 +173,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView {
NavigationItem driftComplianceItem = new NavigationItem(DriftComplianceReport.VIEW_ID, new ViewFactory() {
public Canvas createView() {
- return new DriftComplianceReport(extendLocatorId(DriftComplianceReport.VIEW_ID.getName()));
+ return new DriftComplianceReport();
}
}, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java
index 8592404..1e56c2a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/alert/SubsystemRecentAlertsView.java
@@ -1,14 +1,15 @@
package org.rhq.enterprise.gui.coregui.client.report.alert;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
import org.rhq.enterprise.gui.coregui.client.alert.SubsystemResourceAlertView;
import org.rhq.enterprise.gui.coregui.client.components.ReportExporter;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
public class SubsystemRecentAlertsView extends SubsystemResourceAlertView {
- public SubsystemRecentAlertsView(String locatorId, boolean hasWriteAccess) {
- super(locatorId, hasWriteAccess);
+ public SubsystemRecentAlertsView(boolean hasWriteAccess) {
+ super(hasWriteAccess);
}
@Override
@@ -18,7 +19,7 @@ public class SubsystemRecentAlertsView extends SubsystemResourceAlertView {
}
private void addExportAction() {
- addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() {
+ addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() {
@Override
public boolean isEnabled(ListGridRecord[] selection) {
return enableIfRecordsExist(getListGrid());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java
index 269b222..c82d837 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/configuration/SubsystemConfigurationHistoryListView.java
@@ -1,6 +1,7 @@
package org.rhq.enterprise.gui.coregui.client.report.configuration;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
import org.rhq.enterprise.gui.coregui.client.components.ReportExporter;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView;
@@ -8,8 +9,8 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configura
public class SubsystemConfigurationHistoryListView extends ResourceConfigurationHistoryListView {
- public SubsystemConfigurationHistoryListView(String locatorId, boolean hasWritePerm ) {
- super(locatorId, hasWritePerm);
+ public SubsystemConfigurationHistoryListView(boolean hasWritePerm) {
+ super(hasWritePerm);
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java
index 9796146..c659a18 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReport.java
@@ -47,8 +47,8 @@ public class DriftComplianceReport extends LocatableVLayout implements Bookmarka
private ResourceSearchView resourceList;
- public DriftComplianceReport(String locatorId ) {
- super(locatorId);
+ public DriftComplianceReport() {
+ super();
setHeight100();
setWidth100();
}
@@ -74,7 +74,7 @@ public class DriftComplianceReport extends LocatableVLayout implements Bookmarka
@Override
protected void onInit() {
super.onInit();
- addMember(new DriftComplianceReportTable(extendLocatorId("table")));
+ addMember(new DriftComplianceReportTable());
}
protected Criteria createResourceSearchViewCriteria(int resourceTypeId) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReportTable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReportTable.java
index e9b933c..d25e0d2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReportTable.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/DriftComplianceReportTable.java
@@ -34,8 +34,8 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager;
*/
public class DriftComplianceReportTable extends InventorySummaryReportTable {
- public DriftComplianceReportTable(String locatorId) {
- super(locatorId);
+ public DriftComplianceReportTable() {
+ super();
setDataSource(new DriftComplianceDataSource());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/InventorySummaryReportTable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/InventorySummaryReportTable.java
index 6f97a30..b39bbc2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/InventorySummaryReportTable.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/InventorySummaryReportTable.java
@@ -42,8 +42,8 @@ import java.util.List;
*/
public class InventorySummaryReportTable extends Table<InventorySummaryDataSource> {
- public InventorySummaryReportTable(String locatorId) {
- super(locatorId);
+ public InventorySummaryReportTable() {
+ super();
setDataSource(new InventorySummaryDataSource());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java
index ca6dc8b..abe2051 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/inventory/ResourceInstallReport.java
@@ -41,12 +41,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*/
public class ResourceInstallReport extends LocatableVLayout implements BookmarkableView, HasViewName {
- public static final ViewName VIEW_ID = new ViewName("InventorySummary", MSG.common_title_inventorySummary(), IconEnum.INVENTORY_SUMMARY);
+ public static final ViewName VIEW_ID = new ViewName("InventorySummary", MSG.common_title_inventorySummary(),
+ IconEnum.INVENTORY_SUMMARY);
private ResourceSearchView resourceList;
- public ResourceInstallReport(String locatorId ) {
- super(locatorId);
+ public ResourceInstallReport() {
+ super();
setHeight100();
setWidth100();
}
@@ -72,7 +73,7 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka
@Override
protected void onInit() {
super.onInit();
- addMember(new InventorySummaryReportTable(extendLocatorId("table")));
+ addMember(new InventorySummaryReportTable());
}
protected Criteria createResourceSearchViewCriteria(int resourceTypeId) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java
index 5bba112..19b0e8c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java
@@ -39,8 +39,8 @@ public class MeasurementOOBView extends Table<MeasurementOOBDataSource> implemen
public static final ViewName VIEW_ID = new ViewName("SuspectMetrics", MSG.view_measurementOob_title(), IconEnum.SUSPECT_METRICS);
- public MeasurementOOBView(String locatorId) {
- super(locatorId);
+ public MeasurementOOBView() {
+ super();
setDataSource(new MeasurementOOBDataSource());
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java
index 0fb6133..a8ad78c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/operation/SubsystemOperationHistoryListView.java
@@ -20,6 +20,7 @@
package org.rhq.enterprise.gui.coregui.client.report.operation;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
import org.rhq.core.domain.common.EntityContext;
import org.rhq.enterprise.gui.coregui.client.components.ReportExporter;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
@@ -31,10 +32,8 @@ import org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryView;
*/
public class SubsystemOperationHistoryListView extends OperationHistoryView {
-
- public SubsystemOperationHistoryListView(String locatorId, boolean hasControlPermission ) {
- super(locatorId, OperationHistoryView.SUBSYSTEM_VIEW_ID.getTitle(), EntityContext.forSubsystemView(),
- hasControlPermission);
+ public SubsystemOperationHistoryListView(boolean hasControlPermission) {
+ super(OperationHistoryView.SUBSYSTEM_VIEW_ID.getTitle(), EntityContext.forSubsystemView(), hasControlPermission);
}
@Override
@@ -44,7 +43,7 @@ public class SubsystemOperationHistoryListView extends OperationHistoryView {
}
private void addExportAction() {
- addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() {
+ addTableAction("Export", MSG.common_button_reports_export(), new AbstractTableAction() {
@Override
public boolean isEnabled(ListGridRecord[] selection) {
return enableIfRecordsExist(getListGrid());
@@ -62,5 +61,4 @@ public class SubsystemOperationHistoryListView extends OperationHistoryView {
});
}
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
index afbc89b..1bc199e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java
@@ -161,7 +161,7 @@ public class TagCloudView extends LocatableVLayout {
*/
public IButton getDeleteButton() {
if (this.deleteButton == null) {
- final IButton button = new DeleteButton(extendLocatorId("deleteButton"));
+ final IButton button = new DeleteButton();
button.setIcon(REMOVE_ICON);
button.setIconWidth(16);
button.setIconHeight(16);
@@ -210,8 +210,8 @@ public class TagCloudView extends LocatableVLayout {
}
class DeleteButton extends EnhancedIButton {
- public DeleteButton(String locatorId) {
- super(locatorId);
+ public DeleteButton() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index 071fd37..543be5b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -68,8 +68,8 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView, Ha
private int selectedTabNum = 0;
private Set<Permission> globalPermissions;
- public TaggedView(String locatorId) {
- super(locatorId);
+ public TaggedView() {
+ super();
setWidth100();
setHeight100();
}
@@ -119,15 +119,14 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView, Ha
Tab tab;
- BundlesListView bundlesView = new BundlesListView(extendLocatorId("bundleListView"), criteria, null);
+ BundlesListView bundlesView = new BundlesListView(criteria, null);
viewsWithTags.add(bundlesView);
tab = new LocatableTab(extendLocatorId("bundleList"), MSG.view_bundle_bundles());
tab.setIcon(ImageManager.getBundleIcon());
tab.setPane(bundlesView);
container.addTab(tab);
- BundleVersionListView bundleVersionListView = new BundleVersionListView(
- extendLocatorId("bundleVersionListView"), criteria);
+ BundleVersionListView bundleVersionListView = new BundleVersionListView(criteria);
viewsWithTags.add(bundleVersionListView);
tab = new LocatableTab(extendLocatorId("bundleVersionList"), MSG.view_bundle_bundleVersions());
tab.setIcon("subsystems/bundle/BundleVersion_16.png");
@@ -143,8 +142,7 @@ public class TaggedView extends LocatableVLayout implements BookmarkableView, Ha
tab.setPane(bundleDeploymentListView);
container.addTab(tab);
- BundleDestinationListView bundleDestinationListView = new BundleDestinationListView(
- extendLocatorId("bundleDestinationListView"), criteria);
+ BundleDestinationListView bundleDestinationListView = new BundleDestinationListView(criteria);
viewsWithTags.add(bundleDestinationListView);
tab = new LocatableTab(extendLocatorId("bundleDestinationsList"), MSG.view_bundle_bundleDestinations());
tab.setIcon("subsystems/bundle/BundleDestination_16.png");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java
index 909335e..684d9d5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestDataSourceResponseStatisticsView.java
@@ -148,69 +148,66 @@ public class TestDataSourceResponseStatisticsView extends Table {
getListGrid().setFields(timestamp, reqId, status, totalRows, startRow, endRow);
refresh();
- addTableAction("Toggle On/Off", MSG.common_msg_areYouSure(),
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- boolean toBeEnabled = !DataSourceResponseStatistics.isEnableCollection();
- DataSourceResponseStatistics.setEnableCollection(toBeEnabled);
-
- if (!toBeEnabled) {
- // disabling collection - no need to periodically refresh anymore so cancel timers
- refreshTimer.cancel();
- refreshOnPageChange = false;
- timerTitleString = null;
- }
-
- updateTitleCanvas(getTableTitle());
- if (window != null) {
- window.setTitle(getTableTitle());
- }
- refresh();
+ addTableAction("Toggle On/Off", MSG.common_msg_areYouSure(), new AbstractTableAction(
+ TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ boolean toBeEnabled = !DataSourceResponseStatistics.isEnableCollection();
+ DataSourceResponseStatistics.setEnableCollection(toBeEnabled);
+
+ if (!toBeEnabled) {
+ // disabling collection - no need to periodically refresh anymore so cancel timers
+ refreshTimer.cancel();
+ refreshOnPageChange = false;
+ timerTitleString = null;
}
- });
- addTableAction(MSG.common_button_delete_all(), MSG.common_msg_areYouSure(),
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- DataSourceResponseStatistics.clearAll();
- refresh();
+ updateTitleCanvas(getTableTitle());
+ if (window != null) {
+ window.setTitle(getTableTitle());
}
- });
+ refresh();
+ }
+ });
- addTableAction(extendLocatorId("export"), "Export To CSV",
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- StringBuilder csv = new StringBuilder();
- csv.append(FIELD_TIMESTAMP).append(',') //
- .append(FIELD_REQUEST_ID).append(',') //
- .append(FIELD_STATUS).append(',') //
- .append(FIELD_TOTAL_ROWS).append(',') //
- .append(FIELD_START_ROW).append(',') //
- .append(FIELD_END_ROW).append('\n');
-
- RecordList records = getListGrid().getDataAsRecordList();
- int recordsSize = records.getLength();
- for (int i = 0; i < recordsSize; i++) {
- Record record = records.get(i);
- csv.append(record.getAttributeAsDate(FIELD_TIMESTAMP)).append(',') //
- .append(record.getAttribute(FIELD_REQUEST_ID)).append(',') //
- .append(record.getAttribute(FIELD_STATUS)).append(',') //
- .append(record.getAttribute(FIELD_TOTAL_ROWS)).append(',') //
- .append(record.getAttribute(FIELD_START_ROW)).append(',') //
- .append(record.getAttribute(FIELD_END_ROW)).append('\n');
- }
+ addTableAction(MSG.common_button_delete_all(), MSG.common_msg_areYouSure(), new AbstractTableAction(
+ TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ DataSourceResponseStatistics.clearAll();
+ refresh();
+ }
+ });
- new MessageWindow("Export To CSV", "<pre>" + csv.toString() + "</pre>")
- .show();
- refresh();
+ addTableAction("Export To CSV", new AbstractTableAction(TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ StringBuilder csv = new StringBuilder();
+ csv.append(FIELD_TIMESTAMP).append(',') //
+ .append(FIELD_REQUEST_ID).append(',') //
+ .append(FIELD_STATUS).append(',') //
+ .append(FIELD_TOTAL_ROWS).append(',') //
+ .append(FIELD_START_ROW).append(',') //
+ .append(FIELD_END_ROW).append('\n');
+
+ RecordList records = getListGrid().getDataAsRecordList();
+ int recordsSize = records.getLength();
+ for (int i = 0; i < recordsSize; i++) {
+ Record record = records.get(i);
+ csv.append(record.getAttributeAsDate(FIELD_TIMESTAMP)).append(',') //
+ .append(record.getAttribute(FIELD_REQUEST_ID)).append(',') //
+ .append(record.getAttribute(FIELD_STATUS)).append(',') //
+ .append(record.getAttribute(FIELD_TOTAL_ROWS)).append(',') //
+ .append(record.getAttribute(FIELD_START_ROW)).append(',') //
+ .append(record.getAttribute(FIELD_END_ROW)).append('\n');
}
- });
- addTableAction(extendLocatorId("refresh"), MSG.common_button_refresh(), new AbstractTableAction(
- TableActionEnablement.ALWAYS) {
+ new MessageWindow("Export To CSV", "<pre>" + csv.toString() + "</pre>").show();
+ refresh();
+ }
+ });
+
+ addTableAction(MSG.common_button_refresh(), new AbstractTableAction(TableActionEnablement.ALWAYS) {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
refresh();
@@ -236,43 +233,41 @@ public class TestDataSourceResponseStatisticsView extends Table {
}
});
- addTableAction("Refresh Timer", null, timerValues,
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
-
- Integer timeout = (Integer) actionValue;
-
- // if being asked to refresh now, just refresh but don't touch our schedules
- if (timeout == null || timeout.intValue() == -2) {
- refresh();
- return;
- }
-
- // cancel everything - will reinstate if user elected to do one of these
- refreshTimer.cancel();
- refreshOnPageChange = false;
-
- if (timeout.intValue() == -1) {
- timerTitleString = null;
- } else if (timeout.intValue() == 0) {
- refreshOnPageChange = true;
- timerTitleString = " (refresh on page change)";
- } else {
- refreshTimer.scheduleRepeating(timeout.intValue() * 1000);
- timerTitleString = " (refresh every " + timeout + "s)";
- }
-
- updateTitleCanvas(getTableTitle());
- if (window != null) {
- window.setTitle(getTableTitle());
- }
- refreshTableInfo();
+ addTableAction("Refresh Timer", null, timerValues, new AbstractTableAction(TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+
+ Integer timeout = (Integer) actionValue;
+
+ // if being asked to refresh now, just refresh but don't touch our schedules
+ if (timeout == null || timeout.intValue() == -2) {
+ refresh();
+ return;
+ }
+
+ // cancel everything - will reinstate if user elected to do one of these
+ refreshTimer.cancel();
+ refreshOnPageChange = false;
+
+ if (timeout.intValue() == -1) {
+ timerTitleString = null;
+ } else if (timeout.intValue() == 0) {
+ refreshOnPageChange = true;
+ timerTitleString = " (refresh on page change)";
+ } else {
+ refreshTimer.scheduleRepeating(timeout.intValue() * 1000);
+ timerTitleString = " (refresh every " + timeout + "s)";
+ }
+
+ updateTitleCanvas(getTableTitle());
+ if (window != null) {
+ window.setTitle(getTableTitle());
}
- });
+ refreshTableInfo();
+ }
+ });
} else { // not in the standalone window
- addTableAction("Show In Window", new AbstractTableAction(
- TableActionEnablement.ALWAYS) {
+ addTableAction("Show In Window", new AbstractTableAction(TableActionEnablement.ALWAYS) {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
new StatisticsWindow().show();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java
index ce8cfe4..26c5511 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestMessageCenterView.java
@@ -39,8 +39,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class TestMessageCenterView extends LocatableVLayout {
- public TestMessageCenterView(String locatorId) {
- super(locatorId);
+ public TestMessageCenterView() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java
index c4fc053..5797bf1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestNumberFormatView.java
@@ -37,8 +37,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
public class TestNumberFormatView extends LocatableVLayout {
- public TestNumberFormatView(String locatorId) {
- super(locatorId);
+ public TestNumberFormatView() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java
index 17fca09..b260d2c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestRemoteServiceStatisticsView.java
@@ -122,40 +122,38 @@ public class TestRemoteServiceStatisticsView extends Table {
}
});
- addTableAction(extendLocatorId("export"), "Export To CSV",
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- StringBuilder csv = new StringBuilder();
- csv.append(FIELD_SERVICENAME).append(',') //
- .append(FIELD_METHODNAME).append(',') //
- .append(FIELD_COUNT).append(',') //
- .append(FIELD_SLOWEST).append(',') //
- .append(FIELD_AVERAGE).append(',') //
- .append(FIELD_FASTEST).append(',') //
- .append(FIELD_STDDEV).append('\n');
-
- RecordList records = getListGrid().getDataAsRecordList();
- int recordsSize = records.getLength();
- for (int i = 0; i < recordsSize; i++) {
- Record record = records.get(i);
- csv.append(record.getAttribute(FIELD_SERVICENAME)).append(',') //
- .append(record.getAttribute(FIELD_METHODNAME)).append(',') //
- .append(record.getAttribute(FIELD_COUNT)).append(',') //
- .append(record.getAttribute(FIELD_SLOWEST)).append(',') //
- .append(record.getAttribute(FIELD_AVERAGE)).append(',') //
- .append(record.getAttribute(FIELD_FASTEST)).append(',') //
- .append(record.getAttribute(FIELD_STDDEV)).append('\n');
- }
+ addTableAction("Export To CSV", new AbstractTableAction(TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ StringBuilder csv = new StringBuilder();
+ csv.append(FIELD_SERVICENAME).append(',') //
+ .append(FIELD_METHODNAME).append(',') //
+ .append(FIELD_COUNT).append(',') //
+ .append(FIELD_SLOWEST).append(',') //
+ .append(FIELD_AVERAGE).append(',') //
+ .append(FIELD_FASTEST).append(',') //
+ .append(FIELD_STDDEV).append('\n');
+
+ RecordList records = getListGrid().getDataAsRecordList();
+ int recordsSize = records.getLength();
+ for (int i = 0; i < recordsSize; i++) {
+ Record record = records.get(i);
+ csv.append(record.getAttribute(FIELD_SERVICENAME)).append(',') //
+ .append(record.getAttribute(FIELD_METHODNAME)).append(',') //
+ .append(record.getAttribute(FIELD_COUNT)).append(',') //
+ .append(record.getAttribute(FIELD_SLOWEST)).append(',') //
+ .append(record.getAttribute(FIELD_AVERAGE)).append(',') //
+ .append(record.getAttribute(FIELD_FASTEST)).append(',') //
+ .append(record.getAttribute(FIELD_STDDEV)).append('\n');
+ }
- new MessageWindow("Export To CSV", "<pre>" + csv.toString() + "</pre>").show();
+ new MessageWindow("Export To CSV", "<pre>" + csv.toString() + "</pre>").show();
- refresh();
- }
- });
+ refresh();
+ }
+ });
- addTableAction(extendLocatorId("refresh"), MSG.common_button_refresh(), new AbstractTableAction(
- TableActionEnablement.ALWAYS) {
+ addTableAction(MSG.common_button_refresh(), new AbstractTableAction(TableActionEnablement.ALWAYS) {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
refresh();
@@ -210,8 +208,7 @@ public class TestRemoteServiceStatisticsView extends Table {
}
});
} else { // not in the standalone window
- addTableAction(extendLocatorId("showInWin"), "Show In Window", new AbstractTableAction(
- TableActionEnablement.ALWAYS) {
+ addTableAction("Show In Window", new AbstractTableAction(TableActionEnablement.ALWAYS) {
@Override
public void executeAction(ListGridRecord[] selection, Object actionValue) {
new StatisticsWindow().show();
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 e56871b..9cb8320 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
@@ -85,11 +85,11 @@ public class TestTopView extends AbstractSectionedLeftNavigationView {
}
protected Canvas defaultView() {
- LocatableVLayout vLayout = new LocatableVLayout(this.extendLocatorId("Default"));
+ LocatableVLayout vLayout = new LocatableVLayout();
vLayout.setWidth100();
// TODO: Help icon.
- TitleBar titleBar = new TitleBar(this, MSG.view_testTop_title());
+ TitleBar titleBar = new TitleBar(MSG.view_testTop_title());
vLayout.addMember(titleBar);
Label label = new Label(MSG.view_testTop_description());
@@ -127,13 +127,13 @@ public class TestTopView extends AbstractSectionedLeftNavigationView {
NavigationItem typeTreeItem = new NavigationItem(PAGE_TYPE_TREE, null, new ViewFactory() {
public Canvas createView() {
- return new ResourceTypeTreeView(extendLocatorId(PAGE_TYPE_TREE.getName()));
+ return new ResourceTypeTreeView();
}
});
NavigationItem searchBarItem = new NavigationItem(PAGE_SEARCH_BAR, null, new ViewFactory() {
public Canvas createView() {
- return new TestSearchBarView(extendLocatorId(PAGE_SEARCH_BAR.getName()));
+ return new TestSearchBarView();
}
});
@@ -143,28 +143,27 @@ public class TestTopView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildConfigurationSection() {
NavigationItem configEditorItem = new NavigationItem(PAGE_CONFIG_EDITOR, null, new ViewFactory() {
public Canvas createView() {
- return new TestConfigurationView(extendLocatorId(PAGE_CONFIG_EDITOR.getName()));
+ return new TestConfigurationView();
}
});
NavigationItem readOnlyConfigEditorItem = new NavigationItem(PAGE_READONLY_CONFIG_EDITOR, null,
new ViewFactory() {
public Canvas createView() {
- return new TestReadOnlyConfigurationView(extendLocatorId(PAGE_READONLY_CONFIG_EDITOR.getName()));
+ return new TestReadOnlyConfigurationView();
}
});
NavigationItem groupConfigEditorItem = new NavigationItem(PAGE_GROUP_CONFIG_EDITOR, null, new ViewFactory() {
public Canvas createView() {
- return new TestGroupConfigurationView(extendLocatorId(PAGE_GROUP_CONFIG_EDITOR.getName()));
+ return new TestGroupConfigurationView();
}
});
NavigationItem readOnlyGroupConfigEditorItem = new NavigationItem(PAGE_READONLY_GROUP_CONFIG_EDITOR, null,
new ViewFactory() {
public Canvas createView() {
- return new TestReadOnlyGroupConfigurationView(
- extendLocatorId(PAGE_READONLY_GROUP_CONFIG_EDITOR.getName()));
+ return new TestReadOnlyGroupConfigurationView();
}
});
@@ -229,13 +228,13 @@ public class TestTopView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildMiscSection() {
NavigationItem messageCenterItem = new NavigationItem(PAGE_MESSAGE_CENTER_TEST, null, new ViewFactory() {
public Canvas createView() {
- return new TestMessageCenterView(extendLocatorId(PAGE_MESSAGE_CENTER_TEST.getName()));
+ return new TestMessageCenterView();
}
});
NavigationItem numberFormatItem = new NavigationItem(PAGE_NUMBER_FORMAT_TEST, null, new ViewFactory() {
public Canvas createView() {
- return new TestNumberFormatView(extendLocatorId(PAGE_NUMBER_FORMAT_TEST.getName()));
+ return new TestNumberFormatView();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
index 5d827cc..dd94522 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestUserPreferencesView.java
@@ -79,27 +79,26 @@ public class TestUserPreferencesView extends Table {
getListGrid().setFields(id, name, value);
refresh();
- addTableAction(extendLocatorId("export"), "Export To CSV",
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
- @Override
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- final String s = "~";
- StringBuilder csv = new StringBuilder();
- csv.append(FIELD_ID).append(s).append(FIELD_NAME).append(s).append(FIELD_VALUE).append('\n');
-
- RecordList records = getListGrid().getDataAsRecordList();
- int recordsSize = records.getLength();
- for (int i = 0; i < recordsSize; i++) {
- Record record = records.get(i);
- csv.append(record.getAttribute(FIELD_ID)).append(s).append(record.getAttribute(FIELD_NAME))
- .append(s).append(record.getAttribute(FIELD_VALUE)).append('\n');
- }
-
- new MessageWindow("Export To CSV", "<pre>" + csv.toString() + "</pre>").show();
-
- refreshTableInfo();
+ addTableAction("Export To CSV", new AbstractTableAction(TableActionEnablement.ALWAYS) {
+ @Override
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ final String s = "~";
+ StringBuilder csv = new StringBuilder();
+ csv.append(FIELD_ID).append(s).append(FIELD_NAME).append(s).append(FIELD_VALUE).append('\n');
+
+ RecordList records = getListGrid().getDataAsRecordList();
+ int recordsSize = records.getLength();
+ for (int i = 0; i < recordsSize; i++) {
+ Record record = records.get(i);
+ csv.append(record.getAttribute(FIELD_ID)).append(s).append(record.getAttribute(FIELD_NAME))
+ .append(s).append(record.getAttribute(FIELD_VALUE)).append('\n');
}
- });
+
+ new MessageWindow("Export To CSV", "<pre>" + csv.toString() + "</pre>").show();
+
+ refreshTableInfo();
+ }
+ });
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java
index 3299821..ac67975 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java
@@ -54,8 +54,8 @@ public class TestConfigurationView extends LocatableVLayout implements PropertyV
private ConfigurationDefinition configurationDefinition;
private Configuration configuration;
- public TestConfigurationView(String locatorId) {
- super(locatorId);
+ public TestConfigurationView() {
+ super();
}
@Override
@@ -77,7 +77,7 @@ public class TestConfigurationView extends LocatableVLayout implements PropertyV
}
private LocatableToolStrip createButtonBar() {
- LocatableToolStrip toolStrip = new LocatableToolStrip(extendLocatorId("ToolStrip"));
+ LocatableToolStrip toolStrip = new LocatableToolStrip();
toolStrip.setWidth100();
toolStrip.addMember(new LayoutSpacer());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java
index c210905..c313821 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java
@@ -56,8 +56,8 @@ public class TestGroupConfigurationView extends LocatableVLayout implements Prop
private ConfigurationDefinition configurationDefinition;
private List<GroupMemberConfiguration> memberConfigurations;
- public TestGroupConfigurationView(String locatorId) {
- super(locatorId);
+ public TestGroupConfigurationView() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyConfigurationView.java
index 899da26..cc7e598 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyConfigurationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyConfigurationView.java
@@ -26,8 +26,8 @@ import org.rhq.enterprise.gui.coregui.client.components.configuration.Configurat
*/
public class TestReadOnlyConfigurationView extends TestConfigurationView {
- public TestReadOnlyConfigurationView(String locatorId) {
- super(locatorId);
+ public TestReadOnlyConfigurationView() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyGroupConfigurationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyGroupConfigurationView.java
index f8d3829..6524b94 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyGroupConfigurationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyGroupConfigurationView.java
@@ -26,8 +26,8 @@ import org.rhq.enterprise.gui.coregui.client.components.configuration.GroupConfi
*/
public class TestReadOnlyGroupConfigurationView extends TestGroupConfigurationView {
- public TestReadOnlyGroupConfigurationView(String locatorId) {
- super(locatorId);
+ public TestReadOnlyGroupConfigurationView() {
+ super();
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java
index a03de4d..f8caad4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java
@@ -3,7 +3,7 @@ package org.rhq.enterprise.gui.coregui.client.test.inventory;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
public class TestSearchBarView extends ResourceSearchView {
- public TestSearchBarView(String locatorId) {
+ public TestSearchBarView() {
super();
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
index d57b51c..0ae3b5f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
@@ -24,6 +24,7 @@ import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.events.DoubleClickEvent;
import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.events.RightMouseDownEvent;
@@ -35,8 +36,8 @@ import com.smartgwt.client.widgets.menu.events.ClickHandler;
import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
+
/**
* A bar for displaying a message at the top of a page - the equivalent of the JSF h:messages component.
@@ -46,25 +47,24 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
* @author Ian Springer
* @author Jay Shaughnessy
*/
-public class MessageBar extends LocatableHLayout implements MessageCenter.MessageListener {
+public class MessageBar extends EnhancedHLayout implements MessageCenter.MessageListener {
- private static final String LOCATOR_ID = "MessageBar";
private static final int AUTO_HIDE_DELAY_MILLIS = 30000;
private static final String NON_BREAKING_SPACE = " ";
- private LocatableLabel label;
+ private Label label;
private Message currentMessage;
private Message stickyMessage; // this message will always be shown until dismissed by user.
private Menu showDetailsMenu;
private Timer messageClearingTimer;
public MessageBar() {
- super(LOCATOR_ID);
+ super();
setOverflow(Overflow.VISIBLE);
setWidth100();
setAlign(Alignment.CENTER);
- label = new LocatableLabel(extendLocatorId("Label"));
+ label = new Label();
label.setAlign(Alignment.CENTER);
label.setWidth100();
label.setHeight("30px");
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
index b6b5729..e3c218e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java
@@ -90,7 +90,7 @@ public class MessageCenterView extends Table implements MessageCenter.MessageLis
public void showMessageCenterWindow() {
try {
if (window == null) {
- window = new MessageCenterWindow("MessageCenterViewWindow");
+ window = new MessageCenterWindow();
window.addItem(this); // Use addItem(), not addMember(), when adding a widget to a Window!
window.addCloseClickHandler(new CloseClickHandler() {
@Override
@@ -390,7 +390,7 @@ public class MessageCenterView extends Table implements MessageCenter.MessageLis
static class MessageCenterWindow extends Window {
private Timer blinkTimer;
- public MessageCenterWindow(String locatorId) {
+ public MessageCenterWindow() {
super();
setTitle(TABLE_TITLE);
setShowMinimizeButton(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java
new file mode 100644
index 0000000..e7c0f73
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/EnhancedHLayout.java
@@ -0,0 +1,33 @@
+package org.rhq.enterprise.gui.coregui.client.util.selenium;
+
+import com.smartgwt.client.widgets.layout.HLayout;
+
+/**
+ * Wrapper for a SmartGWT {@link HLayout} that sets the ID for use with Selenium scLocators.
+ *
+ * @author Jay Shaughnessy
+ */
+public class EnhancedHLayout extends HLayout implements Locatable {
+
+ public EnhancedHLayout() {
+ super();
+ }
+
+ /**
+ * @param membersMargin
+ */
+ public EnhancedHLayout(int membersMargin) {
+ super(membersMargin);
+ }
+
+ public void destroyMembers() {
+ SeleniumUtility.destroyMembers(this);
+ }
+
+ @Override
+ public void destroy() {
+ destroyMembers();
+ super.destroy();
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java
index 094b3f4..3947cc2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/Locatable.java
@@ -33,27 +33,4 @@ import org.rhq.enterprise.gui.coregui.client.Messages;
public interface Locatable {
Messages MSG = CoreGUI.getMessages();
-
- /**
- * Returns the locatorId. This can be useful for constructing more granular locatorIds. For example, if
- * the widget contains sub-widgets. Note, this is the raw locatorId for the widget, to get the fully
- * formed ID, typically of the form "simpleClassname_locatorId" Call {@link getID()}.
- *
- * @return the locatorId
- */
- String getLocatorId();
-
- /**
- * Extends this widget's original locatorId with an extension. This can be useful for constructing more
- * granular locatorIds. For example, if the widget contains sub-widgets.
- * <pre>
- * ID Format: "getLocatorId()_extension"
- * </pre>
- *
- * @param extension not null or empty.
- *
- * @return the new, extended locatorId
- */
- String extendLocatorId(String extension);
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableDialog.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableDialog.java
deleted file mode 100644
index 39e4772..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableDialog.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.Dialog;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.Dialog that sets the ID for use with selenium scLocators.
- *
- * @author jay shaughnessy
- */
-public class LocatableDialog extends Dialog implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null.
- */
- public LocatableDialog(String locatorId) {
- super();
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java
deleted file mode 100644
index 984aa3e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHLayout.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.layout.HLayout;
-
-/**
- * Wrapper for a SmartGWT {@link HLayout} that sets the ID for use with Selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableHLayout extends HLayout implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableHLayout(String locatorId) {
- super();
- }
-
- public LocatableHLayout() {
- super();
- }
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- * @param membersMargin
- */
- public LocatableHLayout(int membersMargin) {
- super(membersMargin);
- }
-
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
- public void destroyMembers() {
- SeleniumUtility.destroyMembers(this);
- }
-
- @Override
- public void destroy() {
- destroyMembers();
- super.destroy();
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java
index 4ea7bb1..8706352 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHStack.java
@@ -33,6 +33,10 @@ public class LocatableHStack extends HStack implements Locatable {
private String locatorId;
+ public LocatableHStack() {
+ super();
+ }
+
/**
* <pre>
* ID Format: "simpleClassname_locatorId"
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHTMLFlow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHTMLFlow.java
deleted file mode 100644
index 801454a..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableHTMLFlow.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.HTMLFlow;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.HTMLFlow that sets the ID for use with selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableHTMLFlow extends HTMLFlow implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableHTMLFlow(String locatorId) {
- super();
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableImg.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableImg.java
deleted file mode 100644
index c0dc681..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableImg.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.Img;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.Img that sets the ID for use with selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableImg extends Img {
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null.
- * @param img not null or empty.
- */
- public LocatableImg(String locatorId, String src, int width, int height) {
- super(src, width, height);
- SeleniumUtility.setID(this, locatorId);
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableImgButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableImgButton.java
deleted file mode 100644
index f1deb36..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableImgButton.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.ImgButton;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.Img that sets the ID for use with selenium scLocators.
- *
- * @author Simeon Pinder
- */
-public class LocatableImgButton extends ImgButton {
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null.
- * @param img not null or empty.
- */
- public LocatableImgButton(String locatorId) {
- SeleniumUtility.setID(this, locatorId);
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLabel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLabel.java
deleted file mode 100644
index 3b06238..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLabel.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.Label;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.Label that sets the ID for use with selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableLabel extends Label implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableLabel(String locatorId) {
- super();
- init(locatorId);
- }
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableLabel(String locatorId, String contents) {
- super(contents);
- init(locatorId);
- }
-
- private void init(String locatorId) {
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java
index acfedb4..2139960 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableLayout.java
@@ -17,7 +17,7 @@ public class LocatableLayout extends Layout implements Locatable {
* </pre>
* @param locatorId not null or empty.
*/
- public LocatableLayout(String locatorId) {
+ public LocatableLayout() {
super();
this.locatorId = locatorId;
SeleniumUtility.setID(this, locatorId);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableListGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableListGrid.java
deleted file mode 100644
index 1582171..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableListGrid.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.grid.ListGrid;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.grid.ListGrid that sets the ID for use with selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableListGrid extends ListGrid implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "scClassname-id"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableListGrid(String locatorId) {
- super();
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableSectionStack.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableSectionStack.java
deleted file mode 100644
index 29da927..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableSectionStack.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.layout.SectionStack;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.layout.SectionStack that sets the ID for use with selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableSectionStack extends SectionStack implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableSectionStack(String locatorId) {
- super();
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
- // NOTE: It seems SectionStack does not need the sort of destroy() override that other Layout superclasses
- // need. The section cleanup seems sufficient on baseWidget destroy, and further attempts to remove
- // members explicitly may cause issues.
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableStretchImgButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableStretchImgButton.java
deleted file mode 100644
index ba1435f..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableStretchImgButton.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.StretchImgButton;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.StretchImgButton that sets the ID for use with selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableStretchImgButton extends StretchImgButton {
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null.
- * @param img not null or empty.
- */
- public LocatableStretchImgButton(String locatorId) {
- super();
- SeleniumUtility.setID(this, locatorId);
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
index fee5e59..667a69b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
@@ -42,6 +42,12 @@ public class LocatableTabSet extends TabSet {
SeleniumUtility.setID(this, locatorId);
}
+ public LocatableTabSet() {
+ super();
+ this.locatorId = "TODO";
+ SeleniumUtility.setID(this, locatorId);
+ }
+
public void setTabs(LocatableTab... tabs) {
super.setTabs(tabs);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTileLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTileLayout.java
deleted file mode 100644
index c6308a3..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTileLayout.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.tile.TileLayout;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.layout.HLayout that sets the ID for use with selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableTileLayout extends TileLayout implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableTileLayout(String locatorId) {
- super();
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java
index 64a5c3c..0af562a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableToolStrip.java
@@ -17,7 +17,7 @@ public class LocatableToolStrip extends ToolStrip implements Locatable {
* </pre>
* @param locatorId not null or empty.
*/
- public LocatableToolStrip(String locatorId) {
+ public LocatableToolStrip() {
super();
this.locatorId = locatorId;
SeleniumUtility.setID(this, locatorId);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTreeGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTreeGrid.java
deleted file mode 100644
index c4d6a87..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTreeGrid.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.smartgwt.client.widgets.tree.TreeGrid;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.tree.TreeGrid that sets the ID for use with selenium scLocators.
- *
- * @author jay shaughnessy
- */
-public class LocatableTreeGrid extends TreeGrid implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null.
- */
- public LocatableTreeGrid(String locatorId) {
- super();
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java
index f69a58e..2dcf267 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVLayout.java
@@ -25,7 +25,6 @@ public class LocatableVLayout extends VLayout implements Locatable {
*/
public LocatableVLayout(String locatorId) {
super();
- init(locatorId);
}
/**
@@ -37,12 +36,8 @@ public class LocatableVLayout extends VLayout implements Locatable {
*/
public LocatableVLayout(String locatorId, int membersMargin) {
super(membersMargin);
- init(locatorId);
}
- private void init(String locatorId) {
- SeleniumUtility.setID(this, locatorId);
- }
public String getLocatorId() {
return "";
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java
index a9db523..e13b0c9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableVStack.java
@@ -19,7 +19,10 @@ public class LocatableVStack extends VStack implements Locatable {
*/
public LocatableVStack(String locatorId) {
super();
- init(locatorId);
+ }
+
+ public LocatableVStack() {
+ super();
}
/**
@@ -31,13 +34,8 @@ public class LocatableVStack extends VStack implements Locatable {
*/
public LocatableVStack(String locatorId, int membersMargin) {
super(membersMargin);
- init(locatorId);
}
- private void init(String locatorId) {
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
public String getLocatorId() {
return locatorId;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableWidgetCanvas.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableWidgetCanvas.java
deleted file mode 100644
index 90324df..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableWidgetCanvas.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.rhq.enterprise.gui.coregui.client.util.selenium;
-
-import com.google.gwt.user.client.ui.Widget;
-import com.smartgwt.client.widgets.WidgetCanvas;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.WidgetCanvas that sets the ID for use with selenium scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableWidgetCanvas extends WidgetCanvas implements Locatable {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableWidgetCanvas(String locatorId, Widget widget) {
- super(widget);
- init(locatorId);
- }
-
- private void init(String locatorId) {
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
-}
11 years, 3 months
[rhq] modules/core modules/enterprise
by Jay Shaughnessy
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java | 17 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 124 ++++------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java | 8
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java | 10
5 files changed, 86 insertions(+), 80 deletions(-)
New commits:
commit 4385fbb69a2dfd9aced1f8802e9477dfb44860ae
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Feb 19 16:40:32 2013 -0500
[Bug 912871 - Perf: resource configuration update taking a lot of backend resources]
Scalability work for resource config update. We already added concurrency limits
that should throttle how many config updates the server gets hit with at one
time but we also want to see if we can relieve the intense banging on the db
and speed up the update time for each resource.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java
index c2d4767..69ebb9d 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java
@@ -38,7 +38,7 @@ import org.rhq.core.domain.resource.Resource;
@DiscriminatorValue("resource")
@Entity
-@NamedQueries( {
+@NamedQueries({
@NamedQuery(name = ResourceConfigurationUpdate.QUERY_FIND_ALL_IN_STATUS, query = "" //
+ "SELECT cu " //
+ " FROM ResourceConfigurationUpdate cu " //
@@ -58,7 +58,8 @@ import org.rhq.core.domain.resource.Resource;
+ " WHERE icu.resource.id = res.id) " //
+ " ) " //
+ " )"),
- @NamedQuery(name = ResourceConfigurationUpdate.QUERY_FIND_CURRENTLY_ACTIVE_CONFIG, query = "" //
+ // Note: Changes to this query should also be applied to QUERY_FIND_CURRENT_AND_IN_PROGRESS_CONFIGS, below.
+ @NamedQuery(name = ResourceConfigurationUpdate.QUERY_FIND_CURRENTLY_ACTIVE_CONFIG, query = "" //
+ "SELECT cu " //
+ " FROM ResourceConfigurationUpdate cu " //
+ " WHERE cu.resource.id = :resourceId " //
@@ -67,6 +68,17 @@ import org.rhq.core.domain.resource.Resource;
+ " FROM ResourceConfigurationUpdate cu2 " //
+ " WHERE cu2.resource.id = :resourceId " //
+ " AND cu2.status = 'SUCCESS' ) "),
+ @NamedQuery(name = ResourceConfigurationUpdate.QUERY_FIND_CURRENT_AND_IN_PROGRESS_CONFIGS, query = "" //
+ + "SELECT cu " //
+ + " FROM ResourceConfigurationUpdate cu " //
+ + " WHERE cu.resource.id = :resourceId " //
+ + " AND ( ( cu.status = 'INPROGRESS' ) " //
+ + " OR ( cu.status = 'SUCCESS' " //
+ + " AND cu.modifiedTime = ( SELECT MAX(cu2.modifiedTime) " //
+ + " FROM ResourceConfigurationUpdate cu2 " //
+ + " WHERE cu2.resource.id = :resourceId " //
+ + " AND cu2.status = 'SUCCESS' ) " //
+ + " ) ) "),
@NamedQuery(name = ResourceConfigurationUpdate.QUERY_FIND_LATEST_BY_RESOURCE_ID, query = "" //
+ "SELECT cu " //
+ " FROM ResourceConfigurationUpdate cu " //
@@ -178,6 +190,7 @@ public class ResourceConfigurationUpdate extends AbstractResourceConfigurationUp
public static final String QUERY_FIND_ALL_IN_STATUS = "ResourceConfigurationUpdate.findAllInStatus";
public static final String QUERY_FIND_ALL_BY_RESOURCE_ID = "ResourceConfigurationUpdate.findAllByResourceId";
public static final String QUERY_FIND_CURRENTLY_ACTIVE_CONFIG = "ResourceConfigurationUpdate.findCurrentlyActiveConfig";
+ public static final String QUERY_FIND_CURRENT_AND_IN_PROGRESS_CONFIGS = "ResourceConfigurationUpdate.findCurrentAndInProgressConfigs";
public static final String QUERY_FIND_LATEST_BY_RESOURCE_ID = "ResourceConfigurationUpdate.findByLatestByResourceId";
public static final String QUERY_FIND_BY_GROUP_ID_AND_STATUS = "ResourceConfigurationUpdate.findByGroupIdAndStatus";
public static final String QUERY_FIND_BY_PARENT_UPDATE_ID_AND_STATUS = "ResourceConfigurationUpdate.findByParentUpdateIdAndStatus";
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 50e5fd4..04c15b7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -89,7 +89,6 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceError;
import org.rhq.core.domain.resource.ResourceErrorType;
import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
@@ -487,9 +486,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
* is triggering save based on the semantics that we want to provide for configuration updates.
* For the same reason, we pass null as the subject.
*/
- ResourceConfigurationUpdate update = this.configurationManager.persistNewResourceConfigurationUpdateHistory(
- this.subjectManager.getOverlord(), resource.getId(), liveConfig, ConfigurationUpdateStatus.SUCCESS, null,
- false);
+ ResourceConfigurationUpdate update = this.configurationManager
+ .persistResourceConfigurationUpdateInNewTransaction(this.subjectManager.getOverlord(), resource.getId(),
+ liveConfig, ConfigurationUpdateStatus.SUCCESS, null, false);
// resource.setResourceConfiguration(liveConfig.deepCopy(false));
resource.setResourceConfiguration(liveConfig.deepCopyWithoutProxies());
@@ -1248,8 +1247,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return resourceConfigurationUpdate;
}
- ResourceConfigurationUpdate newUpdate = configurationManager.persistNewResourceConfigurationUpdateHistory(
- subject, resourceId, configToUpdate, ConfigurationUpdateStatus.INPROGRESS, subject.getName(), false);
+ ResourceConfigurationUpdate newUpdate = configurationManager
+ .persistResourceConfigurationUpdateInNewTransaction(subject, resourceId, configToUpdate,
+ ConfigurationUpdateStatus.INPROGRESS, subject.getName(), false);
executeResourceConfigurationUpdate(newUpdate);
return newUpdate;
}
@@ -1307,9 +1307,9 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
// configuration.
// TODO: Consider synchronizing to avoid the condition where someone calls this method twice quickly in two
// different tx's, which would put two updates in INPROGRESS and cause havoc.
- ResourceConfigurationUpdate newUpdate = configurationManager.persistNewResourceConfigurationUpdateHistory(
- subject, resourceId, newResourceConfiguration, ConfigurationUpdateStatus.INPROGRESS, subject.getName(),
- false);
+ ResourceConfigurationUpdate newUpdate = configurationManager
+ .persistResourceConfigurationUpdateInNewTransaction(subject, resourceId, newResourceConfiguration,
+ ConfigurationUpdateStatus.INPROGRESS, subject.getName(), false);
executeResourceConfigurationUpdate(newUpdate);
@@ -1382,91 +1382,83 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
@Override
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- public ResourceConfigurationUpdate persistNewResourceConfigurationUpdateHistory(Subject subject, int resourceId,
- Configuration newConfiguration, ConfigurationUpdateStatus newStatus, String newSubject,
+ public ResourceConfigurationUpdate persistResourceConfigurationUpdateInNewTransaction(Subject subject,
+ int resourceId, Configuration newConfiguration, ConfigurationUpdateStatus newStatus, String newSubject,
boolean isPartofGroupUpdate) throws ResourceNotFoundException, ConfigurationUpdateStillInProgressException {
- // get the resource that we will be updating
- Resource resource = resourceManager.getResourceById(subject, resourceId);
- // make sure the user has the proper permissions to do this
- if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_WRITE, resource.getId())) {
- throw new PermissionException("User [" + subject.getName()
- + "] does not have permission to modify configuration for resource [" + resource + "]");
- }
+ ResourceConfigurationUpdate current = null;
+ String errorMessage = null;
- // see if there was a previous update request and make sure it isn't still in progress
- List<ResourceConfigurationUpdate> previousRequests = resource.getResourceConfigurationUpdates();
+ // for efficiency, in one query fetch IN_PROGRESS and/or the current update
+ Query query = entityManager
+ .createNamedQuery(ResourceConfigurationUpdate.QUERY_FIND_CURRENT_AND_IN_PROGRESS_CONFIGS);
+ query.setParameter("resourceId", resourceId);
+ List<?> updates = query.getResultList();
+ for (Object result : updates) {
+ current = (ResourceConfigurationUpdate) result;
+
+ if (ConfigurationUpdateStatus.INPROGRESS == current.getStatus()) {
+ // A previous update is still in progress for this Resource. If this update is part of a group
+ // update, persist it with FAILURE status, so it is still listed as part of the group history.
+ // Otherwise, throw an exception that can bubble up to the GUI.
+ if (isPartofGroupUpdate) {
+ newStatus = ConfigurationUpdateStatus.FAILURE;
+ errorMessage = "Resource configuration Update was aborted because an update request for the Resource was already in progress.";
- String errorMessage = null;
- if (previousRequests != null) {
- for (ResourceConfigurationUpdate previousRequest : previousRequests) {
- if (previousRequest.getStatus() == ConfigurationUpdateStatus.INPROGRESS) {
- // A previous update is still in progresss for this Resource. If this update is part of a group
- // update, persist it with FAILURE status, so it is still listed as part of the group history.
- // Otherwise, throw an exception that can bubble up to the GUI.
- if (isPartofGroupUpdate) {
- newStatus = ConfigurationUpdateStatus.FAILURE;
- errorMessage = "Resource configuration Update was aborted because an update request for the Resource was already in progress.";
- } else {
- // NOTE: If you change this to another exception, make sure you change getLatestResourceConfigurationUpdate().
- throw new ConfigurationUpdateStillInProgressException(
- "Resource ["
- + resource
- + "] has a resource configuration update request already in progress - please wait for it to finish: "
- + previousRequest);
- }
+ } else {
+ // NOTE: If you change this to another exception, make sure you change getLatestResourceConfigurationUpdate().
+ throw new ConfigurationUpdateStillInProgressException(
+ "Resource ["
+ + resourceId
+ + "] has a resource configuration update request already in progress - please wait for it to finish: "
+ + current);
}
}
}
- ResourceConfigurationUpdate current;
+ Resource resource = null;
+
+ if (null != current) {
+ // Always persist a group update because each member must have an update. Otherwise, only persist a
+ // single resource update if it has changed.
+ if (!isPartofGroupUpdate) {
+ Configuration currentConfiguration = current.getConfiguration();
+ Hibernate.initialize(currentConfiguration.getMap());
+ if (currentConfiguration.equals(newConfiguration)) {
+ return null;
+ }
+ }
- // Get the latest configuration as known to the server (i.e. persisted in the DB).
- try {
- Query query = entityManager
- .createNamedQuery(ResourceConfigurationUpdate.QUERY_FIND_CURRENTLY_ACTIVE_CONFIG);
- query.setParameter("resourceId", resourceId);
- current = (ResourceConfigurationUpdate) query.getSingleResult();
resource = current.getResource();
- } catch (NoResultException nre) {
- current = null; // The resource hasn't been successfully configured yet.
- }
- // If this update is not part of an group update, don't bother persisting a new entry if the Configuration
- // hasn't changed. If it's part of an group update, persist a new entry no matter what, so the group
- // update isn't missing any member updates.
- if (!isPartofGroupUpdate && current != null) {
- Configuration currentConfiguration = current.getConfiguration();
- Hibernate.initialize(currentConfiguration.getMap());
- if (currentConfiguration.equals(newConfiguration)) {
- return null;
- }
+ } else {
+ // make sure the resource exists
+ resource = resourceManager.getResourceById(subject, resourceId);
}
- //Configuration zeroedConfiguration = newConfiguration.deepCopy(false);
Configuration zeroedConfiguration = newConfiguration.deepCopyWithoutProxies();
- // create our new update request and assign it to our resource - its status will initially be "in progress"
+ // create our new update request and assign it to our resource - its status will initially be INPROGRESS
ResourceConfigurationUpdate newUpdateRequest = new ResourceConfigurationUpdate(resource, zeroedConfiguration,
newSubject);
-
newUpdateRequest.setStatus(newStatus);
- if (newStatus == ConfigurationUpdateStatus.FAILURE) {
+
+ if (ConfigurationUpdateStatus.FAILURE == newStatus) {
newUpdateRequest.setErrorMessage(errorMessage);
}
entityManager.persist(newUpdateRequest);
- if (current != null) {
- if (newStatus == ConfigurationUpdateStatus.SUCCESS) {
- // If this is the first configuration update since the resource was imported, don't alert
+
+ // No need to alert on the first configuration update, only on subsequent change
+ if (null != current) {
+ if (ConfigurationUpdateStatus.SUCCESS == newStatus) {
notifyAlertConditionCacheManager("persistNewResourceConfigurationUpdateHistory", newUpdateRequest);
}
}
resource.addResourceConfigurationUpdates(newUpdateRequest);
- // agent and childResources fields are LAZY - force them to load, because the caller will need them.
- Hibernate.initialize(resource.getChildResources());
+ // provide the agent while we have the entity, it's typically needed by the caller
Hibernate.initialize(resource.getAgent());
return newUpdateRequest;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java
index f5b28ee..85c1247 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java
@@ -188,7 +188,7 @@ public interface ConfigurationManagerLocal extends ConfigurationManagerRemote {
* {@link #getLatestResourceConfigurationUpdate(Subject, int)} and
* {@link #scheduleGroupResourceConfigurationUpdate}.
*
- * @param subject
+ * @param subject ASSUMES CONFIGURE_WRITE perm for resource in question, no authz checks in this method.
* @param resourceId
* @param newConfiguration
* @param newStatus
@@ -196,10 +196,11 @@ public interface ConfigurationManagerLocal extends ConfigurationManagerRemote {
*
* @param isPartofGroupUpdate
* @return the persisted Resource Configuration update, or null if the specified Configuration is identical to the
- * currently persisted Configuration
+ * currently persisted Configuration. Note, on success the normally lazy-loaded
+ * ResourceConfigurationUpdate.resource.agent will be provided.
*/
@Nullable
- ResourceConfigurationUpdate persistNewResourceConfigurationUpdateHistory(Subject subject, int resourceId,
+ ResourceConfigurationUpdate persistResourceConfigurationUpdateInNewTransaction(Subject subject, int resourceId,
Configuration newConfiguration, ConfigurationUpdateStatus newStatus, String newSubject,
boolean isPartofGroupUpdate) throws ResourceNotFoundException, ConfigurationUpdateStillInProgressException;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java
index a36f35d..be32c53 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationServerServiceImpl.java
@@ -43,8 +43,8 @@ public class ConfigurationServerServiceImpl implements ConfigurationServerServic
SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
int configUpdateId = response.getConfigurationUpdateId();
- ResourceConfigurationUpdate configUpdate = configurationManager.getResourceConfigurationUpdate(subjectManager
- .getOverlord(), configUpdateId);
+ ResourceConfigurationUpdate configUpdate = configurationManager.getResourceConfigurationUpdate(
+ subjectManager.getOverlord(), configUpdateId);
if (configUpdate != null) {
Resource resource = configUpdate.getResource();
@@ -67,7 +67,7 @@ public class ConfigurationServerServiceImpl implements ConfigurationServerServic
SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
Subject overlord = subjectManager.getOverlord();
- ResourceConfigurationUpdate update = configurationManager.persistNewResourceConfigurationUpdateHistory(
+ ResourceConfigurationUpdate update = configurationManager.persistResourceConfigurationUpdateInNewTransaction(
overlord, resourceId, resourceConfiguration, ConfigurationUpdateStatus.SUCCESS, null, false);
if (update == null) {
@@ -76,7 +76,7 @@ public class ConfigurationServerServiceImpl implements ConfigurationServerServic
return;
}
- Configuration configuration = update.getConfiguration().deepCopy(false); // clone the config, zeroing out ids
+ Configuration configuration = update.getConfiguration().deepCopy(false); // clone the config, zeroing out ids
configurationManager.setResourceConfiguration(resourceId, configuration); // now set it as the current config on the Resource
}
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java
index d51798d..d29ad16 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java
@@ -149,7 +149,7 @@ public class ConfigurationManagerBeanUnitTest extends JMockTest {
allowing(entityMgr).find(Resource.class, fixture.resourceId); will(returnValue(fixture.resource));
- oneOf(configurationMgrLocal).persistNewResourceConfigurationUpdateHistory(fixture.subject,
+ oneOf(configurationMgrLocal).persistResourceConfigurationUpdateInNewTransaction(fixture.subject,
fixture.resourceId, fixture.configuration, INPROGRESS, fixture.subject.getName(),
fixture.isPartOfGroupUpdate);
will(returnValue(expectedUpdate));
@@ -191,7 +191,7 @@ public class ConfigurationManagerBeanUnitTest extends JMockTest {
oneOf(authorizationMgr).hasResourcePermission(fixture.subject, CONFIGURE_WRITE, fixture.resourceId);
will(returnValue(true));
- oneOf(configurationMgrLocal).persistNewResourceConfigurationUpdateHistory(fixture.subject,
+ oneOf(configurationMgrLocal).persistResourceConfigurationUpdateInNewTransaction(fixture.subject,
fixture.resourceId, fixture.configuration, INPROGRESS, fixture.subject.getName(),
fixture.isPartOfGroupUpdate);
will(returnValue(expectedUpdate));
@@ -252,7 +252,7 @@ public class ConfigurationManagerBeanUnitTest extends JMockTest {
oneOf(configAgentService).validate(fixture.configuration, fixture.resourceId, FROM_STRUCTURED);
inSequence(configUdpate);
- oneOf(configurationMgrLocal).persistNewResourceConfigurationUpdateHistory(fixture.subject,
+ oneOf(configurationMgrLocal).persistResourceConfigurationUpdateInNewTransaction(fixture.subject,
fixture.resourceId, fixture.configuration, INPROGRESS, fixture.subject.getName(),
fixture.isPartOfGroupUpdate);
will(returnValue(expectedUpdate));
@@ -302,7 +302,7 @@ public class ConfigurationManagerBeanUnitTest extends JMockTest {
oneOf(configAgentService).merge(fixture.configuration, fixture.resourceId, FROM_RAW);
will(returnValue(translatedConfig)); inSequence(configUdpate);
- oneOf(configurationMgrLocal).persistNewResourceConfigurationUpdateHistory(fixture.subject,
+ oneOf(configurationMgrLocal).persistResourceConfigurationUpdateInNewTransaction(fixture.subject,
fixture.resourceId, translatedConfig, INPROGRESS, fixture.subject.getName(),
fixture.isPartOfGroupUpdate);
will(returnValue(expectedUpdate));
@@ -350,7 +350,7 @@ public class ConfigurationManagerBeanUnitTest extends JMockTest {
oneOf(authorizationMgr).hasResourcePermission(fixture.subject, CONFIGURE_WRITE, fixture.resourceId);
will(returnValue(true));
- oneOf(configurationMgrLocal).persistNewResourceConfigurationUpdateHistory(fixture.subject, fixture.resourceId,
+ oneOf(configurationMgrLocal).persistResourceConfigurationUpdateInNewTransaction(fixture.subject, fixture.resourceId,
fixture.configuration, INPROGRESS, fixture.subject.getName(), fixture.isPartOfGroupUpdate);
will(returnValue(expectedUpdate));
11 years, 3 months
[rhq] modules/core modules/enterprise modules/plugins
by mazz
modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java | 4 ++
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 1
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java | 7 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 12 +++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java | 17 ++++++++++
modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 7 ++++
6 files changed, 48 insertions(+)
New commits:
commit 3005a262a20961e6c8583e02953d9af1501d8c68
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Feb 19 13:56:03 2013 -0500
[BZ 912525] add new concurrency limit for configuration updates
diff --git a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java
index caa1a91..e9e5b36 100644
--- a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java
+++ b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/configuration/ConfigurationServerService.java
@@ -23,6 +23,7 @@
package org.rhq.core.clientapi.server.configuration;
import org.rhq.core.communications.command.annotation.Asynchronous;
+import org.rhq.core.communications.command.annotation.LimitedConcurrency;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
import org.rhq.core.domain.configuration.Property;
@@ -31,6 +32,8 @@ import org.rhq.core.domain.configuration.Property;
* Interface that allows an agent to provide information about a resource's configuration.
*/
public interface ConfigurationServerService {
+ String CONCURRENCY_LIMIT_CONFIG_UPDATE = "rhq.server.concurrency-limit.configuration-update";
+
/**
* The agent will notify the server when a configuration update request has been completed by calling this method.
*
@@ -65,6 +68,7 @@ public interface ConfigurationServerService {
* @param resourceConfiguration the newly detected configuration
*/
@Asynchronous(guaranteedDelivery = true)
+ @LimitedConcurrency(CONCURRENCY_LIMIT_CONFIG_UPDATE)
void persistUpdatedResourceConfiguration(int resourceId, Configuration resourceConfiguration);
}
\ No newline at end of file
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index f7f781e..544dfbf 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -557,6 +557,7 @@ rhq.server.concurrency-limit.content-report=5
rhq.server.concurrency-limit.content-download=5
rhq.server.concurrency-limit.measurement-report=10
rhq.server.concurrency-limit.measurement-schedule-request=10
+rhq.server.concurrency-limit.configuration-update=10
# Content Local Filesystem Repository
rhq.server.content.filesystem=${jboss.server.data.dir}/packagebits
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java
index 0a1c625..7ed7ffd 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerCommunicationsService.java
@@ -142,6 +142,13 @@ public class TestServerCommunicationsService implements TestServerCommunications
public void setMeasurementScheduleRequestConcurrencyLimit(Integer maxConcurrency) {
}
+ public Integer getConfigurationUpdateConcurrencyLimit() {
+ return 1;
+ }
+
+ public void setConfigurationUpdateConcurrencyLimit(Integer maxConcurrency) {
+ }
+
public Boolean getMaintenanceModeAtStartup() {
return Boolean.FALSE;
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
index 9c7909e..0d88020 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java
@@ -45,6 +45,7 @@ import mazz.i18n.Logger;
import org.jboss.remoting.InvokerLocator;
import org.jboss.util.StringPropertyReplacer;
+import org.rhq.core.clientapi.server.configuration.ConfigurationServerService;
import org.rhq.core.clientapi.server.content.ContentServerService;
import org.rhq.core.clientapi.server.discovery.DiscoveryServerService;
import org.rhq.core.clientapi.server.measurement.MeasurementServerService;
@@ -645,6 +646,17 @@ public class ServerCommunicationsService implements ServerCommunicationsServiceM
}
@Override
+ public Integer getConfigurationUpdateConcurrencyLimit() {
+ return getServiceContainer().getConcurrencyManager().getConfiguredNumberOfPermitsAllowed(
+ ConfigurationServerService.CONCURRENCY_LIMIT_CONFIG_UPDATE);
+ }
+
+ @Override
+ public void setConfigurationUpdateConcurrencyLimit(Integer maxConcurrency) {
+ setConcurrencyLimit(ConfigurationServerService.CONCURRENCY_LIMIT_CONFIG_UPDATE, maxConcurrency, true);
+ }
+
+ @Override
public Boolean getMaintenanceModeAtStartup() {
InputStream inputStream = null;
Boolean flag;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java
index 9c8c993..5d4c319 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsServiceMBean.java
@@ -340,6 +340,23 @@ public interface ServerCommunicationsServiceMBean extends ServiceContainerMetric
void setMeasurementScheduleRequestConcurrencyLimit(Integer maxConcurrency);
/**
+ * Gets the concurrency limit for configuration updates. This is the amount of new configuration updates that the server
+ * will allow to be processed concurrently. A configuration update is something the agent originates when it needs to
+ * let the server know when a resource's configuration has changed.
+ *
+ * @return number of concurrent calls allowed
+ */
+ Integer getConfigurationUpdateConcurrencyLimit();
+
+ /**
+ * Sets the new concurrency limit for configuration updates. This new number is the amount of configuration updates
+ * that the server will allow to be processed concurrently.
+ *
+ * @param maxConcurrency
+ */
+ void setConfigurationUpdateConcurrencyLimit(Integer maxConcurrency);
+
+ /**
* Returns <code>true</code> if the server should always start up in maintenance mode.
* If <code>false</code>, the server will startup in the same state it was in when it
* was shutdown.
diff --git a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
index 84289ad..ee3fbd1 100644
--- a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml
@@ -616,6 +616,13 @@
required="true"
activationPolicy="immediate"
description="Number of measurement schedule requests that can be processed concurrently; if zero or less, there is no limit" />
+ <c:simple-property
+ name="ConfigurationUpdateConcurrencyLimit"
+ displayName="Configuration Update Concurrency Limit"
+ type="integer"
+ required="true"
+ activationPolicy="immediate"
+ description="Number of configuration updates originating from agents that can be processed concurrently; if zero or less, there is no limit" />
</c:group>
<c:group
name="ha"
11 years, 3 months
[rhq] Changes to 'jshaughn/selenium'
by Jay Shaughnessy
New branch 'jshaughn/selenium' available with the following commits:
commit f3dd7ed25340a5464ce43cf38ccac9d54398681f
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Feb 19 12:09:02 2013 -0500
Work in progress. Ignore the man behind the curtain.
11 years, 3 months
[rhq] modules/enterprise modules/integration-tests
by Heiko W. Rupp
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 8 +
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java | 55 ++++++++++
2 files changed, 61 insertions(+), 2 deletions(-)
New commits:
commit 532c73f05d278ef150056370ad84e4f12eb0de36
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Feb 19 17:02:19 2013 +0100
Follow the recent changes in availability handling and add another test.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
index 8142f17..ec42c3c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
@@ -31,6 +31,8 @@ import java.util.UUID;
import javax.ejb.EJB;
import javax.ejb.Stateless;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
import javax.interceptor.Interceptors;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -356,6 +358,7 @@ public class ResourceHandlerBean extends AbstractRestBean {
@PUT
@Path("/{id}/availability")
@ApiOperation("Set the current availability of the passed resource")
+ @TransactionAttribute(TransactionAttributeType.NEVER)
public void reportAvailability(@ApiParam("Id of the resource to update") @PathParam("id") int resourceId,
@ApiParam(value= "New Availability setting", required = true) AvailabilityRest avail) {
if (avail.getResourceId() != resourceId)
@@ -368,11 +371,12 @@ public class ResourceHandlerBean extends AbstractRestBean {
// According to jshaughn, plaforms must not be set to DISABLED, so catch this case here.
if (resource.getResourceType().getCategory()==ResourceCategory.PLATFORM && at==AvailabilityType.DISABLED) {
- throw new BadArgumentException("Availabilty","Platforms must not be set to DISABLED");
+ throw new BadArgumentException("Availability","Platforms must not be set to DISABLED");
}
+ Agent agent = agentMgr.getAgentByResourceId(caller,resourceId);
- AvailabilityReport report = new AvailabilityReport(true, resource.getAgent().getName());
+ AvailabilityReport report = new AvailabilityReport(true, agent.getName());
Availability availability = new Availability(resource, avail.getSince(), at);
report.addAvailability(availability);
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java
index 6899995..27bf5a2 100644
--- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java
@@ -220,6 +220,61 @@ public class ResourcesTest extends AbstractBase {
}
@Test
+ public void testCreatePlatformUpdateAvailabilityAndRemove() throws Exception {
+
+ Resource resource = new Resource();
+ resource.setResourceName("dummy-test");
+ resource.setTypeName("Linux");
+
+ Response response =
+ given()
+ .header(acceptXml)
+ .contentType(ContentType.JSON)
+ .body(resource)
+ .expect()
+ .statusCode(201)
+ .log().ifError()
+ .when()
+ .post("/resource/platforms");
+
+ XmlPath xmlPath = response.xmlPath();
+ Node resource1 = xmlPath.get("resource");
+ Node platformIdNode = resource1.get("resourceId");
+ String platformId = platformIdNode.value();
+
+ try {
+ long now = System.currentTimeMillis()-100;
+ given().body("{\"since\":" + now + ",\"type\":\"DOWN\",\"resourceId\":" + platformId + "}")
+ .header("Content-Type","application/json")
+ .header("Accept","application/json")
+ .pathParam("id",platformId)
+ .expect()
+ .statusCode(HttpStatus.SC_NO_CONTENT)
+ .log().ifError()
+ .when().put("/resource/{id}/availability");
+
+ now += 50;
+ given().body("{\"since\":" + now + ",\"type\":\"UP\",\"resourceId\":" + platformId + "}")
+ .header("Content-Type","application/json")
+ .header("Accept","application/json")
+ .pathParam("id",platformId)
+ .expect()
+ .statusCode(HttpStatus.SC_NO_CONTENT)
+ .log().ifError()
+ .when().put("/resource/{id}/availability");
+
+
+ }
+
+ finally {
+ given().pathParam("id", platformId)
+ .expect().statusCode(HttpStatus.SC_NO_CONTENT)
+ .when().delete("/resource/{id}");
+ }
+
+ }
+
+ @Test
public void testCreatePlatformOLDAndRemove() throws Exception {
Response response =
11 years, 3 months
[rhq] Changes to 'jkremser/separateFromParent'
by Jiri Kremser
New branch 'jkremser/separateFromParent' available with the following commits:
commit 626bd1762e4f206e5cee1e8c5122830fa012e557
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Feb 19 16:33:28 2013 +0100
proposed fix - using the " & wait $!" suffix and separateFromParrent flag.
11 years, 3 months
[rhq] modules/plugins
by Thomas Segismont
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7189891da688fc90f5b3b5dc78a6706f1cd57060
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Mon Feb 18 19:39:10 2013 +0100
BZ911172 - Creating mail server fails with EAP 6.1.0.DR4 if outbound-socket-binding-ref is not filled
Mail server outbound-socket-binding-ref now mandatory in UI
diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
index ba4fe29..03dd318 100644
--- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml
@@ -11670,7 +11670,7 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to SMTP server">
+ <c:simple-property name="outbound-socket-binding-ref" required="true" type="string" readOnly="false" description="Outbound Socket binding to SMTP server">
<c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
</c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="false" description="Password to authenticate on server"/>
@@ -11694,7 +11694,7 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to IMAP server">
+ <c:simple-property name="outbound-socket-binding-ref" required="true" type="string" readOnly="false" description="Outbound Socket binding to IMAP server">
<c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
</c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="false" description="Password to authenticate on server"/>
@@ -11718,7 +11718,7 @@
</plugin-configuration>
<resource-configuration>
- <c:simple-property name="outbound-socket-binding-ref" required="false" type="string" readOnly="false" description="Outbound Socket binding to POP3 server">
+ <c:simple-property name="outbound-socket-binding-ref" required="true" type="string" readOnly="false" description="Outbound Socket binding to POP3 server">
<c:option-source target="configuration" expression="*1/remote-destination-outbound-socket-binding=name:type=SocketBindingGroup"/>
</c:simple-property>
<c:simple-property name="password" required="false" type="string" readOnly="false" description="Password to authenticate on server"/>
11 years, 3 months