[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool SelectTool.java,1.35,1.36

[Nordholt <nor...@us...>]

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

Modified Files:
	SelectTool.java 
Log Message:
different layout of the space menu's

Index: SelectTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SelectTool.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** SelectTool.java	1 Nov 2005 07:36:09 -0000	1.35
--- SelectTool.java	1 Nov 2005 16:25:36 -0000	1.36
***************
*** 133,138 ****
          }
        }
!     }
    }
    
    /** 
--- 133,139 ----
          }
        }
!     } 
    }
+ 
    
    /** 
***************
*** 180,184 ****
        }
      }
!     log.warn("Space popup menu has no surface");
      return sepPop;
    }
--- 181,185 ----
        }
      }
!     log.warn("Seperator popup menu has no surface");
      return sepPop;
    }
***************
*** 206,210 ****
        noneItem.addActionListener(noneListener);
        
-       JMenu createSub = new JMenu("Create");
        JMenuItem createFuncItem = new JMenuItem("New Functional Space");
        ActionListener funcListener = new CreateSpaceActionListener(surface,
--- 207,210 ----
***************
*** 212,216 ****
                                                                    true);
        createFuncItem.addActionListener(funcListener);
-       createSub.add(createFuncItem);
        
        JMenuItem createConstItem = new JMenuItem("New Construction Space");
--- 212,215 ----
***************
*** 219,223 ****
                                                                     false);
        createConstItem.addActionListener(constListener);
-       createSub.add(createConstItem);
        
        JMenu funcMenu = new JMenu("Functional Spaces");
--- 218,221 ----
***************
*** 234,241 ****
            domainItem.addActionListener(ml);
            if (domain instanceof FunctionalSpace) {
-             funcEnabled = true;
              funcMenu.add(domainItem);
            } else {
-             constEnabled = true;
              constMenu.add(domainItem);
            }
--- 232,237 ----
***************
*** 243,253 ****
        }
        
!       funcMenu.setEnabled(funcEnabled);
!       constMenu.setEnabled(constEnabled);
        pp.add(funcMenu);
        pp.add(constMenu);
        pp.addSeparator();
-       pp.add(createSub);
-       pp.addSeparator();
        pp.add(noneItem);
        pp.pack();
--- 239,249 ----
        }
        
!       funcMenu.addSeparator();
!       funcMenu.add(createFuncItem);
!       constMenu.addSeparator();
!       constMenu.add(createConstItem);
        pp.add(funcMenu);
        pp.add(constMenu);
        pp.addSeparator();
        pp.add(noneItem);
        pp.pack();