[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.75, 1.76

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

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

Modified Files:
	AbstractTool.java 
Log Message:
More refactoring

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** AbstractTool.java	21 Jun 2006 10:26:32 -0000	1.75
--- AbstractTool.java	21 Jun 2006 11:57:54 -0000	1.76
***************
*** 306,314 ****
      AbstractTool.dy = y - pressPos[1];
  
!     if ((e.getModifiersEx() & MouseEvent.BUTTON2_DOWN_MASK) == MouseEvent.BUTTON2_DOWN_MASK ||
!         e.getButton() == MouseEvent.BUTTON2) {
!       
        pan.dragged(e);
-       //panDragged(e);
      } else {
        dragged(e);
--- 306,313 ----
      AbstractTool.dy = y - pressPos[1];
  
!     log.info("dragged button " + e.getButton());
!     
!     if (e.getButton() == MouseEvent.BUTTON2) {
        pan.dragged(e);
      } else {
        dragged(e);
***************
*** 366,370 ****
      
      
!     log.info("button = " + e.getButton());
     
      if (e.isAltDown()) {
--- 365,369 ----
      
      
!     log.info("pressed button " + e.getButton());
     
      if (e.isAltDown()) {
***************
*** 401,406 ****
      previousPos[0] = pressPos[0];
      previousPos[1] = pressPos[1];
!     if ((e.getModifiersEx() & MouseEvent.BUTTON2_DOWN_MASK) == MouseEvent.BUTTON2_DOWN_MASK ||
!         e.getButton() == MouseEvent.BUTTON2) {
        glv.setCursor(dragCursor);
        pan.pressed(e);
--- 400,404 ----
      previousPos[0] = pressPos[0];
      previousPos[1] = pressPos[1];
!     if (e.getButton() == MouseEvent.BUTTON2) {
        glv.setCursor(dragCursor);
        pan.pressed(e);
***************
*** 416,425 ****
     */
    public void mouseReleased(MouseEvent e) {
      if (e.isPopupTrigger()) {
        log.info("up popup-trigger");
      }
      
!     if ((e.getModifiersEx() & MouseEvent.BUTTON2_DOWN_MASK) == MouseEvent.BUTTON2_DOWN_MASK ||
!         e.getButton() == MouseEvent.BUTTON2) {
        glv.setCursor(cursor);
        pan.released(e);
--- 414,423 ----
     */
    public void mouseReleased(MouseEvent e) {
+     log.info("released button " + e.getButton());
      if (e.isPopupTrigger()) {
        log.info("up popup-trigger");
      }
      
!     if (e.getButton() == MouseEvent.BUTTON2) {
        glv.setCursor(cursor);
        pan.released(e);