[Bprocessor-commit] /gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.131, 1.132 ToolFactory.java, 1.85, 1.86

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

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

Modified Files:
	AbstractTool.java ToolFactory.java 
Log Message:
Made getPrevious tool private in ToolFactory and changed the callers to use getTool(Tool.PREVIOUS_TOOL) instead

Index: ToolFactory.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/ToolFactory.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** ToolFactory.java	19 Sep 2007 20:57:47 -0000	1.85
--- ToolFactory.java	27 Sep 2007 10:48:53 -0000	1.86
***************
*** 343,347 ****
     * @return The tool
     */
!   public Tool getPrevious() {
      Tool temp = previousTool;
      previousTool = currentTool;
--- 343,347 ----
     * @return The tool
     */
!   private Tool getPrevious() {
      Tool temp = previousTool;
      previousTool = currentTool;

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor//gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** AbstractTool.java	24 Sep 2007 13:02:17 -0000	1.131
--- AbstractTool.java	27 Sep 2007 10:48:53 -0000	1.132
***************
*** 191,197 ****
        tool = factory.get(Tool.SELECT_TOOL);
      } else {
!       Tool prev = factory.getPrevious();
        if (prev != this) {
!         factory.getPrevious();
        }
        tool = this;
--- 191,200 ----
        tool = factory.get(Tool.SELECT_TOOL);
      } else {
!       if (activeStrategy == AbstractTool.select) {
!         this.prepare();
!       }
!       Tool prev = factory.get(Tool.PREVIOUS_TOOL);
        if (prev != this) {
!         factory.get(Tool.PREVIOUS_TOOL);
        }
        tool = this;
***************
*** 526,530 ****
     * @return The collection of selected objects
     */
!   public Collection getSelection() {
      return Selection.primary();
    }
--- 529,533 ----
     * @return The collection of selected objects
     */
!   public Selection getSelection() {
      return Selection.primary();
    }