Changeset 1295

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.

Location:

trunk/Rapla/src/org/rapla/gui/internal

Files:

• MenuFactoryImpl.java (modified) (3 diffs)
• action/RaplaObjectAction.java (modified) (2 diffs)

trunk/Rapla/src/org/rapla/gui/internal/MenuFactoryImpl.java

@@ -84 +84 @@
         Object focusedObject = context.getFocusedObject();
         Point p = context.getPoint();
+        
+        
+        
+        boolean allocatableType = false;
+        boolean reservationType = false;
+        if ( focusedObject instanceof DynamicType)
+        {
+            DynamicType type = (DynamicType) focusedObject;
+            String classificationType = type.getAnnotation( DynamicTypeAnnotations.KEY_CLASSIFICATION_TYPE );
+            allocatableType = classificationType.equals(  DynamicTypeAnnotations.VALUE_PERSON_CLASSIFICATION ) || classificationType.equals(  DynamicTypeAnnotations.VALUE_RESOURCE_CLASSIFICATION );
+            reservationType = classificationType.equals(  DynamicTypeAnnotations.VALUE_RESERVATION_CLASSIFICATION );
+        }
+        boolean allocatableNodeContext = allocatableType || focusedObject instanceof Allocatable  || focusedObject == CalendarSelectionModel.ALLOCATABLES_ROOT;
         if ( isRegisterer() || isAdmin()) {
-            menu.addSeparator();
-            addAllocatableMenuNew( menu, parent,p, focusedObject);
-        }
+            if ( allocatableNodeContext)
+            {
+                menu.addSeparator();
+                addAllocatableMenuNew( menu, parent,p, focusedObject);                
+            }
+        }
+        boolean reservationNodeContext =  reservationType || (focusedObject!= null && focusedObject.equals( getString("reservations" )));
         if ( isAdmin() )
         {
-            menu.addSeparator();
-            addUserMenuNew( menu , parent, p, focusedObject);
-            addPeriodMenuNew(  menu , parent, p, focusedObject );
-        }
-
-        addTypeMenuNew(menu, parent, p, focusedObject);
+            boolean userNodeContext = focusedObject instanceof User || (focusedObject  != null &&  focusedObject.equals( getString("users")));
+            boolean periodNodeContext = focusedObject instanceof Period || (focusedObject  != null &&  focusedObject.equals( getString("periods")));
+            if (userNodeContext || periodNodeContext || allocatableNodeContext || reservationNodeContext)
+            {
+                menu.addSeparator();
+            }
+            if ( userNodeContext)
+            {
+                addUserMenuNew( menu , parent, p, focusedObject);
+            }
+            if ( periodNodeContext)
+            {
+                addPeriodMenuNew(  menu , parent, p, focusedObject );
+            }
+            if (allocatableNodeContext)
+            {
+                addTypeMenuNew(menu, DynamicTypeAnnotations.VALUE_RESOURCE_CLASSIFICATION
+                        ,parent, p, focusedObject);
+                addTypeMenuNew(menu, DynamicTypeAnnotations.VALUE_PERSON_CLASSIFICATION
+                        ,parent, p, focusedObject);
+
+            }
+            if ( reservationNodeContext)
+            {
+                addTypeMenuNew(menu, DynamicTypeAnnotations.VALUE_RESERVATION_CLASSIFICATION
+                               ,parent, p, focusedObject);
+            }
+        }
 
         return menu;
@@ -191 +230 @@
         RaplaObjectAction newResource = addAction(menu,parent,p).setNew( Allocatable.TYPE );
         newResource.changeObject( obj );
-        newResource.putValue(Action.NAME,getString("resource"));
+        DynamicType[] types = newResource.guessTypes();
+        if (types.length == 1)
+        {
+            DynamicType type = types[0];
+            newResource.putValue(Action.NAME,type.getName( getLocale() ));
+            return;
+        }
+        DynamicType[] resourceType= getQuery().getDynamicTypes(DynamicTypeAnnotations.VALUE_RESOURCE_CLASSIFICATION );
+        if ( resourceType.length == 1)
+        {
+            newResource.putValue(Action.NAME,resourceType[0].getName( getLocale() ));            
+        }
+        else
+        {
+            newResource.putValue(Action.NAME,getString("resource"));   
+        }
 
         RaplaObjectAction newPerson = addAction(menu,parent,p).setNew( Allocatable.TYPE );
         newPerson.setPerson( true );
         newPerson.changeObject( obj );
-        newPerson.putValue(Action.NAME,getString("person"));
+        DynamicType[] personType= getQuery().getDynamicTypes(DynamicTypeAnnotations.VALUE_PERSON_CLASSIFICATION );
+        if ( personType.length == 1)
+        {
+            newPerson.putValue(Action.NAME,personType[0].getName( getLocale()));
+        }
+        else
+        {
+            newPerson.putValue(Action.NAME,getString("person"));
+        }
 
     }
@@ -209 +271 @@
 
 
-    private void addTypeMenuNew(MenuInterface menu,Component parent,Point p,Object obj) throws RaplaException {
-        if ( isAdmin() ) {
-            menu.addSeparator();
-
-            DynamicTypeAction newResourceType = newDynamicTypeAction(parent,p);
-            menu.add(new JMenuItem(newResourceType));
-            newResourceType.setNewClassificationType( DynamicTypeAnnotations.VALUE_RESOURCE_CLASSIFICATION);
-            newResourceType.putValue(Action.NAME,getString("resource_type"));
-
-            DynamicTypeAction newPersonType = newDynamicTypeAction(parent,p);
-            menu.add(new JMenuItem(newPersonType));
-            newPersonType.setNewClassificationType(DynamicTypeAnnotations.VALUE_PERSON_CLASSIFICATION);
-            newPersonType.putValue(Action.NAME,getString("person_type"));
-
+    private void addTypeMenuNew(MenuInterface menu,String classificationType,Component parent,Point p,Object obj) throws RaplaException {
             DynamicTypeAction newReservationType = newDynamicTypeAction(parent,p);
             menu.add(new JMenuItem(newReservationType));
-            newReservationType.setNewClassificationType(DynamicTypeAnnotations.VALUE_RESERVATION_CLASSIFICATION);
-            newReservationType.putValue(Action.NAME,getString("reservation_type"));
-        }
+            newReservationType.setNewClassificationType(classificationType);
+            newReservationType.putValue(Action.NAME,getString(classificationType + "_type"));
     }
 

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;
+      
     }