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

Author: tfmorris
Date: 2008-05-01 12:34:37-0700
New Revision: 14567

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationClass.java

Log:
Comments and proposed alternative for issue 5049

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java?view=diff&rev=14567&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java&r1=14566&r2=14567
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java	2008-05-01 12:34:37-0700
@@ -175,11 +175,13 @@
             // TODO: We need a better algorithm.
             point.x = elemFig.getX() + elemFig.getWidth() + DISTANCE;
             point.y = elemFig.getY();
-            // TODO: This can't depend on ProjectBrowser.  It needs to get
-            // the current drawing area from the Diagram subsystem or GEF
-            // better yet, it should just tell the Diagram to place it
+            // TODO: This can't depend on ProjectBrowser.  Alternate below
             Rectangle drawingArea =
                 ProjectBrowser.getInstance().getEditorPane().getBounds();
+            // Perhaps something like the following would work instead
+//            Rectangle drawingArea =
+//                Globals.curEditor().getJComponent().getVisibleRect();
+            
             if (point.x + noteFig.getWidth() > drawingArea.getX()) {
                 point.x = elemFig.getX() - noteFig.getWidth() - DISTANCE;
 

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationClass.java?view=diff&rev=14567&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationClass.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationClass.java&r1=14566&r2=14567
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationClass.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ModeCreateAssociationClass.java	2008-05-01 12:34:37-0700
@@ -93,6 +93,10 @@
         Rectangle drawingArea =
             ProjectBrowser.getInstance()
                 .getEditorPane().getBounds();
+        // Perhaps something like the following would workd.  If not, then 
+        // traverse up the component hierarchy to a MultEditorPane
+//        Rectangle drawingArea = 
+//            Globals.curEditor().getJComponent().getVisibleRect();
         
         thisFig.makeEdgePort();
         FigEdgePort tee = thisFig.getEdgePort();