etc/eclipse-tools/maven/RHQ
| 4 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
| 26 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
| 5 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
| 15 +++--
4 files changed, 33 insertions(+), 17 deletions(-)
New commits:
commit e9a07825e51f6683ed86b9da61d61277da9174a0
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Feb 9 13:42:11 2011 -0500
fix configuration compare feature - this is working again
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
index 4615b4d..f9e4970 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
@@ -24,6 +24,8 @@ import java.util.EnumSet;
import java.util.List;
import com.smartgwt.client.widgets.Window;
+import com.smartgwt.client.widgets.events.CloseClickHandler;
+import com.smartgwt.client.widgets.events.CloseClientEvent;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.layout.VLayout;
@@ -44,6 +46,7 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
/**
* @author Greg Hinkle
@@ -79,7 +82,7 @@ public class ConfigurationComparisonView extends VLayout {
nameField.setFrozen(true);
nameField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
- if (listGridRecord.getAttributeAsBoolean("consistent")) {
+ if (listGridRecord == null ||
listGridRecord.getAttributeAsBoolean("consistent")) {
return String.valueOf(o);
} else {
return "<span style=\"color: red;\">" +
String.valueOf(o) + "</span>";
@@ -194,15 +197,26 @@ public class ConfigurationComparisonView extends VLayout {
ArrayList<Configuration> configurations, ArrayList<String> titles) {
ConfigurationComparisonView view = new ConfigurationComparisonView(definition,
configurations, titles);
- Window dialog = new Window();
+ final Window dialog = new LocatableWindow("configCompare");
dialog.setTitle(MSG.view_configCompare_comparingConfigs());
- dialog.setWidth(800);
- dialog.setHeight(800);
+ dialog.setShowMinimizeButton(true);
+ dialog.setShowMaximizeButton(true);
+ dialog.setWidth(700);
+ dialog.setHeight(500);
dialog.setIsModal(true);
dialog.setShowModalMask(true);
+ dialog.setShowResizer(true);
+ dialog.setShowFooter(true);
dialog.setCanDragResize(true);
+ dialog.setAutoCenter(true);
dialog.centerInPage();
dialog.addItem(view);
+ dialog.addCloseClickHandler(new CloseClickHandler() {
+ @Override
+ public void onCloseClick(CloseClientEvent event) {
+ dialog.markForDestroy();
+ }
+ });
dialog.show();
}
@@ -239,8 +253,4 @@ public class ConfigurationComparisonView extends VLayout {
}
}
}
-
- private static class ColoredTreeGrid extends TreeGrid {
-
- }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
index 5f4c167..034a133 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
@@ -55,6 +55,7 @@ public class ConfigurationHistoryDataSource extends
RPCDataSource<ResourceConfig
public static final String DURATION = "duration";
public static final String ERROR_MESSAGE = "errorMessage";
public static final String MODIFIED_TIME = "modifiedTime";
+ public static final String OBJECT = "object"; // the full entity object
is stored in this attribute
}
public static abstract class CriteriaField {
@@ -131,7 +132,7 @@ public class ConfigurationHistoryDataSource extends
RPCDataSource<ResourceConfig
@Override
public ResourceConfigurationUpdate copyValues(Record from) {
- throw new UnsupportedOperationException("Updates are not supported.");
+ return (ResourceConfigurationUpdate) from.getAttributeAsObject(Field.OBJECT);
}
@Override
@@ -147,7 +148,7 @@ public class ConfigurationHistoryDataSource extends
RPCDataSource<ResourceConfig
record.setAttribute(Field.ERROR_MESSAGE, from.getErrorMessage());
record.setAttribute(Field.MODIFIED_TIME, new Date(from.getModifiedTime()));
record.setAttribute(Field.STATUS, from.getStatus().name());
-
+ record.setAttribute(Field.OBJECT, from);
return record;
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
index 19994ec..c23056b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
@@ -32,6 +32,7 @@ import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.resource.Resource;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationComparisonView;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
@@ -42,8 +43,8 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
* @author Greg Hinkle
*/
public class ConfigurationHistoryView extends TableSection {
- public static final ViewName VIEW_ID = new
ViewName("RecentConfigurationChanges",
- MSG.view_configurationHistoryList_title());
+ public static final ViewName VIEW_ID = new
ViewName("RecentConfigurationChanges", MSG
+ .view_configurationHistoryList_title());
private Integer resourceId;
@@ -88,8 +89,12 @@ public class ConfigurationHistoryView extends TableSection {
ListGridField resourceField = new
ListGridField(ConfigurationHistoryDataSource.Field.RESOURCE);
resourceField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int
i1) {
- Resource res = (Resource) o;
- return "<a href=\"#Resource/" + res.getId() +
"\">" + res.getName() + "</a>";
+ if (listGridRecord == null) {
+ return "unknown";
+ }
+ Resource res = (Resource) listGridRecord
+
.getAttributeAsObject(ConfigurationHistoryDataSource.Field.RESOURCE);
+ return "<a href=\"" +
LinkManager.getResourceLink(res.getId()) + "\">" + res.getName() +
"</a>";
}
});
fields.add(resourceField);
@@ -124,7 +129,7 @@ public class ConfigurationHistoryView extends TableSection {
ArrayList<ResourceConfigurationUpdate> configs = new
ArrayList<ResourceConfigurationUpdate>();
for (ListGridRecord record : selection) {
ResourceConfigurationUpdate update = (ResourceConfigurationUpdate)
record
- .getAttributeAsObject("entity");
+
.getAttributeAsObject(ConfigurationHistoryDataSource.Field.OBJECT);
configs.add(update);
}
ConfigurationComparisonView.displayComparisonDialog(configs);
commit 6cc2484f375dabece1e6b1a4495d76e218911a10
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Feb 9 13:39:24 2011 -0500
when running gwt dev mode, have it go to #Reports to avoid going to the slower
dashboards page first
diff --git a/etc/eclipse-tools/maven/RHQ Maven Build - Run GWT DevMode-JPDA-Params.launch
b/etc/eclipse-tools/maven/RHQ Maven Build - Run GWT DevMode-JPDA-Params.launch
index 9791adc..0d61259 100644
--- a/etc/eclipse-tools/maven/RHQ Maven Build - Run GWT DevMode-JPDA-Params.launch
+++ b/etc/eclipse-tools/maven/RHQ Maven Build - Run GWT DevMode-JPDA-Params.launch
@@ -6,6 +6,6 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION"
value="${env_var:M2_HOME}/bin/${MAVEN_EXE}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"
value="-o -Dmaven.test.skip=true gwt:debug
-DcoreGuiParams=?enableLocators=true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"
value="-o -Dmaven.test.skip=true gwt:debug
-DcoreGuiParams=?enableLocators=true#Reports"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY"
value="${workspace_loc:/rhq/modules/enterprise/gui/coregui}"/>
</launchConfiguration>
diff --git a/etc/eclipse-tools/maven/RHQ Maven Build - Run GWT DevMode-JPDA.launch
b/etc/eclipse-tools/maven/RHQ Maven Build - Run GWT DevMode-JPDA.launch
index 6f5b7c2..959f956 100644
--- a/etc/eclipse-tools/maven/RHQ Maven Build - Run GWT DevMode-JPDA.launch
+++ b/etc/eclipse-tools/maven/RHQ Maven Build - Run GWT DevMode-JPDA.launch
@@ -6,6 +6,6 @@
<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION"
value="${env_var:M2_HOME}/bin/${MAVEN_EXE}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"
value="-o -Dmaven.test.skip=true gwt:debug"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"
value="-o -Dmaven.test.skip=true gwt:debug -DcoreGuiParams=#Reports"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY"
value="${workspace_loc:/rhq/modules/enterprise/gui/coregui}"/>
</launchConfiguration>