svn commit: r19149 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui

Author: bobtarling
Date: 2011-03-30 10:22:09-0700
New Revision: 19149

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java

Log:
These concrete compartment classes no longer need to implement createModelElement as that is done in the ancestor

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java?view=diff&pathrev=19149&r1=19148&r2=19149
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAttributesCompartment.java	2011-03-30 10:22:09-0700
@@ -43,6 +43,7 @@
 
 import org.argouml.kernel.Project;
 import org.argouml.model.Model;
+import org.argouml.model.UmlFactoryDefaults;
 import org.argouml.notation.NotationProviderFactory2;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.DiagramSettings;
@@ -85,19 +86,6 @@
         return NotationProviderFactory2.TYPE_ATTRIBUTE;
     }
 
-    /*
-     * @see org.argouml.uml.diagram.ui.FigEditableCompartment#createFeature()
-     */
-    protected void createModelElement() {
-        Object classifier = getGroup().getOwner();
-        Project project = getProject();
-        Object attrType = project.getDefaultAttributeType();
-        Object attr = Model.getCoreFactory().buildAttribute2(
-                classifier,
-                attrType);
-        TargetManager.getInstance().setTarget(attr);
-    }
-
     @Override
     protected FigSingleLineTextWithNotation createFigText(Object owner,
             Rectangle bounds, DiagramSettings settings) {

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java?view=diff&pathrev=19149&r1=19148&r2=19149
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEnumLiteralsCompartment.java	2011-03-30 10:22:09-0700
@@ -95,16 +95,6 @@
         return NotationProviderFactory2.TYPE_ENUMERATION_LITERAL;
     }
 
-    /**
-     * @see org.argouml.uml.diagram.ui.FigCompartment#createModelElement()
-     */
-    protected void createModelElement() {
-        Object enumeration = getGroup().getOwner();
-        Object literal = Model.getCoreFactory().buildEnumerationLiteral(
-                "literal",  enumeration);
-        TargetManager.getInstance().setTarget(literal);
-    }
-
     @Override
     protected FigSingleLineTextWithNotation createFigText(Object owner,
             Rectangle bounds, DiagramSettings settings) {

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java?view=diff&pathrev=19149&r1=19148&r2=19149
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigExtensionPointsCompartment.java	2011-03-30 10:22:09-0700
@@ -87,13 +87,6 @@
     }
 
     @Override
-    protected void createModelElement() {
-        Object usecase = getGroup().getOwner(); //TODO: check!
-        Object ep = Model.getUseCasesFactory().buildExtensionPoint(usecase);
-        TargetManager.getInstance().setTarget(ep);
-    }
-
-    @Override
     public String getName() {
          return "extension points";
     }

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java?view=diff&pathrev=19149&r1=19148&r2=19149
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigOperationsCompartment.java	2011-03-30 10:22:09-0700
@@ -99,20 +99,6 @@
         return new FigOperation(owner, bounds, settings);
     }
 
-    /*
-     * By default, when double-clicking on the compartment,
-     * we create an Operation (not a Reception).
-     */
-    protected void createModelElement() {
-        Object classifier = getGroup().getOwner();
-        Project project = getProject();
-
-        Object returnType = project.getDefaultReturnType();
-        Object oper = Model.getCoreFactory().buildOperation(classifier,
-                returnType);
-        TargetManager.getInstance().setTarget(oper);
-    }
-
     @Override
     public String getName() {
         return "operations";

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

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