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

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

Author: ge0ffrey
Date: 2009-06-28 15:20:19 -0400 (Sun, 28 Jun 2009)
New Revision: 27252

Modified:
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleInputConvertor.java
   labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/swingui/PatientAdmissionSchedulePanel.java
Log:
pas: specialismId 0 is no specialism

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleInputConvertor.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleInputConvertor.java	2009-06-28 19:07:51 UTC (rev 27251)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/persistence/PatientAdmissionScheduleInputConvertor.java	2009-06-28 19:20:19 UTC (rev 27252)
@@ -155,14 +155,21 @@
                             + ") after 1st pipeline (|) seperated by a space ( ).");
                 }
                 for (int j = 0; j < departmentSpecialismTokens.length; j += 2) {
-                    DepartmentSpecialism departmentSpecialism = new DepartmentSpecialism();
-                    departmentSpecialism.setId(departmentSpecialismId);
-                    departmentSpecialism.setDepartment(department);
-                    departmentSpecialism.setPriority(Integer.parseInt(departmentSpecialismTokens[j]));
-                    departmentSpecialism.setSpecialism(idToSpecialismMap.get(
-                            Long.parseLong(departmentSpecialismTokens[j + 1])));
-                    departmentSpecialismList.add(departmentSpecialism);
-                    departmentSpecialismId++;
+                    long specialismId = Long.parseLong(departmentSpecialismTokens[j + 1]);
+                    if (specialismId != 0) {
+                        DepartmentSpecialism departmentSpecialism = new DepartmentSpecialism();
+                        departmentSpecialism.setId(departmentSpecialismId);
+                        departmentSpecialism.setDepartment(department);
+                        departmentSpecialism.setPriority(Integer.parseInt(departmentSpecialismTokens[j]));
+                        Specialism specialism = idToSpecialismMap.get(specialismId);
+                        if (specialism == null) {
+                            throw new IllegalArgumentException("Read line (" + line
+                                + ") has a non existing specialismId (" + specialismId + ").");
+                        }
+                        departmentSpecialism.setSpecialism(specialism);
+                        departmentSpecialismList.add(departmentSpecialism);
+                        departmentSpecialismId++;
+                    }
                 }
             }
             patientAdmissionSchedule.setDepartmentList(departmentList);
@@ -217,13 +224,20 @@
                 for (int j = 0; j < roomSpecialismTokens.length; j += 2) {
                     int priority = Integer.parseInt(roomSpecialismTokens[j]);
                     long specialismId = Long.parseLong(roomSpecialismTokens[j + 1]);
-                    RoomSpecialism roomSpecialism = new RoomSpecialism();
-                    roomSpecialism.setId(roomSpecialismId);
-                    roomSpecialism.setRoom(room);
-                    roomSpecialism.setSpecialism(idToSpecialismMap.get(specialismId));
-                    roomSpecialism.setPriority(priority);
-                    roomSpecialismList.add(roomSpecialism);
-                    roomSpecialismId++;
+                    if (specialismId != 0) {
+                        RoomSpecialism roomSpecialism = new RoomSpecialism();
+                        roomSpecialism.setId(roomSpecialismId);
+                        roomSpecialism.setRoom(room);
+                        Specialism specialism = idToSpecialismMap.get(specialismId);
+                        if (specialism == null) {
+                            throw new IllegalArgumentException("Read line (" + line
+                                + ") has a non existing specialismId (" + specialismId + ").");
+                        }
+                        roomSpecialism.setSpecialism(specialism);
+                        roomSpecialism.setPriority(priority);
+                        roomSpecialismList.add(roomSpecialism);
+                        roomSpecialismId++;
+                    }
                 }
 
                 List<RoomEquipment> roomEquipmentOfRoomList = new ArrayList<RoomEquipment>(equipmentListSize);
@@ -340,7 +354,12 @@
                         AdmissionPart admissionPart = new AdmissionPart();
                         admissionPart.setId(admissionPartId);
                         admissionPart.setPatient(patient);
-                        admissionPart.setSpecialism(idToSpecialismMap.get(specialismId));
+                        Specialism specialism = (specialismId == 0) ? null : idToSpecialismMap.get(specialismId);
+                        if (specialism == null) {
+                            throw new IllegalArgumentException("Read line (" + line
+                                + ") has a non existing specialismId (" + specialismId + ").");
+                        }
+                        admissionPart.setSpecialism(specialism);
                         admissionPart.setFirstNight(indexToNightMap.get(nextFirstNightIndex));
                         admissionPart.setLastNight(indexToNightMap.get(nextFirstNightIndex + admissionPartNightListSize - 1));
                         admissionPartList.add(admissionPart);

Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/swingui/PatientAdmissionSchedulePanel.java
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/swingui/PatientAdmissionSchedulePanel.java	2009-06-28 19:07:51 UTC (rev 27251)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/patientadmissionschedule/swingui/PatientAdmissionSchedulePanel.java	2009-06-28 19:20:19 UTC (rev 27252)
@@ -30,6 +30,7 @@
     public PatientAdmissionSchedulePanel() {
         gridLayout = new GridLayout(0, 1);
         setLayout(gridLayout);
+        add(new JLabel("GUI TODO"));
     }
 
     private PatientAdmissionSchedule getPatientAdmissionSchedule() {