[Bprocessor-commit] gui/src/net/sourceforge/bprocessor/gui MenuFactory.java, NONE, 1.1 PopupMenu.java, 1.93, 1.94 GUI.java, 1.89, 1.90

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

Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25193/src/net/sourceforge/bprocessor/gui

Modified Files:
	PopupMenu.java GUI.java 
Added Files:
	MenuFactory.java 
Log Message:
popupmenu refactory

Index: PopupMenu.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/PopupMenu.java,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** PopupMenu.java	17 Dec 2007 20:00:08 -0000	1.93
--- PopupMenu.java	18 Dec 2007 13:11:24 -0000	1.94
***************
*** 51,55 ****
   * The static popup menu generator
   */
! public class PopupMenu {
    /** The logger */
    private static Logger log = Logger.getLogger(PopupMenu.class);  
--- 51,55 ----
   * The static popup menu generator
   */
! public class PopupMenu implements MenuFactory {
    /** The logger */
    private static Logger log = Logger.getLogger(PopupMenu.class);  
***************
*** 58,61 ****
--- 58,68 ----
    
    /**
+    * 
+    *
+    */
+   public PopupMenu() {
+   }
+   
+   /**
     * Make a popupmenu for a list of surfaces
     * @param surfaces the list of surfaces
***************
*** 794,796 ****
--- 801,813 ----
    }
  
+   /** {@inheritDoc} */
+   public JPopupMenu menuFor(Geometric geometric) {
+     return null;
+   }
+ 
+   /** {@inheritDoc} */
+   public JPopupMenu menuFor(Collection<Geometric> geometrics) {
+     return null;
+   }
+ 
  }

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** GUI.java	17 Dec 2007 13:09:35 -0000	1.89
--- GUI.java	18 Dec 2007 13:11:24 -0000	1.90
***************
*** 130,133 ****
--- 130,135 ----
    private PreviewPanel previewPanel;
  
+   private MenuFactory menuFactory;
+   
    /**
     * Constructor for GUI
***************
*** 652,655 ****
--- 654,684 ----
    }
  
+  
+   /**
+    * Register menu factory
+    * @param factory menu factory
+    */
+   public void register(MenuFactory factory) {
+     this.menuFactory = factory;
+   }
+   
+   /**
+    * 
+    * @param geometric Geometric
+    * @return geomeric
+    */
+   public JPopupMenu menuFor(Geometric geometric) {
+     return menuFactory.menuFor(geometric);
+   }
+   
+   /**
+    * 
+    * @param geometrics Collection
+    * @return menu
+    */
+   public JPopupMenu menuFor(Collection<Geometric> geometrics) {
+     return menuFactory.menuFor(geometrics);
+   }
+   
    /**
     * Adds a menu to the menu bar.

--- NEW FILE: MenuFactory.java ---
//---------------------------------------------------------------------------------
// $Id: MenuFactory.java,v 1.1 2007/12/18 13:11:24 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.gui;

import java.util.Collection;

import javax.swing.JPopupMenu;

import net.sourceforge.bprocessor.model.Geometric;

/**
 * 
 */
public interface MenuFactory {
  /**
   * @param geometric Geometric
   * @return menu
   */
  JPopupMenu menuFor(Geometric geometric);
  
  /**
   * 
   * @param geometrics Geometrics
   * @return menu
   */
  JPopupMenu menuFor(Collection<Geometric> geometrics);
  
}