[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.92, 1.93 MoveTool.java, 1.65, 1.66 SpaceTool.java, 1.25, 1.26 RotationTool.java, 1.16, 1.17

[Michael L. <he...@us...>]

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

Modified Files:
	AbstractTool.java MoveTool.java SpaceTool.java 
	RotationTool.java 
Log Message:
Changed selection to only contain "geometric" objects

Index: SpaceTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** SpaceTool.java	10 Aug 2006 13:13:35 -0000	1.25
--- SpaceTool.java	28 Aug 2006 05:53:53 -0000	1.26
***************
*** 31,34 ****
--- 31,35 ----
  import net.sourceforge.bprocessor.model.Edge;
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Selection;
  import net.sourceforge.bprocessor.model.Space;
  import net.sourceforge.bprocessor.model.Surface;
***************
*** 150,154 ****
        Space space = null;
        
!       Iterator iter = selection.iterator();
        while (iter.hasNext()) {
          Object current = iter.next();
--- 151,155 ----
        Space space = null;
        
!       Iterator iter = Selection.primary().iterator();
        while (iter.hasNext()) {
          Object current = iter.next();
***************
*** 174,178 ****
        offsetItem.addActionListener(new MenuAction() {
          public void actionPerformed(ActionEvent event) {
!           addOffsetConstraint(selection);
          }
        }  
--- 175,179 ----
        offsetItem.addActionListener(new MenuAction() {
          public void actionPerformed(ActionEvent event) {
!           addOffsetConstraint(Selection.primary());
          }
        }  
***************
*** 359,363 ****
    private JPopupMenu seperatorPopup() {
      JPopupMenu sepPop = new JPopupMenu();
!     Iterator selIt = new HashSet(selection).iterator();
      if (selIt.hasNext()) {
        Object o = selIt.next();
--- 360,364 ----
    private JPopupMenu seperatorPopup() {
      JPopupMenu sepPop = new JPopupMenu();
!     Iterator selIt = new HashSet(Selection.primary()).iterator();
      if (selIt.hasNext()) {
        Object o = selIt.next();
***************
*** 395,399 ****
      
      
!     Iterator selIt = new HashSet(selection).iterator();
      Surface surface = null;
      Space space = null;
--- 396,400 ----
      
      
!     Iterator selIt = new HashSet(Selection.primary()).iterator();
      Surface surface = null;
      Space space = null;
***************
*** 449,453 ****
          public void actionPerformed(ActionEvent arg0) {
            if (space != null) {
!             selection.clear();
              glv.getView().makeTarget(null);
              Project.getInstance().setActiveSpace(space);
--- 450,454 ----
          public void actionPerformed(ActionEvent arg0) {
            if (space != null) {
!             Selection.primary().clear();
              glv.getView().makeTarget(null);
              Project.getInstance().setActiveSpace(space);
***************
*** 460,465 ****
            if (space != null) {
              Space spaceCopy = space.copy();
!             selection.clear();
!             selection.add(spaceCopy);
              glv.changeTool(Tool.MOVE_TOOL);
            }
--- 461,466 ----
            if (space != null) {
              Space spaceCopy = space.copy();
!             Selection.primary().clear();
!             Selection.primary().add(spaceCopy);
              glv.changeTool(Tool.MOVE_TOOL);
            }
***************
*** 529,533 ****
     */
    public void delete() {
!     Iterator it = selection.iterator();
      List edges = new ArrayList();
      List vertices = new ArrayList();
--- 530,534 ----
     */
    public void delete() {
!     Iterator it = Selection.primary().iterator();
      List edges = new ArrayList();
      List vertices = new ArrayList();
***************
*** 547,551 ****
        }
      }
!     selection.clear();
      glv.getView().makeTarget(null);
      Project.getInstance().delete(surfaces);
--- 548,552 ----
        }
      }
!     Selection.primary().clear();
      glv.getView().makeTarget(null);
      Project.getInstance().delete(surfaces);
***************
*** 559,563 ****
     */
    public void escape() {
!     selection.clear();
      glv.getView().makeTarget(null);
      Project.getInstance().setActiveSpace(null);
--- 560,564 ----
     */
    public void escape() {
!     Selection.primary().clear();
      glv.getView().makeTarget(null);
      Project.getInstance().setActiveSpace(null);

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** AbstractTool.java	10 Aug 2006 13:08:01 -0000	1.92
--- AbstractTool.java	28 Aug 2006 05:53:53 -0000	1.93
***************
*** 81,89 ****
  
    /** The snap variable */
!   protected static final double EPSILON = 0.4; 
! 
!   /** The selected objects */
!   protected static Collection selection;
! 
    /** The 3DView */
    protected GLView glv = null;
--- 81,86 ----
  
    /** The snap variable */
!   protected static final double EPSILON = 0.4;
!   
    /** The 3DView */
    protected GLView glv = null;
***************
*** 104,111 ****
    private Cursor orbitCursor;
    
-   static {
-     selection = Selection.primary();
-   }
-   
  
    /**
--- 101,104 ----
***************
*** 471,475 ****
     */
    public Collection getSelection() {
!     return selection;
    }
    
--- 464,468 ----
     */
    public Collection getSelection() {
!     return Selection.primary();
    }
    

Index: MoveTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MoveTool.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** MoveTool.java	14 Aug 2006 08:41:57 -0000	1.65
--- MoveTool.java	28 Aug 2006 05:53:53 -0000	1.66
***************
*** 24,27 ****
--- 24,28 ----
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Project;
+ import net.sourceforge.bprocessor.model.Selection;
  import net.sourceforge.bprocessor.model.Surface;
  import net.sourceforge.bprocessor.model.Vertex;
***************
*** 95,99 ****
    protected void updateFeedback() {
      if (start == null) {
!       if (!selection.isEmpty()) {
          if (current != null) {
            makeTarget(current);
--- 96,100 ----
    protected void updateFeedback() {
      if (start == null) {
!       if (!Selection.primary().isEmpty()) {
          if (current != null) {
            makeTarget(current);
***************
*** 128,132 ****
    protected void moved(MouseEvent e) {
      if (start == null) {
!       if (selection.isEmpty()) {
          findTarget(e, View.HANDLES);
          glv.getView().makeTarget(target);
--- 129,133 ----
    protected void moved(MouseEvent e) {
      if (start == null) {
!       if (Selection.primary().isEmpty()) {
          findTarget(e, View.HANDLES);
          glv.getView().makeTarget(target);
***************
*** 164,168 ****
    protected void pressed(MouseEvent e) {
      if (start == null) {
!       if (selection.isEmpty()) {
          if (target != null) {
            entities = new HashSet();
--- 165,169 ----
    protected void pressed(MouseEvent e) {
      if (start == null) {
!       if (Selection.primary().isEmpty()) {
          if (target != null) {
            entities = new HashSet();
***************
*** 181,185 ****
        } else {
          entities = new HashSet();
!         entities.addAll(selection);
          current = findIntersection(e).copy();
          from = current.vertex();
--- 182,186 ----
        } else {
          entities = new HashSet();
!         entities.addAll(Selection.primary());
          current = findIntersection(e).copy();
          from = current.vertex();

Index: RotationTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** RotationTool.java	9 Aug 2006 15:15:03 -0000	1.16
--- RotationTool.java	28 Aug 2006 05:53:53 -0000	1.17
***************
*** 149,153 ****
        }
        clear();
!       collect(selection, vertices);
        
        // find the size of the handles
--- 149,153 ----
        }
        clear();
!       collect(Selection.primary(), vertices);
        
        // find the size of the handles