[jboss-svn-commits] JBL Code SVN: r35692 - 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 06:30:28 -0400 (Sun, 24 Oct 2010)
New Revision: 35692

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 10:23:13 UTC (rev 35691)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudComputer.java	2010-10-24 10:30:28 UTC (rev 35692)
@@ -64,7 +64,7 @@
     }
 
     public String getLabel() {
-        return "CPU " + cpuPower + " GHz / RAM " + memory + " GB / Network " + networkBandwidth + " GB";
+        return "CPU " + 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 10:23:13 UTC (rev 35691)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudProcess.java	2010-10-24 10:30:28 UTC (rev 35692)
@@ -59,7 +59,7 @@
     }
 
     public String getLabel() {
-        return "Minimal: CPU " + minimalCpuPower + " GHz / RAM " + minimalMemory + " GB / Network "
+        return "Minimal: CPU " + 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 10:23:13 UTC (rev 35691)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/swingui/CloudBalancingPanel.java	2010-10-24 10:30:28 UTC (rev 35692)
@@ -33,6 +33,7 @@
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JTextArea;
 
 import org.drools.planner.examples.cloudbalancing.domain.CloudAssignment;
 import org.drools.planner.examples.cloudbalancing.domain.CloudBalance;
@@ -111,18 +112,26 @@
             setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));
-            JLabel cloudComputerLabel = new JLabel(cloudComputer.getLabel());
+            JTextArea cloudComputerLabel = new JTextArea(cloudComputer.getLabel());
             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);
             add(cloudComputerLabel);
         }
 
         public void addCloudAssignment(CloudAssignment cloudAssignment) {
+            JPanel cloudAssignmentPanel = new JPanel(new GridLayout(0, 1));
+            cloudAssignmentPanel.setBorder(BorderFactory.createCompoundBorder(
+                    BorderFactory.createLineBorder(Color.DARK_GRAY),
+                    BorderFactory.createEmptyBorder(2, 2, 2, 2)));
+            JTextArea cloudAssignmentLabel = new JTextArea(cloudAssignment.getLabel());
+            cloudAssignmentLabel.setEditable(false);
+            cloudAssignmentPanel.add(cloudAssignmentLabel);
             JButton button = new JButton(new CloudAssignmentAction(cloudAssignment));
-            add(button);
+            cloudAssignmentPanel.add(button);
+            add(cloudAssignmentPanel);
         }
 
     }
@@ -132,7 +141,7 @@
         private CloudAssignment cloudAssignment;
 
         public CloudAssignmentAction(CloudAssignment cloudAssignment) {
-            super(cloudAssignment.getLabel());
+            super(Long.toString(cloudAssignment.getId()));
             this.cloudAssignment = cloudAssignment;
         }