[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SelectTool.java,1.19,1.20

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

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

Modified Files:
	SelectTool.java 
Log Message:
added space selection

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SelectTool.java	13 Sep 2005 17:42:31 -0000	1.19
--- SelectTool.java	14 Sep 2005 14:09:06 -0000	1.20
***************
*** 30,34 ****
  
  import java.util.Iterator;
- //import java.util.List;
  import java.util.ArrayList;
  import java.util.Set;
--- 30,33 ----
***************
*** 90,108 ****
    protected void pressed(MouseEvent e) {    
      if (e.getButton() == MouseEvent.BUTTON1) {
!       findTarget(e);
!       if (target == null) {
!         log.info("target was null");
!         selection = new ArrayList();
!       } else if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) == InputEvent.SHIFT_DOWN_MASK) {
!         if (!selection.contains(target)) {
!           select(target);
!           //selection.add(target);
!         } else {
!           deselect(target);
          }
        } else {
!         selection = new ArrayList();
!         select(target);
!         //selection.add(target);
        }
      }
--- 89,120 ----
    protected void pressed(MouseEvent e) {    
      if (e.getButton() == MouseEvent.BUTTON1) {
!       if (e.getClickCount() >= 2 && target instanceof Surface) {
!         ConstructionSpaceFacade csf = ConstructionSpaceFacade.getInstance();
!         ConstructionSpace cs = (ConstructionSpace)csf.findBySurface((Surface)target);
!         Set s = cs.getSurfaces();
!         Iterator it = s.iterator();
!         while (it.hasNext()) {
!           Surface surface = (Surface)it.next();
!           if (!selection.contains(surface)) {
!             selection.add(surface);
!           }
          }
        } else {
!         findTarget(e);
!         if (target == null) {
!           selection = new ArrayList();
!         } else if ((e.getModifiersEx() & InputEvent.SHIFT_DOWN_MASK) 
!                    == InputEvent.SHIFT_DOWN_MASK) {
!           if (!selection.contains(target)) {
!             select(target);
!           } else {
!             deselect(target);
!           }
!         } else {
!           if (!selection.contains(target)) {
!             selection = new ArrayList();
!             select(target);
!           }
!         }
        }
      }
***************
*** 289,293 ****
          }
        }
!     } 
    }
  
--- 301,306 ----
          }
        }
!     }
!     glv.repaint();
    }