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

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

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

Modified Files:
	AbstractTool.java 
Log Message:
Changed alle number shortcutkeys fo F# keys

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AbstractTool.java	14 Sep 2005 07:02:56 -0000	1.17
--- AbstractTool.java	21 Sep 2005 09:33:31 -0000	1.18
***************
*** 22,28 ****
  
  import java.util.List;
- import java.util.ArrayList;
  import java.util.Iterator;
  import java.util.Set;
  
  import javax.swing.Timer;
--- 22,29 ----
  
  import java.util.List;
  import java.util.Iterator;
  import java.util.Set;
+ import java.util.Collection;
+ import java.util.HashSet;
  
  import javax.swing.Timer;
***************
*** 64,68 ****
  
    /** The selected objects */
!   protected static List selection;
  
    /** The carmera move timer */
--- 65,69 ----
  
    /** The selected objects */
!   protected static Collection selection;
  
    /** The carmera move timer */
***************
*** 74,78 ****
    static {
      timer = new Timer(40, null);
!     selection = new ArrayList();
    }
  
--- 75,79 ----
    static {
      timer = new Timer(40, null);
!     selection = new HashSet();
    }
  
***************
*** 114,130 ****
      } else if (e.getKeyCode() == KeyEvent.VK_R) {
        glv.changeTool(Tool.EXTRUSION_TOOL);
!     } else if (e.getKeyChar() == KeyEvent.VK_1) {
        glv.changeView(View.VIEW_3D);
!     } else if (e.getKeyChar() == KeyEvent.VK_2) {
        glv.changeView(View.VIEW_XZ);
!     } else if (e.getKeyChar() == KeyEvent.VK_3) { 
        glv.changeView(View.VIEW_XY);
!     } else if (e.getKeyChar() == KeyEvent.VK_4) {
        glv.changeView(View.VIEW_YZ);
!     } else if (e.getKeyChar() == KeyEvent.VK_8) {
        glv.getView().changeDrawMode(View.WIREFRAME_MODE);
!     } else if (e.getKeyChar() == KeyEvent.VK_9) {
        glv.getView().changeDrawMode(View.SOLID_MODE);
!     } else if (e.getKeyChar() == KeyEvent.VK_0) {
        glv.getView().changeDrawMode(View.LIGHTING_MODE);
      }
--- 115,131 ----
      } else if (e.getKeyCode() == KeyEvent.VK_R) {
        glv.changeTool(Tool.EXTRUSION_TOOL);
!     } else if (e.getKeyCode() == KeyEvent.VK_F1) {
        glv.changeView(View.VIEW_3D);
!     } else if (e.getKeyCode() == KeyEvent.VK_F2) {
        glv.changeView(View.VIEW_XZ);
!     } else if (e.getKeyCode() == KeyEvent.VK_F3) { 
        glv.changeView(View.VIEW_XY);
!     } else if (e.getKeyCode() == KeyEvent.VK_F4) {
        glv.changeView(View.VIEW_YZ);
!     } else if (e.getKeyCode() == KeyEvent.VK_F5) {
        glv.getView().changeDrawMode(View.WIREFRAME_MODE);
!     } else if (e.getKeyCode() == KeyEvent.VK_F6) {
        glv.getView().changeDrawMode(View.SOLID_MODE);
!     } else if (e.getKeyCode() == KeyEvent.VK_F7) {
        glv.getView().changeDrawMode(View.LIGHTING_MODE);
      }
***************
*** 438,444 ****
    /**
     * Return the current selection
!    * @return The list of selected objects
     */
!   public List getSelection() {
      return selection;
    }
--- 439,445 ----
    /**
     * Return the current selection
!    * @return The collection of selected objects
     */
!   public Collection getSelection() {
      return selection;
    }