modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 10 +--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java | 21 ++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 24 +--------- 3 files changed, 26 insertions(+), 29 deletions(-)
New commits: commit 6f81d33409dd1c2098ffc7ee7e35ee824d1a2026 Author: Joseph Marques joseph@redhat.com Date: Mon Oct 25 19:11:04 2010 -0400
favor direct attribute access instead of multiple maps to lookup icon/style
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java index a9e94c2..81f9882 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java @@ -38,7 +38,26 @@ public class Message {
// TODO: Add Debug severity? public enum Severity { - Info, Warning, Error, Fatal + Info("InfoBlock", "info/icn_info_blue.png"), // + Warning("WarnBlock", "info/icn_info_orange.png"), // + Error("ErrorBlock", "info/icn_info_red.png"), // + Fatal("FatalBlock", "info/icn_info_red.png"); + + private String style; + private String icon; + + private Severity(String style, String icon) { + this.style = style; + this.icon = icon; + } + + public String getStyle() { + return style; + } + + public String getIcon() { + return icon; + } };
public enum Option { 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 04fceff..1f95a24 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 @@ -19,9 +19,6 @@ */ package org.rhq.enterprise.gui.coregui.client.util.message;
-import java.util.HashMap; -import java.util.Map; - import com.google.gwt.user.client.Timer; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.Overflow; @@ -40,21 +37,6 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag private static final String LOCATOR_ID = "MessageBar"; private static final int AUTO_HIDE_DELAY_MILLIS = 15000; // 15 seconds
- private static final Map<Message.Severity, String> SEVERITY_TO_STYLE_NAME_MAP = new HashMap<Message.Severity, String>(); - static { - SEVERITY_TO_STYLE_NAME_MAP.put(Message.Severity.Info, "InfoBlock"); - SEVERITY_TO_STYLE_NAME_MAP.put(Message.Severity.Warning, "WarnBlock"); - SEVERITY_TO_STYLE_NAME_MAP.put(Message.Severity.Error, "ErrorBlock"); - SEVERITY_TO_STYLE_NAME_MAP.put(Message.Severity.Fatal, "FatalBlock"); - } - - private static final Map<Message.Severity, String> SEVERITY_TO_ICON_MAP = new HashMap<Message.Severity, String>(); - static { - SEVERITY_TO_ICON_MAP.put(Message.Severity.Info, "info/icn_info_blue.png"); - SEVERITY_TO_ICON_MAP.put(Message.Severity.Warning, "info/icn_info_orange.png"); - SEVERITY_TO_ICON_MAP.put(Message.Severity.Error, "info/icn_info_red.png"); - } - private Label label; private Message stickyMessage;
@@ -89,7 +71,7 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag } else { Timer hideTimer = new Timer() { @Override - public void run() { + public void run() { clearMessage(false); if (stickyMessage != null) { displayMessage(stickyMessage); @@ -130,7 +112,7 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag label.setContents(contents); label.setAlign(Alignment.CENTER);
- String styleName = (contents != null) ? SEVERITY_TO_STYLE_NAME_MAP.get(message.getSeverity()) : null; + String styleName = (contents != null) ? message.getSeverity().getStyle() : null; label.setStyleName(styleName);
label.setWidth(400); @@ -139,7 +121,7 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag // label. //label.setShowEdges(true);
- String icon = (contents != null) ? SEVERITY_TO_ICON_MAP.get(message.getSeverity()) : null; + String icon = (contents != null) ? message.getSeverity().getIcon() : null; label.setIcon(icon);
return label;
commit c6879b2c24e72b676ba4a7b512f3a14b988d8801 Author: Joseph Marques joseph@redhat.com Date: Mon Oct 25 19:10:13 2010 -0400
get rid of unused method
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java index d61a308..a129b24 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java @@ -122,8 +122,8 @@ public abstract class RPCDataSource<T> extends DataSource { if (request.getStartRow() == null || request.getEndRow() == null) { pageControl = new PageControl(); } else { - pageControl = PageControl.getExplicitPageControl(request.getStartRow(), request.getEndRow() - - request.getStartRow()); + pageControl = PageControl.getExplicitPageControl(request.getStartRow(), + request.getEndRow() - request.getStartRow()); }
// Initialize sorting. @@ -260,12 +260,8 @@ public abstract class RPCDataSource<T> extends DataSource { return newRecord; }
- public static <S> S[] getArrayFilter(DSRequest request, String paramName, Class<S> type) { - return getArrayFilter(request, paramName, type, null); - } - @SuppressWarnings("unchecked") - public static <S> S[] getArrayFilter(DSRequest request, String paramName, Class<S> type, S[] dummy) { + public static <S> S[] getArrayFilter(DSRequest request, String paramName, Class<S> type) { com.allen_sauer.gwt.log.client.Log.debug("Fetching array " + paramName + " (" + type + ")"); Criteria criteria = request.getCriteria(); Map<String, Object> criteriaMap = criteria.getValues();
rhq-commits@lists.fedorahosted.org