Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r1328 - trunk/src/org/tigris/gef: base presentation

gef
Discussion topic

Back to topic list

svn commit: r1328 - trunk/src/org/tigris/gef: base presentation

Author bobtarling
Full name Bob Tarling
Date 2011-05-21 07:52:01 PDT
Message Author: bobtarling
Date: 2011-05-21 07:52:00-0700
New Revision: 1328

Modified:
   trunk/src/org/tigris​/gef/base/ModeModify​.java
   trunk/src/org/tigris​/gef/presentation/Fi​g.java

Log:
getTrapRects takes the attempted drop Fig as an argument

Modified: trunk/src/org/tigris​/gef/base/ModeModify​.java
Url: http://gef.tigris.or​g/source/browse/gef/​trunk/src/org/tigris​/gef/base/ModeModify​.java?view=diff&​pathrev=1328&r1=​1327&r2=1328
====================​====================​====================​==================
--- trunk/src/org/tigris​/gef/base/ModeModify​.java (original)
+++ trunk/src/org/tigris​/gef/base/ModeModify​.java 2011-05-21 07:52:00-0700
@@ -419,7 +419,7 @@
                     continue;
                 }
 
- for (Rectangle trap : otherFig.getTrapRects()) {
+ for (Rectangle trap : otherFig.getTrapRect​s(draggedFig)) {
                     if (trap == null) {
                         continue;
                     }

Modified: trunk/src/org/tigris​/gef/presentation/Fi​g.java
Url: http://gef.tigris.or​g/source/browse/gef/​trunk/src/org/tigris​/gef/presentation/Fi​g.java?view=diff​&pathrev=1328&r1​=1327&r2=1328
====================​====================​====================​==================
--- trunk/src/org/tigris​/gef/presentation/Fi​g.java (original)
+++ trunk/src/org/tigris​/gef/presentation/Fi​g.java 2011-05-21 07:52:00-0700
@@ -37,13 +37,10 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyC​hangeListener;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Vector;
-
 import javax.swing.JMenu;
-
 import org.tigris.gef.base.​AlignAction;
 import org.tigris.gef.base.CmdReorder;
 import org.tigris.gef.base.Editor;
@@ -400,7 +397,7 @@
     // private
     // an move SelectionManager into this package?
     final public void translateAnnotations() {
- // If this Fig is an annotaion itself, simply store the position at the
+ // If this Fig is an annotation itself, simply store the position at the
         // owner.
         if (this.isAnnotation()) {
             SelectionManager selectionManager = Globals.curEditor()
@@ -1383,7 +1380,7 @@
      * enclose a FigNode.
      * @return the list of Rectangles
      */
- public List<Rectangle> getTrapRects() {
+ public List<Rectangle> getTrapRects(Fig de) {
         ArrayList<Rectangle> rects = new ArrayList<Rectangle>(1);
         rects.add(getTrapRect());
         return rects;

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r1328 - trunk/src/org/tigris/gef: base presentation bobtarling Bob Tarling 2011-05-21 07:52:01 PDT
Messages per page: