[jboss-svn-commits] JBL Code SVN: r35695 - in labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing: swingui and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: ge0ffrey
Date: 2010-10-24 14:17:15 -0400 (Sun, 24 Oct 2010)
New Revision: 35695

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudComputer.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudProcess.java
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/swingui/CloudBalancingPanel.java
Log:
cloudbalance panel: better overview

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudComputer.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudComputer.java	2010-10-24 14:48:24 UTC (rev 35694)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudComputer.java	2010-10-24 18:17:15 UTC (rev 35695)
@@ -64,7 +64,7 @@
     }
 
     public String getLabel() {
-        return "Hardware:\nCPU " + cpuPower + " GHz\nRAM " + memory + " GB\nNetwork " + networkBandwidth + " GB";
+        return "Computer(" + id + "):\nCPU " + cpuPower + " GHz\nRAM " + memory + " GB\nNetwork " + networkBandwidth + " GB";
     }
 
     public int compareTo(CloudComputer other) {

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudProcess.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudProcess.java	2010-10-24 14:48:24 UTC (rev 35694)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudProcess.java	2010-10-24 18:17:15 UTC (rev 35695)
@@ -59,7 +59,7 @@
     }
 
     public String getLabel() {
-        return "Minimal:\nCPU " + minimalCpuPower + " GHz\nRAM " + minimalMemory + " GB\nNetwork "
+        return "Id " + id + ",minimal:\nCPU " + minimalCpuPower + " GHz\nRAM " + minimalMemory + " GB\nNetwork "
                 + minimalNetworkBandwidth + " GB";
     }
 

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/swingui/CloudBalancingPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/swingui/CloudBalancingPanel.java	2010-10-24 14:48:24 UTC (rev 35694)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/swingui/CloudBalancingPanel.java	2010-10-24 18:17:15 UTC (rev 35695)
@@ -18,6 +18,7 @@
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.FlowLayout;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
@@ -53,6 +54,8 @@
 public class CloudBalancingPanel extends SolutionPanel {
 
     private static final Color HEADER_COLOR = Color.YELLOW;
+    private static final int TEXT_AREA_ROWS = 4;
+    private static final int TEXT_AREA_COLUMNS = 14;
 
 
     public CloudBalancingPanel() {
@@ -85,19 +88,22 @@
     }
 
     private JPanel createHeaderPanel() {
-        JPanel headerPanel = new JPanel(new GridLayout(1, 0));
-        JLabel cloudComputerLabel = new JLabel("CloudComputer");
+        JPanel headerPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+        headerPanel.setBorder(BorderFactory.createCompoundBorder(
+                    BorderFactory.createLineBorder(Color.LIGHT_GRAY),
+                    BorderFactory.createEmptyBorder(2, 2, 2, 2)));
+        JTextArea cloudComputerLabel = new JTextArea("CloudComputer", TEXT_AREA_ROWS, TEXT_AREA_COLUMNS);
         cloudComputerLabel.setBorder(BorderFactory.createCompoundBorder(
                 BorderFactory.createLineBorder(Color.DARK_GRAY),
                 BorderFactory.createEmptyBorder(2, 2, 2, 2)));
         cloudComputerLabel.setBackground(HEADER_COLOR);
-        cloudComputerLabel.setOpaque(true);
+        cloudComputerLabel.setEditable(false);
         headerPanel.add(cloudComputerLabel);
-        JLabel cloudProcessLabel = new JLabel("CloudProcess");
+        JTextArea cloudProcessLabel = new JTextArea("CloudProcess", TEXT_AREA_ROWS, TEXT_AREA_COLUMNS);
         cloudProcessLabel.setBorder(BorderFactory.createCompoundBorder(
                 BorderFactory.createLineBorder(Color.DARK_GRAY),
                 BorderFactory.createEmptyBorder(2, 2, 2, 2)));
-        cloudProcessLabel.setOpaque(true);
+        cloudProcessLabel.setEditable(false);
         headerPanel.add(cloudProcessLabel);
         return headerPanel;
     }
@@ -107,12 +113,12 @@
         private final CloudComputer cloudComputer;
 
         public CloudComputerPanel(CloudComputer cloudComputer) {
-            setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+            setLayout(new FlowLayout(FlowLayout.LEFT));
             this.cloudComputer = cloudComputer;
             setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));
-            JTextArea cloudComputerLabel = new JTextArea(cloudComputer.getLabel(), 4, 14);
+            JTextArea cloudComputerLabel = new JTextArea(cloudComputer.getLabel(), TEXT_AREA_ROWS, TEXT_AREA_COLUMNS);
             cloudComputerLabel.setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));
@@ -124,14 +130,14 @@
         public void addCloudAssignment(CloudAssignment cloudAssignment) {
             JPanel cloudAssignmentPanel = new JPanel();
             cloudAssignmentPanel.setLayout(new BoxLayout(cloudAssignmentPanel, BoxLayout.X_AXIS));
-            JButton button = new JButton(new CloudAssignmentAction(cloudAssignment));
-            cloudAssignmentPanel.add(button);
             cloudAssignmentPanel.setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));
-            JTextArea cloudAssignmentLabel = new JTextArea(cloudAssignment.getLabel(), 4, 14);
+            JTextArea cloudAssignmentLabel = new JTextArea(cloudAssignment.getLabel(), TEXT_AREA_ROWS, TEXT_AREA_COLUMNS);
             cloudAssignmentLabel.setEditable(false);
             cloudAssignmentPanel.add(cloudAssignmentLabel);
+            JButton button = new JButton(new CloudAssignmentAction(cloudAssignment));
+            cloudAssignmentPanel.add(button);
             add(cloudAssignmentPanel);
         }
 
@@ -142,7 +148,7 @@
         private CloudAssignment cloudAssignment;
 
         public CloudAssignmentAction(CloudAssignment cloudAssignment) {
-            super("Id " + cloudAssignment.getId());
+            super("=>");
             this.cloudAssignment = cloudAssignment;
         }