Ticket #27: rapla-1.3.2-table-end.diff

src/org/rapla/plugin/tableview/ReservationTableModel.java

@@ -21 +21 @@
     public ReservationTableModel(Locale locale, I18nBundle i18n) {
         this.locale = locale;
         this.i18n = i18n;
-        String[]columns = new String[] {i18n.getString("name"),i18n.getString("start_date"),i18n.getString("last_changed")};
+        String[]columns = new String[] {i18n.getString("name"),i18n.getString("start_date"),i18n.getString("end_date"),i18n.getString("last_changed")};
         this.setColumnIdentifiers( columns);
     }
 
@@ -57 +57 @@
         return minimumDate;
     }
 
+    public Date findEndDate(Reservation event) {
+        Appointment[] apps = event.getAppointments();
+        Date maximumDate = null;
+        for (int i=0;i< apps.length;i++) {
+            Appointment app = apps[i];
+            if ( maximumDate == null || app.getEnd().after( maximumDate)) {
+                maximumDate = app.getEnd();
+            }
+        }
+        return maximumDate;
+    }
+
     public Object getValueAt( int rowIndex, int columnIndex )
     {
         Reservation event = reservations[rowIndex];
@@ -64 +76 @@
         {
             case 0: return event.getName( locale);
             case 1: return findStartDate( event );
-            case 2: return event.getLastChangeTime();
+            case 2: return findEndDate( event );
+            case 3: return event.getLastChangeTime();
         }
         return event;
     }
@@ -75 +88 @@
             case 0: return String.class;
             case 1: return Date.class;
             case 2: return Date.class;
+            case 3: return Date.class;
         }
         return super.getColumnClass( columnIndex );
     }