[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SelectTool.java,1.22,1.23 MoveTool.java,1.13,1.14 Tool.java,1.7,1.8

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1632/gl/tool

Modified Files:
	SelectTool.java MoveTool.java Tool.java 
Log Message:
changed list to hashset behind a collection to make it easy changeable

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** SelectTool.java	21 Sep 2005 07:58:53 -0000	1.22
--- SelectTool.java	21 Sep 2005 09:35:29 -0000	1.23
***************
*** 32,36 ****
  
  import java.util.Iterator;
! import java.util.ArrayList;
  import java.util.Set;
  
--- 32,36 ----
  
  import java.util.Iterator;
! //import java.util.ArrayList;
  import java.util.Set;
  
***************
*** 74,78 ****
     */
    protected void moved(MouseEvent e) {
!     findTarget(e);
    }
  
--- 74,78 ----
     */
    protected void moved(MouseEvent e) {
!     //findTarget(e);
    }
  
***************
*** 111,115 ****
          findTarget(e);
          if (target == null) {
!           selection = new ArrayList();
          } else if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) 
                     == InputEvent.SHIFT_DOWN_MASK) {
--- 111,119 ----
          findTarget(e);
          if (target == null) {
!           Iterator it = selection.iterator();
!           while (it.hasNext()) {
!             deselect(it.next());
!           }
!           selection.clear();
          } else if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) 
                     == InputEvent.SHIFT_DOWN_MASK) {
***************
*** 121,125 ****
          } else {
            if (!selection.contains(target)) {
!             selection = new ArrayList();
              select(target);
            }
--- 125,133 ----
          } else {
            if (!selection.contains(target)) {
!             Iterator it = selection.iterator();
!             while (it.hasNext()) {
!               deselect(it.next());
!             }
!             selection.clear();
              select(target);
            }
***************
*** 149,153 ****
    }
  
!    /**
     * Sends the notification for deselect
     * @param obj The selected object
--- 157,161 ----
    }
  
!   /**
     * Sends the notification for deselect
     * @param obj The selected object

Index: MoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MoveTool.java	20 Sep 2005 17:25:26 -0000	1.13
--- MoveTool.java	21 Sep 2005 09:35:29 -0000	1.14
***************
*** 19,23 ****
  import java.awt.event.KeyEvent;
  
! import java.util.List;
  import java.util.Iterator;
  
--- 19,23 ----
  import java.awt.event.KeyEvent;
  
! import java.util.Collection;
  import java.util.Iterator;
  
***************
*** 167,174 ****
    /**
     * Move the entire selection
!    * @param sel The selection list
     * @param delta The movement
     */
!   private void move(List sel, Vertex delta) {
      Iterator it = sel.iterator();
      while (it.hasNext()) {
--- 167,174 ----
    /**
     * Move the entire selection
!    * @param sel The selection collection
     * @param delta The movement
     */
!   private void move(Collection sel, Vertex delta) {
      Iterator it = sel.iterator();
      while (it.hasNext()) {

Index: Tool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Tool.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Tool.java	14 Sep 2005 14:10:43 -0000	1.7
--- Tool.java	21 Sep 2005 09:35:29 -0000	1.8
***************
*** 11,15 ****
  import java.awt.event.MouseMotionListener;
  
! import java.util.List;
  /**
   * The tool interface
--- 11,15 ----
  import java.awt.event.MouseMotionListener;
  
! import java.util.Collection;
  /**
   * The tool interface
***************
*** 27,32 ****
    /**
     * Return the current selection
!    * @return The list of selected objects
     */
!   public List getSelection();
  }
--- 27,32 ----
    /**
     * Return the current selection
!    * @return The collection of selected objects
     */
!   public Collection getSelection();
  }