svn commit: r19231 - trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram

Author: bobtarling
Date: 2011-04-12 18:39:44-0700
New Revision: 19231

Modified:
   trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java
   trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java
   trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java

Log:
Place any new states into the activity that owns the diagram

Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java?view=diff&pathrev=19231&r1=19230&r2=19231
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java	(original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java	2011-04-12 18:39:44-0700
@@ -54,7 +54,7 @@
         .getLogger(BaseDiagram.class);
     
     BaseDiagram(Object owner) {
-        super();
+        super(owner);
         MutableGraphModel gm = createGraphModel();
         setGraphModel(gm);
         

Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java?view=diff&pathrev=19231&r1=19230&r2=19231
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java	(original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigNotation.java	2011-04-12 18:39:44-0700
@@ -19,6 +19,7 @@
 
 import org.argouml.notation2.NotatedItem;
 import org.argouml.notation2.NotationLanguage;
+import org.argouml.notation2.NotationManager;
 import org.argouml.notation2.NotationTextEvent;
 import org.argouml.notation2.NotationType;
 import org.argouml.uml.diagram.DiagramSettings;
@@ -45,11 +46,14 @@
             final DiagramSettings settings,
             final NotationType notationType) {
         super(bounds.x, bounds.y, bounds.width, bounds.height , true);
+        setOwner(owner);
+        setFont(settings.getFontPlain());
         this.notationType = notationType;
         setTabAction(FigText.END_EDITING);
         setReturnAction(FigText.END_EDITING);
         setLineWidth(0);
         super.setFilled(false);
+        NotationManager.getInstance().addListener(this);
     }
 
     /**
@@ -60,15 +64,19 @@
     
     @Override
     public Dimension getMinimumSize() {
-        final FontMetrics fontMetrics = getFontMetrics();
+        
+//        int w = getFontMetrics().stringWidth(getText());
+//        int h = getFontMetrics().getHeight();
+        int w = 0;
+        int h = getFont().getSize();
         
         final int minWidth = 
-            fontMetrics.stringWidth(getText())
+            w
             + getLeftMargin()
             + getRightMargin()
             + 2 * getLineWidth();
         final int minHeight = 
-            fontMetrics.getHeight()
+            h
             + getTopMargin()
             + getBotMargin()
             + 2 * getLineWidth();

Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java?view=diff&pathrev=19231&r1=19230&r2=19231
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java	(original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ModePlaceDiagramElement.java	2011-04-12 18:39:44-0700
@@ -70,7 +70,8 @@
         // TODO: Something might go wrong during processing. We don't really
         // want to create the model element until the user releases the mouse
         // in the place expected.
-        modelElement = Model.getUmlFactory().buildNode(metaType);
+        modelElement = Model.getUmlFactory().buildNode(metaType, diagram.getNamespace());
+        LOG.info("Created " + modelElement);
         //
         start();
         editor = Globals.curEditor();
@@ -81,9 +82,9 @@
     }
     
     private GraphNode createDiagramElement(Layer lay, Object owner, DiagramSettings settings) {
-        FigBaseNode fig = new FigBaseNode(modelElement, new Rectangle(0, 0, 0, 0), settings);
-        fig.setLayer(lay);
+        FigBaseNode fig = new FigBaseNode(owner, new Rectangle(0, 0, 0, 0), settings);
         DiagramElementBuilder.buildDiagramElement(fig, style, owner, settings);
+        fig.setLayer(lay);
         return fig;
     }

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

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