增加图形化灰度发布功能

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/util/UIUtil.java → discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/ui/UIFactory.java

-package com.nepxion.discovery.console.desktop.util;
+package com.nepxion.discovery.console.desktop.ui;
 
 /**
  * <p>Title: Nepxion Thunder</p>
@@ -19,7 +19,7 @@ import javax.swing.border.TitledBorder;
 import com.nepxion.discovery.console.desktop.context.UIContext;
 import com.nepxion.swing.separator.JBasicSeparator;
 
-public class UIUtil {
+public class UIFactory {
     public static JBasicSeparator createSeparator() {
         JBasicSeparator separator = new JBasicSeparator(JBasicSeparator.HORIZONTAL, JBasicSeparator.LOWERED_STYLE, -1);
         separator.setBrightColor(new Color(197, 196, 198));

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/RouterTopology.java

@@ -9,10 +9,7 @@ package com.nepxion.discovery.console.desktop.workspace;
  * @version 1.0
  */
 
-import twaver.BlinkingRule;
-import twaver.Element;
 import twaver.Generator;
-import twaver.TWaverConst;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -78,6 +75,7 @@ public class RouterTopology extends AbstractTopology {
     public RouterTopology() {
         initializeToolBar();
         initializeTopology();
+        initializeListener();
     }
 
     private void initializeToolBar() {
@@ -99,21 +97,14 @@ public class RouterTopology extends AbstractTopology {
     }
 
     private void initializeTopology() {
-        graph.setBlinkingRule(new BlinkingRule() {
-            public boolean isBodyBlinking(Element element) {
-                return element.getAlarmState().getHighestNativeAlarmSeverity() != null || element.getClientProperty(TWaverConst.PROPERTYNAME_RENDER_COLOR) != null;
-            }
-
-            public boolean isOutlineBlinking(Element element) {
-                return element.getAlarmState().getPropagateSeverity() != null || element.getClientProperty(TWaverConst.PROPERTYNAME_STATE_OUTLINE_COLOR) != null;
-            }
-        });
         graph.setElementStateOutlineColorGenerator(new Generator() {
             public Object generate(Object object) {
                 return null;
             }
         });
+    }
 
+    private void initializeListener() {
         addHierarchyListener(new DisplayAbilityListener() {
             public void displayAbilityChanged(HierarchyEvent e) {
                 // Ugly code
@@ -216,6 +207,7 @@ public class RouterTopology extends AbstractTopology {
     @SuppressWarnings({ "unchecked" })
     public void setServices(Object[] services) {
         comboBox.setModel(new DefaultComboBoxModel<>(services));
+        comboBox.setPreferredSize(new Dimension(comboBox.getPreferredSize().width + 5, comboBox.getPreferredSize().height));
     }
 
     public void setInstance(InstanceEntity instance) {

discovery-console-desktop/src/main/java/com/nepxion/discovery/console/desktop/workspace/ServiceTopology.java

@@ -47,7 +47,7 @@ import com.nepxion.discovery.console.desktop.entity.InstanceEntity;
 import com.nepxion.discovery.console.desktop.entity.ResultEntity;
 import com.nepxion.discovery.console.desktop.icon.ConsoleIconFactory;
 import com.nepxion.discovery.console.desktop.locale.ConsoleLocale;
-import com.nepxion.discovery.console.desktop.util.UIUtil;
+import com.nepxion.discovery.console.desktop.ui.UIFactory;
 import com.nepxion.discovery.console.desktop.workspace.topology.AbstractTopology;
 import com.nepxion.discovery.console.desktop.workspace.topology.LocationEntity;
 import com.nepxion.discovery.console.desktop.workspace.topology.TopologyEntity;
@@ -624,7 +624,7 @@ public class ServiceTopology extends AbstractTopology {
             layoutPanel.add(toolBar);
 
             JPanel panel = new JPanel();
-            panel.setBorder(UIUtil.createTitledBorder(ConsoleLocale.getString("title_gray_version_operation")));
+            panel.setBorder(UIFactory.createTitledBorder(ConsoleLocale.getString("title_gray_version_operation")));
             panel.setLayout(new BorderLayout());
             panel.add(versionTabbedPane, BorderLayout.CENTER);
             panel.add(layoutPanel, BorderLayout.SOUTH);
@@ -655,7 +655,7 @@ public class ServiceTopology extends AbstractTopology {
             ButtonManager.updateUI(toolBar);
 
             JPanel panel = new JPanel();
-            panel.setBorder(UIUtil.createTitledBorder(ConsoleLocale.getString("title_gray_rule_operation")));
+            panel.setBorder(UIFactory.createTitledBorder(ConsoleLocale.getString("title_gray_rule_operation")));
             panel.setLayout(new BorderLayout());
             panel.add(ruleTabbedPane, BorderLayout.CENTER);
             panel.add(toolBar, BorderLayout.SOUTH);
@@ -940,7 +940,7 @@ public class ServiceTopology extends AbstractTopology {
 
             JPanel groupPanel = new JPanel();
             groupPanel.setLayout(tableLayout);
-            groupPanel.setBorder(UIUtil.createTitledBorder(ConsoleLocale.getString("group_layout")));
+            groupPanel.setBorder(UIFactory.createTitledBorder(ConsoleLocale.getString("group_layout")));
             groupPanel.add(new JBasicLabel(ConsoleLocale.getString("start_x")), "0, 0");
             groupPanel.add(groupStartXTextField, "1, 0");
             groupPanel.add(new JBasicLabel(ConsoleLocale.getString("start_y")), "2, 0");
@@ -952,7 +952,7 @@ public class ServiceTopology extends AbstractTopology {
 
             JPanel nodePanel = new JPanel();
             nodePanel.setLayout(tableLayout);
-            nodePanel.setBorder(UIUtil.createTitledBorder(ConsoleLocale.getString("node_layout")));
+            nodePanel.setBorder(UIFactory.createTitledBorder(ConsoleLocale.getString("node_layout")));
             nodePanel.add(new JBasicLabel(ConsoleLocale.getString("start_x")), "0, 0");
             nodePanel.add(nodeStartXTextField, "1, 0");
             nodePanel.add(new JBasicLabel(ConsoleLocale.getString("start_y")), "2, 0");