svn commit: r17594 - trunk/src/argouml-app/src/org/argouml: i18n ui uml/diagram/static_structure/ui uml/diagram/ui uml/ui/foundation/core

Author: bobtarling
Date: 2009-12-03 02:02:23-0800
New Revision: 17594

Modified:
   trunk/src/argouml-app/src/org/argouml/i18n/button.properties
   trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java

Log:
Remove one method from FigClassifierBoxWithAttributes - continuing removing functionality till the class is gone.

Modified: trunk/src/argouml-app/src/org/argouml/i18n/button.properties
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/i18n/button.properties?view=diff&pathrev=17594&r1=17593&r2=17594
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/i18n/button.properties	(original)
+++ trunk/src/argouml-app/src/org/argouml/i18n/button.properties	2009-12-03 02:02:23-0800
@@ -107,6 +107,8 @@
 button.new-dependency = New Dependency
 button.new-destroyaction = New Destroy Action
 button.new-enumeration = New Enumeration
+button.new-enumerationliteral = New Enumeration Literal
+# consider this deprecated - use the button.new-enumerationliteral key
 button.new-enumeration-literal = New Enumeration Literal
 button.new-exception = New Exception
 button.new-extend = New Extend

Modified: trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java?view=diff&pathrev=17594&r1=17593&r2=17594
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/ActionCreateContainedModelElement.java	2009-12-03 02:02:23-0800
@@ -46,6 +46,21 @@
      * 
      * @param theMetaType the element to be created
      * @param target the container that will own the new element
+     */
+    public ActionCreateContainedModelElement(
+            Object theMetaType, 
+            Object target) {
+        this(theMetaType, target,
+                "button.new-"
+                + Model.getMetaTypes().getName(theMetaType).toLowerCase());
+    }
+    
+    
+    /**
+     * Construct the action.
+     * 
+     * @param theMetaType the element to be created
+     * @param target the container that will own the new element
      * @param menuDescr the description for the menu item label.
      */
     public ActionCreateContainedModelElement(

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&pathrev=17594&r1=17593&r2=17594
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java	2009-12-03 02:02:23-0800
@@ -28,6 +28,7 @@
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Vector;
 
 import javax.swing.Action;
@@ -37,6 +38,7 @@
 import org.argouml.model.Model;
 import org.argouml.model.RemoveAssociationEvent;
 import org.argouml.model.UmlChangeEvent;
+import org.argouml.ui.ActionCreateContainedModelElement;
 import org.argouml.ui.ArgoJMenu;
 import org.argouml.uml.diagram.DiagramSettings;
 import org.argouml.uml.diagram.OperationsCompartmentContainer;
@@ -46,6 +48,7 @@
 import org.argouml.uml.diagram.ui.FigAttributesCompartment;
 import org.argouml.uml.diagram.ui.FigCompartment;
 import org.argouml.uml.diagram.ui.FigCompartmentBox;
+import org.argouml.uml.diagram.ui.FigEditableCompartment;
 import org.argouml.uml.diagram.ui.FigOperationsCompartment;
 import org.argouml.uml.ui.foundation.core.ActionAddOperation;
 import org.tigris.gef.base.Editor;
@@ -313,9 +316,14 @@
 
     protected ArgoJMenu buildAddMenu() {
         ArgoJMenu addMenu = new ArgoJMenu("menu.popup.add");
-        Action addOperation = new ActionAddOperation();
-        addOperation.setEnabled(isSingleTarget());
-        addMenu.insert(addOperation, 0);
+        
+        List<FigCompartment> comps = getCompartments();
+        for (FigCompartment comp : comps) {
+            final Object metaType = comp.getCompartmentType();
+            Action addAction = new ActionCreateContainedModelElement(metaType, getOwner());
+            addAction.setEnabled(isSingleTarget());
+            addMenu.insert(addAction, 0);
+        }
         addMenu.add(new ActionAddNote());
         addMenu.add(ActionEdgesDisplay.getShowEdges());
         addMenu.add(ActionEdgesDisplay.getHideEdges());

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java?view=diff&pathrev=17594&r1=17593&r2=17594
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java	2009-12-03 02:02:23-0800
@@ -63,20 +63,6 @@
         super(owner, bounds, settings);
     }
 
-    /*
-     * Insert an Add Attribute entry before the default menu.
-     * 
-     * @see org.argouml.uml.diagram.static_structure.ui.FigClassifierBox#buildAddMenu()
-     */
-    @Override
-    protected ArgoJMenu buildAddMenu() {
-        ArgoJMenu addMenu = super.buildAddMenu();
-        Action addAttribute = new ActionAddAttribute();
-        addAttribute.setEnabled(isSingleTarget());
-        addMenu.insert(addAttribute, 0);
-        return addMenu;
-    }
-    
     /**
      * USED BY PGML.tee.
      * @return the class name and bounds together with compartment

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java?view=diff&pathrev=17594&r1=17593&r2=17594
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java	2009-12-03 02:02:23-0800
@@ -93,16 +93,6 @@
     }
 
     @Override
-    protected ArgoJMenu buildAddMenu() {
-        ArgoJMenu addMenu = super.buildAddMenu();
-        
-        Action addEnumerationLiteral = new ActionAddEnumerationLiteral();
-        addEnumerationLiteral.setEnabled(isSingleTarget());
-        addMenu.add(addEnumerationLiteral);
-        return addMenu;
-    }
-
-    @Override
     public void renderingChanged() {
         super.renderingChanged();
         if (getOwner() != null) {

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java?view=diff&pathrev=17594&r1=17593&r2=17594
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java	2009-12-03 02:02:23-0800
@@ -171,6 +171,10 @@
         }
         return null;
     }
+    
+    protected List<FigCompartment> getCompartments() {
+        return compartments;
+    }
 
     @Override
     public void addFig(Fig fig) {

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java?view=diff&pathrev=17594&r1=17593&r2=17594
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java	2009-12-03 02:02:23-0800
@@ -48,7 +48,7 @@
      * The constructor.
      */
     public ActionAddEnumerationLiteral() {
-        super(Translator.localize("button.new-enumeration-literal"),
+        super(Translator.localize("button.new-enumerationliteral"),
                 ResourceLoaderWrapper
                         .lookupIcon("button.new-enumeration-literal"));
     }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2426626

To unsubscribe from this discussion, e-mail: [[email protected]].