modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java
| 18 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDetailView.java
| 91 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java
| 3
7 files changed, 23 insertions(+), 99 deletions(-)
New commits:
commit fc373c2646c3700df778c76d1720e366a5907e85
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Feb 24 20:49:08 2011 -0500
fix some plugin config history things
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 3b462c2..15e0fb1 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
@@ -38,6 +38,7 @@ import org.rhq.core.domain.configuration.AbstractPropertyMap;
import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinition;
import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
@@ -173,14 +174,23 @@ public class ConfigurationComparisonView extends VLayout {
}
public static void displayComparisonDialog(final ArrayList<? extends
AbstractResourceConfigurationUpdate> configs) {
- int resourceId = configs.get(0).getResource().getResourceType().getId();
- ResourceTypeRepository.Cache.getInstance().getResourceTypes(resourceId,
-
EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition),
+ AbstractResourceConfigurationUpdate theFirstUpdateItem = configs.get(0);
+ int resourceId = theFirstUpdateItem.getResource().getResourceType().getId();
+ final boolean isResourceConfig = theFirstUpdateItem instanceof
ResourceConfigurationUpdate;
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(
+ resourceId,
+ isResourceConfig ?
EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition)
+ :
EnumSet.of(ResourceTypeRepository.MetadataType.pluginConfigurationDefinition),
new ResourceTypeRepository.TypeLoadedCallback() {
public void onTypesLoaded(ResourceType type) {
- ConfigurationDefinition definition =
type.getResourceConfigurationDefinition();
+ ConfigurationDefinition definition;
+ if (isResourceConfig) {
+ definition = type.getResourceConfigurationDefinition();
+ } else {
+ definition = type.getPluginConfigurationDefinition();
+ }
ArrayList<Configuration> configurations = new
ArrayList<Configuration>();
ArrayList<String> titles = new ArrayList<String>();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDetailView.java
deleted file mode 100644
index 926fa76..0000000
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDetailView.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 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 as published by
- * the Free Software Foundation version 2 of the License.
- *
- * 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 for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration;
-
-import java.util.EnumSet;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-
-import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.ViewPath;
-import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-
-/**
- * @author Greg Hinkle
- */
-public class AbstractConfigurationHistoryDetailView extends LocatableVLayout implements
BookmarkableView {
-
- public AbstractConfigurationHistoryDetailView(String locatorId) {
- super(locatorId);
-
- setWidth100();
- setHeight100();
- }
-
- private void displayHistory(final ResourceConfigurationUpdate update) {
-
-
ResourceTypeRepository.Cache.getInstance().getResourceTypes(update.getResource().getResourceType().getId(),
-
EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition),
- new ResourceTypeRepository.TypeLoadedCallback() {
-
- public void onTypesLoaded(ResourceType type) {
- ConfigurationDefinition definition =
type.getResourceConfigurationDefinition();
- ConfigurationEditor editor = new
ConfigurationEditor("ResConfigHist-"
- + update.getResource().getName(), definition,
update.getConfiguration());
- editor.setReadOnly(true);
- addMember(editor);
- markForRedraw();
- }
- });
- }
-
- @Override
- public void renderView(ViewPath viewPath) {
-
- int updateId = viewPath.getCurrentAsInt();
-
- ResourceConfigurationUpdateCriteria criteria = new
ResourceConfigurationUpdateCriteria();
- criteria.fetchConfiguration(true);
- criteria.fetchResource(true);
- criteria.addFilterId(updateId);
-
-
GWTServiceLookup.getConfigurationService().findResourceConfigurationUpdatesByCriteria(criteria,
- new AsyncCallback<PageList<ResourceConfigurationUpdate>>() {
- public void onFailure(Throwable caught) {
-
CoreGUI.getErrorHandler().handleError(MSG.view_configurationHistoryDetails_error_loadFailure(),
- caught);
- }
-
- public void onSuccess(PageList<ResourceConfigurationUpdate> result)
{
-
- ResourceConfigurationUpdate update = result.get(0);
- displayHistory(update);
- }
- });
- }
-}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
index d72af99..c8041fe 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java
@@ -29,7 +29,6 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate;
-import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationComparisonView;
@@ -123,9 +122,9 @@ public abstract class AbstractConfigurationHistoryView<T extends
AbstractConfigu
addTableAction(extendLocatorId("Compare"), MSG.common_button_compare(),
null, new AbstractTableAction(
TableActionEnablement.MULTIPLE) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
- ArrayList<ResourceConfigurationUpdate> configs = new
ArrayList<ResourceConfigurationUpdate>();
+ ArrayList<AbstractResourceConfigurationUpdate> configs = new
ArrayList<AbstractResourceConfigurationUpdate>();
for (ListGridRecord record : selection) {
- ResourceConfigurationUpdate update = (ResourceConfigurationUpdate)
record
+ AbstractResourceConfigurationUpdate update =
(AbstractResourceConfigurationUpdate) record
.getAttributeAsObject(AbstractConfigurationHistoryDataSource.Field.OBJECT);
configs.add(update);
}
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 a71c133..47dc9a0 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
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -106,6 +107,7 @@ public class ConfigurationHistoryDataSource extends
AbstractConfigurationHistory
@Override
public void onFailure(Throwable caught) {
// should we show an error message? this just means we
can't show any item as the "current" one
+ Log.error("cannot get latest resource config",
caught);
finish();
}
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 2ea63c4..420732c 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
@@ -58,6 +58,7 @@ public class ConfigurationHistoryDetailView extends LocatableVLayout
implements
ConfigurationEditor editor = new
ConfigurationEditor("ResConfigHist-"
+ update.getResource().getName(), definition,
update.getConfiguration());
editor.setReadOnly(true);
+ editor.setEditorTitle(MSG.common_title_version() + " - " +
update.getId());
addMember(editor);
markForRedraw();
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java
index 77a3bcc..b6831a5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -107,6 +108,7 @@ public class PluginConfigurationHistoryDataSource extends
@Override
public void onFailure(Throwable caught) {
// should we show an error message? this just means we
can't show any item as the "current" one
+ Log.error("cannot get latest plugin config",
caught);
finish();
}
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 f3d48f5..3d10722 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
@@ -50,7 +50,7 @@ public class PluginConfigurationHistoryDetailView extends
LocatableVLayout imple
private void displayHistory(final PluginConfigurationUpdate update) {
ResourceTypeRepository.Cache.getInstance().getResourceTypes(update.getResource().getResourceType().getId(),
-
EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition),
+
EnumSet.of(ResourceTypeRepository.MetadataType.pluginConfigurationDefinition),
new ResourceTypeRepository.TypeLoadedCallback() {
public void onTypesLoaded(ResourceType type) {
@@ -58,6 +58,7 @@ public class PluginConfigurationHistoryDetailView extends
LocatableVLayout imple
ConfigurationEditor editor = new
ConfigurationEditor("PluginConfigHist-"
+ update.getResource().getName(), definition,
update.getConfiguration());
editor.setReadOnly(true);
+ editor.setEditorTitle(MSG.common_title_version() + " - " +
update.getId());
addMember(editor);
markForRedraw();
}