bprocessor-commit

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

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

Modified Files:
	GenericTreeView.java 
Log Message:
more popupmenu refactoring

Index: GenericTreeView.java
===================================================================
RCS file: /cvsroot/bprocessor//gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** GenericTreeView.java	17 Dec 2007 11:21:24 -0000	1.136
--- GenericTreeView.java	18 Dec 2007 23:15:10 -0000	1.137
***************
*** 60,64 ****
  import net.sourceforge.bprocessor.model.modellor.Modellor;
  import net.sourceforge.bprocessor.gui.GUI;
- import net.sourceforge.bprocessor.gui.PopupMenu;
  import net.sourceforge.bprocessor.gui.actions.CollectionMenuAction;
  import net.sourceforge.bprocessor.gui.attrview.AttributeView;
--- 60,63 ----
***************
*** 609,619 ****
       */
      public JPopupMenu menu() {   
!       JPopupMenu pm = PopupMenu.makeSelectionMenu();
        if (pm == null) {
          Object object = this.getUserObject();
!         if (object instanceof Entity) { 
!           pm = PopupMenu.getEntityMenu((Entity)object);
!         } else if (object instanceof Attribute) {
!           pm = PopupMenu.getAttributeMenu((Attribute)object); 
          }
        }
--- 608,618 ----
       */
      public JPopupMenu menu() {   
!       JPopupMenu pm = GUI.getInstance().menuFactory().menuFor(Selection.primary());
        if (pm == null) {
          Object object = this.getUserObject();
!         if (object instanceof Attribute) {
!           pm = GUI.getInstance().menuFactory().menuFor((Attribute)object); 
!         } else if (object instanceof Entity) { 
!           pm = GUI.getInstance().menuFactory().menuFor((Entity)object);
          }
        }