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

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

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

Modified Files:
	MenuFactory.java GUI.java 
Removed Files:
	PopupMenu.java 
Log Message:
more popupmenu refactoring

--- PopupMenu.java DELETED ---

Index: GUI.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/GUI.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** GUI.java	18 Dec 2007 13:11:24 -0000	1.90
--- GUI.java	18 Dec 2007 23:15:11 -0000	1.91
***************
*** 30,33 ****
--- 30,34 ----
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Edge;
+ import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Line;
***************
*** 664,682 ****
    
    /**
!    * 
!    * @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);
    }
    
--- 665,673 ----
    
    /**
!    * Give menuFactory
!    * @return The factory
     */
!   public MenuFactory menuFactory() {
!     return this.menuFactory;
    }
    

Index: MenuFactory.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/MenuFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MenuFactory.java	18 Dec 2007 13:11:24 -0000	1.1
--- MenuFactory.java	18 Dec 2007 23:15:10 -0000	1.2
***************
*** 12,15 ****
--- 12,17 ----
  import javax.swing.JPopupMenu;
  
+ import net.sourceforge.bprocessor.model.Attribute;
+ import net.sourceforge.bprocessor.model.Entity;
  import net.sourceforge.bprocessor.model.Geometric;
  
***************
*** 30,33 ****
--- 32,48 ----
     */
    JPopupMenu menuFor(Collection<Geometric> geometrics);
+ 
+   /**
+    * 
+    * @param entity Entity
+    * @return menu
+    */
+   JPopupMenu menuFor(Entity entity);
    
+   /**
+    * 
+    * @param attribute attribute
+    * @return menu
+    */
+   JPopupMenu menuFor(Attribute attribute);
  }