modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java | 78 ++++++++++ modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 43 +++++ modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 10 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java | 8 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java | 12 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java | 17 +- modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/table/recentOOBs.xhtml | 2 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 62 +++---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java | 2 21 files changed, 192 insertions(+), 66 deletions(-)
New commits: commit 92d9fd4abdee8f56cbe8810141c43c181e04ef7a Author: Greg Hinkle ghinkle@redhat.com Date: Wed Feb 24 17:42:15 2010 -0500
Now have two separate MeasurementConverters. One for gwt and one for the rest of the server side stuff. May not be a great long term solution, but fixes the issues in the JSF pages
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java index 5f3e110..716009d 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListAlertHistoryUIBean.java @@ -40,12 +40,12 @@ import org.rhq.core.domain.alert.AlertPriority; import org.rhq.core.domain.alert.composite.AlertWithLatestConditionLog; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.common.composite.IntegerOptionItem; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.gui.util.FacesContextUtility; import org.rhq.core.gui.util.StringUtility; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.gui.common.converter.SelectItemUtils; import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; import org.rhq.enterprise.gui.common.paging.PageControlView; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java index cd36869..2c169cf 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/ListGroupAlertHistoryUIBean.java @@ -41,13 +41,13 @@ import org.rhq.core.domain.alert.composite.AlertWithLatestConditionLog; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.common.composite.IntegerOptionItem; import org.rhq.core.domain.criteria.AlertCriteria; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.group.ResourceGroup; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.gui.util.FacesContextUtility; import org.rhq.core.gui.util.StringUtility; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.gui.common.converter.SelectItemUtils; import org.rhq.enterprise.gui.common.framework.PagedDataTableUIBean; import org.rhq.enterprise.gui.common.paging.PageControlView; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java index f66175d..33fefdb 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/BaselineDescriber.java @@ -20,8 +20,8 @@ package org.rhq.enterprise.gui.alert.description;
import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionCategory; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.server.measurement.util.MeasurementFormatter;
/** diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java index b0c9115..495a0d5 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/alert/description/ThresholdDescriber.java @@ -21,7 +21,7 @@ package org.rhq.enterprise.gui.alert.description; import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionCategory; import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.measurement.MeasurementConverter; +import org.rhq.core.server.MeasurementConverter;
/** * Describes <code>THRESHOLD </code> {@link AlertCondition}s. diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java index d177c7b..a5afb1f 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/HorizontalChart.java @@ -18,15 +18,15 @@ */ package org.rhq.enterprise.gui.image.chart;
+import org.rhq.core.server.MeasurementConverter; +import org.rhq.enterprise.gui.image.data.IDataPoint; +import org.rhq.enterprise.gui.image.data.IDisplayDataPoint; + import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import java.util.Iterator;
-import org.rhq.core.domain.measurement.MeasurementConverter; -import org.rhq.enterprise.gui.image.data.IDataPoint; -import org.rhq.enterprise.gui.image.data.IDisplayDataPoint; - public class HorizontalChart extends Chart { private Rectangle m_rect;
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java index c6be083..9e823a2 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/image/chart/VerticalChart.java @@ -18,6 +18,12 @@ */ package org.rhq.enterprise.gui.image.chart;
+import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.server.MeasurementConverter; +import org.rhq.enterprise.gui.image.data.IDataPoint; +import org.rhq.enterprise.gui.image.data.IDisplayDataPoint; +import org.rhq.enterprise.gui.image.data.IHighLowDataPoint; + import java.awt.Color; import java.awt.Graphics2D; import java.awt.Point; @@ -25,12 +31,6 @@ import java.awt.Rectangle; import java.util.Collection; import java.util.Iterator;
-import org.rhq.core.domain.measurement.MeasurementConverter; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.enterprise.gui.image.data.IDataPoint; -import org.rhq.enterprise.gui.image.data.IDisplayDataPoint; -import org.rhq.enterprise.gui.image.data.IHighLowDataPoint; - public class VerticalChart extends Chart {
protected static final Color[] DEFAULT_COLORS = { new Color(0x00, 0x00, 0xFF), new Color(0xFF, 0x00, 0x00), diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java index 8e1b3a7..cad7ed3 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/AlertDefUtil.java @@ -37,8 +37,8 @@ import org.rhq.core.domain.alert.AlertDefinitionContext; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.operation.OperationDefinition; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.gui.legacy.Constants; import org.rhq.enterprise.gui.legacy.action.resource.ResourceForm.FormContext; import org.rhq.enterprise.gui.legacy.beans.AlertConditionBean; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java index d176a9c..7f4bafe 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/ViewAlertAction.java @@ -44,7 +44,7 @@ import org.rhq.core.domain.alert.AlertConditionLog; import org.rhq.core.domain.alert.AlertDefinition; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.measurement.MeasurementDefinition; -import org.rhq.core.domain.measurement.MeasurementConverter; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.gui.legacy.AttrConstants; import org.rhq.enterprise.gui.legacy.beans.AlertConditionBean; import org.rhq.enterprise.gui.legacy.util.RequestUtils; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java index 13aeb70..93e7590 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/MeasurementConverterValidator.java @@ -25,11 +25,11 @@ import org.apache.struts.action.ActionMessage; import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionCategory; import org.rhq.core.domain.auth.Subject; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementUnits; import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits; import org.rhq.core.domain.measurement.util.MeasurementConversionException; +import org.rhq.core.server.MeasurementConverter; import org.rhq.core.server.MeasurementParser; import org.rhq.core.util.NumberUtil; import org.rhq.enterprise.gui.legacy.action.resource.common.monitor.alerts.config.ConditionBean; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java index af9d61d..368c4eb 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java @@ -38,7 +38,6 @@ import org.rhq.core.clientapi.util.ArrayUtil; import org.rhq.core.clientapi.util.StringUtil; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.measurement.MeasurementBaseline; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.MeasurementUnits; @@ -49,6 +48,7 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.resource.group.Group; import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.core.domain.util.PageControl; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.gui.common.servlet.HighLowMetricValue; import org.rhq.enterprise.gui.legacy.AttrConstants; import org.rhq.enterprise.gui.legacy.DefaultConstants; diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java index 01e362e..dd91f1a 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/MetricDisplayTag.java @@ -18,17 +18,20 @@ */ package org.rhq.enterprise.gui.legacy.taglib;
-import java.io.IOException; -import java.text.NumberFormat; -import java.util.Locale; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.TagSupport; +import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.server.MeasurementConverter; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.util.RequestUtils; import org.apache.taglibs.standard.tag.el.core.ExpressionUtil; -import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.measurement.MeasurementConverter; + +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.tagext.TagSupport; + +import java.io.IOException; +import java.text.NumberFormat; +import java.util.Locale;
/** * This is a locale aware tag for displaying metrics and units. Suppose you have a metricDisplaySummary.setMin(9234289) diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java index 673db6b..f431449 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/display/MetricDecorator.java @@ -33,8 +33,8 @@ import org.rhq.core.clientapi.util.units.ScaleConstants; import org.rhq.core.clientapi.util.units.UnitNumber; import org.rhq.core.clientapi.util.units.UnitsConstants; import org.rhq.core.clientapi.util.units.UnitsFormat; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.measurement.MeasurementUnits; +import org.rhq.core.server.MeasurementConverter;
/** * This class is a two in one decorator/tag for use within the <code>TableTag</code>; it is a <code> diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java index 6253c8d..730802a 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/navigation/resource/ResourceTreeModelUIBean.java @@ -196,7 +196,7 @@ public class ResourceTreeModelUIBean { AutoGroupComposite compositeParent = (AutoGroupComposite) parentNode.getData();
Map<Object, List<Resource>> children = new HashMap<Object, List<Resource>>(); - log.error("composite parent" + compositeParent); + log.trace("composite parent" + compositeParent); if (compositeParent != null) { for (Resource res : compositeParent.getParentResource().getChildResources()) { if (compositeParent.getSubcategory() != null) { diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java index 7d1b7dd..28369a2 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/subsystem/SubsystemAlertHistoryUIBean.java @@ -32,10 +32,10 @@ import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionCategory; import org.rhq.core.domain.alert.AlertConditionLog; import org.rhq.core.domain.alert.composite.AlertHistoryComposite; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.gui.util.FacesContextUtility; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.gui.common.converter.SelectItemUtils; import org.rhq.enterprise.gui.common.paging.PageControlView; import org.rhq.enterprise.gui.common.paging.PagedListDataModel; diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/table/recentOOBs.xhtml b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/table/recentOOBs.xhtml index 184ebad..a696306 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/table/recentOOBs.xhtml +++ b/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/table/recentOOBs.xhtml @@ -30,8 +30,6 @@ </h:outputText> <br/> <div style="text-indent: 30px;"> - <h:outputText value="value= ${item.formattedOutlier}"/> - <h:outputText value="; band= ( ${item.formattedBaseband} )"/> </div> <br /> </div> diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java index bf00de2..d1ff605 100644 --- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java +++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java @@ -45,7 +45,6 @@ import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria; import org.rhq.core.domain.measurement.DataType; import org.rhq.core.domain.measurement.MeasurementCategory; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.measurement.MeasurementData; import org.rhq.core.domain.measurement.MeasurementDefinition; import org.rhq.core.domain.measurement.MeasurementUnits; @@ -57,6 +56,7 @@ import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; import org.rhq.core.domain.util.Summary; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.client.RemoteClient; import org.rhq.enterprise.client.ClientMain; import org.rhq.enterprise.client.utility.LazyLoadScenario; diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java index 84e1863..057ce4d 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java @@ -18,36 +18,6 @@ */ package org.rhq.enterprise.server.alert;
-import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionAttributeType; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.sql.DataSource; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.quartz.SchedulerException; -import org.quartz.SimpleTrigger; - -import org.jboss.annotation.IgnoreDependency; -import org.jboss.annotation.ejb.TransactionTimeout; - import org.rhq.core.domain.alert.Alert; import org.rhq.core.domain.alert.AlertCondition; import org.rhq.core.domain.alert.AlertConditionCategory; @@ -63,12 +33,12 @@ import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.criteria.AlertCriteria; import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.MeasurementUnits; -import org.rhq.core.domain.measurement.MeasurementConverter; import org.rhq.core.domain.operation.OperationDefinition; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; import org.rhq.core.domain.util.PageOrdering; +import org.rhq.core.server.MeasurementConverter; import org.rhq.core.server.PersistenceUtility; import org.rhq.core.util.collection.ArrayUtils; import org.rhq.core.util.jdbc.JDBCUtil; @@ -94,6 +64,36 @@ import org.rhq.enterprise.server.util.CriteriaQueryGenerator; import org.rhq.enterprise.server.util.CriteriaQueryRunner; import org.rhq.enterprise.server.util.LookupUtil;
+import org.jboss.annotation.IgnoreDependency; +import org.jboss.annotation.ejb.TransactionTimeout; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.quartz.SchedulerException; +import org.quartz.SimpleTrigger; + +import javax.ejb.EJB; +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; +import javax.sql.DataSource; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * @author Joseph Marques * @author Ian Springer diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java index 4988e54..9bf5ec7 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementFormatter.java @@ -21,7 +21,7 @@ package org.rhq.enterprise.server.measurement.util; import org.rhq.core.domain.measurement.MeasurementBaseline; import org.rhq.core.domain.measurement.MeasurementSchedule; import org.rhq.core.domain.measurement.util.MeasurementConversionException; -import org.rhq.core.domain.measurement.MeasurementConverter; +import org.rhq.core.server.MeasurementConverter; import org.rhq.enterprise.server.legacy.measurement.MeasurementConstants;
public class MeasurementFormatter {
commit 7a63f079f65b80dabe539ebc64f3103e5e39ce93 Author: Greg Hinkle ghinkle@redhat.com Date: Wed Feb 24 17:41:15 2010 -0500
New loading page, new "simple" collapsible panel
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java new file mode 100644 index 0000000..84d7c8c --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/SimpleCollapsiblePanel.java @@ -0,0 +1,78 @@ +/* + * 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.components; + +import com.smartgwt.client.types.SelectionType; +import com.smartgwt.client.widgets.Button; +import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; +import com.smartgwt.client.widgets.layout.VLayout; + +/** + * @author Greg Hinkle + */ +public class SimpleCollapsiblePanel extends VLayout { + + + private Canvas content; + private String title; + + private boolean expanded = true; + + + public SimpleCollapsiblePanel(String title, Canvas content) { + this.content = content; + this.title = title; + setWidth100(); + } + + + @Override + protected void onInit() { + super.onInit(); + + final Button button = new Button(title); + button.setShowRollOver(false); + button.setActionType(SelectionType.RADIO); + button.setBorder(null); + + + button.setIcon("[skin]/images/SectionHeader/opener_opened.png"); + button.setBaseStyle("SimpleButton"); + + button.addClickHandler(new ClickHandler() { + public void onClick(ClickEvent clickEvent) { + expanded = !expanded; + if (expanded) { + button.setIcon("[skin]/images/SectionHeader/opener_opened.png"); + content.show(); + } else { + button.setIcon("[skin]/images/SectionHeader/opener_closed.png"); + content.hide(); + } + markForRedraw(); + } + }); + + + addMember(button); + addMember(content); + } +} diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css index 3674615..76cd9c5 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css +++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css @@ -138,4 +138,47 @@ z .SubTabButtonSelectedFocusedOver, .SubTabButtonSelectedDisabled { font-weight: bold; +} + + + +.SimpleButton, +.SimpleButtonOver, +.SimpleButtonFocused, +.SimpleButtonFocusedOver, +.SimpleButtonDown, +.SimpleButtonFocusedDown, +.SimpleButtonSelected, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedDown, +.SimpleButtonSelectedFocusedDown, +.SimpleButtonSelectedOver, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonDisabled, +.SimpleButtonSelectedDisabled, +.SimpleButtonDisabled, +.SimpleButtonDisabled, +.SimpleButtonSelectedDisabled, +.SimpleButtonFocused, +.SimpleButtonFocusedOver, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonSelectedFocusedDown , +.SimpleButtonOver, +.SimpleButtonFocusedOver, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedFocusedOver , +.SimpleButtonDown, +.SimpleButtonFocusedDown, +.SimpleButtonSelectedDown, +.SimpleButtonSelectedFocusedDown , +.SimpleButtonSelected, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedOver, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonSelectedDisabled{ + font-family: Arial, Verdana, Bitstream Vera Sans, sans-serif; + font-size: 11px; + padding: 2px; + font-weight: bold; } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html index 722fdc0..f7b8df4 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html +++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html @@ -10,9 +10,13 @@ <script type="text/javascript" language="javascript" src="org.rhq.enterprise.gui.coregui.CoreGUI/org.rhq.enterprise.gui.coregui.CoreGUI.nocache.js"></script>
-<div id="Loading-Panel" style="width: 210px;height: 80px; top: 300px; margin-left: auto;margin-right: auto;"> - <img src="images/rhq_logo_animated_100px.gif" alt="loading" style="border: 1px solid gray; margin: 5px;"> - <div> +<div id="Loading-Panel" style="width: 214px;height: 90px; margin-top: 300px; margin-left: auto;margin-right: auto;"> + + <div style="text-align: center; border: 3px solid lightgray;"> + <img src="images/rhq_logo_animated_100px.gif" alt="loading" style="margin: 5px;"> + Loading... + </div> +</div>
<iframe src="javascript:''" id="__gwt_historyFrame" style="width:0;height:0;border:0"></iframe>
rhq-commits@lists.fedorahosted.org