better notifications

svn changeset:3205/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
index 13a55b4a6030b2c477229aa3488576194c58b272..db8b0c99bd529c23ddc92892b43431ead45c4c95 100644 (file)
--- a/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
+++ b/src/com/itmill/toolkit/demo/reservation/ReservationApplication.java
@@ -141,7 +141,7 @@ public class ReservationApplication extends Application {
                 if (fd == null) {\r
                     reservedTo.setValue(null);\r
                     reservedTo.setEnabled(false);\r
-                    refreshSelectedResources();\r
+                    refreshSelectedResources(true);\r
                     return;\r
                 } else {\r
                     reservedTo.setEnabled(true);\r
@@ -152,7 +152,7 @@ public class ReservationApplication extends Application {
                 to.setTime(fd);\r
                 to.add(Calendar.MILLISECOND, (int) currentGapMillis);\r
                 reservedTo.setValue(to.getTime());\r
-                refreshSelectedResources();\r
+                refreshSelectedResources(true);\r
             }\r
         });\r
         reservedTo.addListener(new ValueChangeListener() {\r
@@ -166,7 +166,7 @@ public class ReservationApplication extends Application {
                     t.add(Calendar.MILLISECOND, (int) DEFAULT_GAP_MILLIS);\r
                     reservedTo.setValue(t.getTime());\r
                 }\r
-                refreshSelectedResources();\r
+                refreshSelectedResources(true);\r
             }\r
         });\r
 \r
@@ -184,12 +184,13 @@ public class ReservationApplication extends Application {
         mainTabs.addTab(allLayout, "All reservations", null);\r
         mainTabs.addListener(new TabSheet.SelectedTabChangeListener() {\r
             public void selectedTabChange(SelectedTabChangeEvent event) {\r
-                refreshReservations(false);\r
+                refreshReservations();\r
             }\r
         });\r
 \r
         resourcePanel.selectFirstCategory();\r
-        refreshReservations(true);\r
+        refreshReservations();\r
+        refreshSelectedResources(true);\r
     }\r
 \r
     public void makeReservation() {\r
@@ -204,7 +205,8 @@ public class ReservationApplication extends Application {
                                 "Success!",\r
                                 "You have reserved the resource for the selected period.",\r
                                 Notification.TYPE_WARNING_MESSAGE);\r
-                refreshReservations(false);\r
+                refreshReservations();\r
+                refreshSelectedResources(false);\r
             } else {\r
                 getMainWindow().showNotification("Oops!",\r
                         "Please select a resource (or category) to reserve.",\r
@@ -216,7 +218,7 @@ public class ReservationApplication extends Application {
                             "Not available!",\r
                             "The selected resource is already reserved for the selected period.",\r
                             Notification.TYPE_ERROR_MESSAGE);\r
-            refreshReservations(false);\r
+            refreshReservations();\r
         }\r
     }\r
 \r
@@ -239,14 +241,11 @@ public class ReservationApplication extends Application {
         }\r
     }\r
 \r
-    private void refreshReservations(boolean alsoResources) {\r
+    private void refreshReservations() {\r
         final Container reservations = db.getReservations(resourcePanel\r
                 .getSelectedResources());\r
         reservedFrom.setContainerDataSource(reservations);\r
         reservedTo.setContainerDataSource(reservations);\r
-        if (alsoResources) {\r
-            refreshSelectedResources();\r
-        }\r
         final Container allReservations = db.getReservations(null);\r
         allTable.setContainerDataSource(allReservations);\r
         if (allReservations != null && allReservations.size() > 0) {\r
@@ -261,15 +260,17 @@ public class ReservationApplication extends Application {
         }\r
     }\r
 \r
-    private void refreshSelectedResources() {\r
+    private void refreshSelectedResources(boolean alertIfNotAvailable) {\r
         Item resource = null;\r
         try {\r
             resource = getActiveResource();\r
         } catch (final ResourceNotAvailableException e) {\r
-            getMainWindow().showNotification("Not available",\r
-                    "Please choose another resource or time period.",\r
-                    Notification.TYPE_HUMANIZED_MESSAGE);\r
-            refreshReservations(false);\r
+            if (alertIfNotAvailable) {\r
+                getMainWindow().showNotification("Not available",\r
+                        "Please choose another resource or time period.",\r
+                        Notification.TYPE_HUMANIZED_MESSAGE);\r
+            }\r
+            refreshReservations();\r
             return;\r
         }\r
         map.clear();\r
@@ -323,7 +324,8 @@ public class ReservationApplication extends Application {
 \r
     public void selectedResourcesChanged(\r
             ResourceSelectorPanel.SelectedResourcesChangedEvent event) {\r
-        refreshReservations(true);\r
+        refreshReservations();\r
+        refreshSelectedResources(true);\r
     }\r
 \r
 }\r