[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ClickBox.java, NONE, 1.1 AbstractTool.java, 1.107, 1.108

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

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

Modified Files:
	AbstractTool.java 
Added Files:
	ClickBox.java 
Log Message:
Refactored ClickBox related code

--- NEW FILE: ClickBox.java ---
//---------------------------------------------------------------------------------
// $Id: ClickBox.java,v 1.1 2007/01/25 12:14:30 henryml Exp $
//
// Copyright (c) 2005      The BProcessor Team (http://bprocessor.sourceforge.net) 
// Released under the Lesser GNU Public License v2.1
//---------------------------------------------------------------------------------

package net.sourceforge.bprocessor.gl.tool;
import net.sourceforge.bprocessor.model.Space;

/**
 * ClickBox represents space-path labels. This class
 * should be an extension of GLObject.
 */
public class ClickBox {
  private Space space;
  
  /**
   * @param space Space
   */
  public ClickBox(Space space) {
    this.space = space;
  }
  
  /**
   * @return space
   */
  public Space space() {
    return space;
  }
}

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** AbstractTool.java	25 Jan 2007 10:20:52 -0000	1.107
--- AbstractTool.java	25 Jan 2007 12:14:26 -0000	1.108
***************
*** 360,363 ****
--- 360,364 ----
      previousPos[0] = pressPos[0];
      previousPos[1] = pressPos[1];
+     Object o = glv.getView().getObjectAtPoint(e.getX(), e.getY(), View.OBJECTS);
      if (e.getButton() == MouseEvent.BUTTON2) {
        glv.setCursor(dragCursor);
***************
*** 367,371 ****
          orbit.pressed(e);
        } else {
!         pressed(e);
        }
      }
--- 368,377 ----
          orbit.pressed(e);
        } else {
!         if (o instanceof ClickBox) {
!           ClickBox clickbox = (ClickBox) o;
!           Project.getInstance().setActiveSpace(clickbox.space());
!         } else {
!           pressed(e);
!         }
        }
      }