Changeset 1295 for trunk/Rapla/src/org/rapla/gui/internal/action/RaplaObjectAction.java

Timestamp:

07/07/08 22:42:02 (4 years ago)

Author:

kohlhaas

Message:

* The new x (reservation, resource, person, user, period, ...) entries in the popup menu are now context sensitive. You can now only create new
objects that make sense in the selected tree node, that means you can only create a new user if you are in the user section of the tree.

Files:

• trunk/Rapla/src/org/rapla/gui/internal/action/RaplaObjectAction.java (modified) (2 diffs)

trunk/Rapla/src/org/rapla/gui/internal/action/RaplaObjectAction.java

@@ -190 +190 @@
     */
     public DynamicType guessType() throws RaplaException {
+        DynamicType[] types = guessTypes();
+        if ( types.length > 0)
+        {
+            return types[0];
+        }
+        else
+        {
+            return null;
+        }
+    }
+    
+    public DynamicType[] guessTypes() throws RaplaException {
         DynamicType dynamicType = null;
         getLogger().debug("Guessing DynamicType from " + object);
@@ -199 +211 @@
             dynamicType = classification.getType();
         }
+        if (dynamicType != null)
+        {
+            return new DynamicType[] {dynamicType};
+        }
         String classificationType = null;
         if ( Reservation.TYPE.is( raplaType )) {
-                classificationType = DynamicTypeAnnotations.VALUE_RESERVATION_CLASSIFICATION;
-        } else  if ( Allocatable.TYPE.is( raplaType )) {
-                if ( isPerson ) {
-                        classificationType = DynamicTypeAnnotations.VALUE_PERSON_CLASSIFICATION;
-                } else {
-                        classificationType = DynamicTypeAnnotations.VALUE_RESOURCE_CLASSIFICATION;
-                }
+            classificationType = DynamicTypeAnnotations.VALUE_RESERVATION_CLASSIFICATION;
+        } else  if ( Allocatable.TYPE.is( raplaType )) {
+            if ( isPerson ) {
+                classificationType = DynamicTypeAnnotations.VALUE_PERSON_CLASSIFICATION;
+            } else {
+                classificationType = DynamicTypeAnnotations.VALUE_RESOURCE_CLASSIFICATION;
+            }
         }
         DynamicType[] dynamicTypes = getQuery().getDynamicTypes( classificationType );
-        if ( dynamicType != null )
-        {
-            for (int i=0; i < dynamicTypes.length ; i++)
-             {
-                 if (dynamicTypes[i].equals(dynamicType))
-                     return dynamicType;
-             }
-        }
-        return dynamicTypes[0];
+        return dynamicTypes;
+      
     }