[jboss-svn-commits] JBL Code SVN: r35690 - 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:14:00 -0400 (Sun, 24 Oct 2010)
New Revision: 35690

Modified:
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudAssignment.java
   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: remove name property

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudAssignment.java
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudAssignment.java	2010-10-24 09:49:30 UTC (rev 35689)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudAssignment.java	2010-10-24 10:14:00 UTC (rev 35690)
@@ -50,7 +50,7 @@
     }
 
     public String getLabel() {
-        return cloudProcess.getName();
+        return cloudProcess.getLabel();
     }
 
     public int getMinimalCpuPower() {

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 09:49:30 UTC (rev 35689)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudComputer.java	2010-10-24 10:14:00 UTC (rev 35690)
@@ -26,20 +26,11 @@
 @XStreamAlias("CloudComputer")
 public class CloudComputer extends AbstractPersistable implements Comparable<CloudComputer> {
 
-    private String name;
     private int cpuPower; // in gigahertz
     private int memory; // in gigabyte RAM
     private int networkBandwidth; // in gigabyte per hour
     private int cost; // in euro per hour
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public int getCpuPower() {
         return cpuPower;
     }
@@ -72,15 +63,16 @@
         this.cost = cost;
     }
 
+    public String getLabel() {
+        return "CPU " + cpuPower + " GHz / RAM " + memory + " GB / Network " + networkBandwidth + " GB";
+    }
+
     public int compareTo(CloudComputer other) {
         return new CompareToBuilder()
-                .append(name, other.name)
+                .append(cpuPower, other.cpuPower)
+                .append(memory, other.memory)
+                .append(networkBandwidth, other.networkBandwidth)
                 .toComparison();
     }
 
-    @Override
-    public String toString() {
-        return name;
-    }
-
 }

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 09:49:30 UTC (rev 35689)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/domain/CloudProcess.java	2010-10-24 10:14:00 UTC (rev 35690)
@@ -26,19 +26,10 @@
 @XStreamAlias("CloudProcess")
 public class CloudProcess extends AbstractPersistable implements Comparable<CloudProcess> {
 
-    private String name;
     private int minimalCpuPower; // in gigahertz
     private int minimalMemory; // in gigabyte RAM
     private int minimalNetworkBandwidth; // in gigabyte per hour
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public int getMinimalCpuPower() {
         return minimalCpuPower;
     }
@@ -67,15 +58,17 @@
         return minimalCpuPower * minimalMemory * minimalNetworkBandwidth;
     }
 
+    public String getLabel() {
+        return "Minimal: CPU " + minimalCpuPower + " GHz / RAM " + minimalMemory + " GB / Network "
+                + minimalNetworkBandwidth + " GB";
+    }
+
     public int compareTo(CloudProcess other) {
         return new CompareToBuilder()
-                .append(name, other.name)
+                .append(minimalCpuPower, other.minimalCpuPower)
+                .append(minimalMemory, other.minimalMemory)
+                .append(minimalNetworkBandwidth, other.minimalNetworkBandwidth)
                 .toComparison();
     }
 
-    @Override
-    public String toString() {
-        return name;
-    }
-
 }

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 09:49:30 UTC (rev 35689)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/src/main/java/org/drools/planner/examples/cloudbalancing/swingui/CloudBalancingPanel.java	2010-10-24 10:14:00 UTC (rev 35690)
@@ -54,7 +54,7 @@
 
 
     public CloudBalancingPanel() {
-        setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+        setLayout(new GridLayout(0, 1));
     }
 
     private CloudBalance getCloudBalance() {
@@ -86,12 +86,12 @@
         private final CloudComputer cloudComputer;
 
         public CloudComputerPanel(CloudComputer cloudComputer) {
-            setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+            setLayout(new GridLayout(1, 0));
             this.cloudComputer = cloudComputer;
             setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));
-            JLabel cloudComputerLabel = new JLabel(cloudComputer.getName());
+            JLabel cloudComputerLabel = new JLabel(cloudComputer.getLabel());
             cloudComputerLabel.setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));