[jboss-svn-commits] JBL Code SVN: r18122 - in labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination: swingui and 1 other directory.

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

Author: ge0ffrey
Date: 2008-01-25 11:40:45 -0500 (Fri, 25 Jan 2008)
New Revision: 18122

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Period.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Room.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Topic.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/swingui/ExaminationPanel.java
Log:
better toString's

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java	2008-01-25 16:20:09 UTC (rev 18121)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Exam.java	2008-01-25 16:40:45 UTC (rev 18122)
@@ -122,7 +122,7 @@
 
     @Override
     public String toString() {
-        return topic + " @ " + period + " in " + room;
+        return topic + " @ " + period + " + " + room;
     }
 
     public int getTopicDuration() {

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Period.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Period.java	2008-01-25 16:20:09 UTC (rev 18121)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Period.java	2008-01-25 16:40:45 UTC (rev 18122)
@@ -71,7 +71,7 @@
 
     @Override
     public String toString() {
-        return id + "_d" + duration;
+        return id + " {D" + duration + "}";
     }
 
 }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Room.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Room.java	2008-01-25 16:20:09 UTC (rev 18121)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Room.java	2008-01-25 16:40:45 UTC (rev 18122)
@@ -35,7 +35,7 @@
 
     @Override
     public String toString() {
-        return id + "_c" + capacity;
+        return id + " {C" + capacity + "}";
     }
 
 }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Topic.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Topic.java	2008-01-25 16:20:09 UTC (rev 18121)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/domain/Topic.java	2008-01-25 16:40:45 UTC (rev 18122)
@@ -66,7 +66,7 @@
     }
 
     public String toString() {
-        return id + "_d" + duration + "_s" + getStudentSize();
+        return id + " {D" + duration + "|S" + getStudentSize() + "}";
     }
 
 }

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/swingui/ExaminationPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/swingui/ExaminationPanel.java	2008-01-25 16:20:09 UTC (rev 18121)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/swingui/ExaminationPanel.java	2008-01-25 16:40:45 UTC (rev 18122)
@@ -63,7 +63,7 @@
         }
         Map<Period, Map<Room, PeriodRoomPanel>> periodRoomPanelMap = new HashMap<Period, Map<Room, PeriodRoomPanel>>();
         for (Period period : examination.getPeriodList()) {
-            JLabel periodLabel = new JLabel(period.toString() + " (" + period.getStartDateTimeString() + ")");
+            JLabel periodLabel = new JLabel(period.toString() + " " + period.getStartDateTimeString());
             periodLabel.setBorder(BorderFactory.createCompoundBorder(
                     BorderFactory.createLineBorder(Color.DARK_GRAY),
                     BorderFactory.createEmptyBorder(2, 2, 2, 2)));