[jboss-svn-commits] JBL Code SVN: r35694 - 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 10:48:24 -0400 (Sun, 24 Oct 2010)
New Revision: 35694

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:41:52 UTC (rev 35693)
+++ 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)
@@ -64,7 +64,7 @@
     }
 
     public String getLabel() {
-        return "CPU " + cpuPower + " GHz\nRAM " + memory + " GB\nNetwork " + networkBandwidth + " GB";
+        return "Hardware:\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:41:52 UTC (rev 35693)
+++ 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)
@@ -59,7 +59,7 @@
     }
 
     public String getLabel() {
-        return "Minimal: CPU " + minimalCpuPower + " GHz\nRAM " + minimalMemory + " GB\nNetwork "
+        return "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:41:52 UTC (rev 35693)
+++ 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)
@@ -107,12 +107,12 @@
         private final CloudComputer cloudComputer;
 
         public CloudComputerPanel(CloudComputer cloudComputer) {
-            setLayout(new GridLayout(1, 0));
+            setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
             this.cloudComputer = cloudComputer;
             setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));
-            JTextArea cloudComputerLabel = new JTextArea(cloudComputer.getLabel());
+            JTextArea cloudComputerLabel = new JTextArea(cloudComputer.getLabel(), 4, 14);
             cloudComputerLabel.setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));
@@ -122,13 +122,14 @@
         }
 
         public void addCloudAssignment(CloudAssignment cloudAssignment) {
-            JPanel cloudAssignmentPanel = new JPanel(new GridLayout(1, 0));
+            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());
+            JTextArea cloudAssignmentLabel = new JTextArea(cloudAssignment.getLabel(), 4, 14);
             cloudAssignmentLabel.setEditable(false);
             cloudAssignmentPanel.add(cloudAssignmentLabel);
             add(cloudAssignmentPanel);