Author: dlanglais Date: 2010-03-25 18:21:38 +0100 (Thu, 25 Mar 2010) New Revision: 285 Log: Ajout de tables et de colonnes OK ! Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java Modified: trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java =================================================================== --- trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-25 16:58:18 UTC (rev 284) +++ trunk/msm/src/main/java/org/nuiton/mapstoragemanager/ui/engine/MSMNavigationListener.java 2010-03-25 17:21:38 UTC (rev 285) @@ -50,7 +50,7 @@ JTable jTable = null; /* if nothing is selected */ - if (node == null || node.isRoot()) { + if (node != null && node.isRoot()) { return; } else if (node.isLeaf()) { //we create a standard model of column @@ -85,28 +85,28 @@ */ private void rightButton(MouseEvent e) { JPopupMenu menu = new JPopupMenu(); - JMenuItem anItem; - MainUI ui = MainUI.getInstance(); - DefaultMutableTreeNode node; - node = (DefaultMutableTreeNode) ui.getNavigation(). + final MainUI ui = MainUI.getInstance(); + final JTree navigation = ui.getNavigation(); + final DefaultMutableTreeNode node = (DefaultMutableTreeNode) navigation. getLastSelectedPathComponent(); + final String tableName = node.toString(); + + if (node != null && node.getLevel() == 0) { + JMenuItem anItem = new JMenuItem(_("add.table")); + anItem.addActionListener(new AddTableListener()); - System.out.println(node.toString()); + menu.add(anItem); + menu.show(e.getComponent(), e.getX(), e.getY()); + + } else if (node.getLevel() == 1) { + JMenuItem anItem = new JMenuItem(_("add.column")); + anItem.addActionListener(new AddColumnListener(tableName)); - if (node == null || node.isRoot()) { - anItem = new JMenuItem(_("add.table")); - anItem.addActionListener(new AddTableListener()); - } else if (node.isLeaf()) { - return; - } else { - anItem = new JMenuItem(_("add.column")); -// anItem.addActionListener(new AddColumnListener( -// e.getComponent().getName())); + menu.add(anItem); + menu.show(e.getComponent(), e.getX(), e.getY()); } - menu.add(anItem); - menu.show(e.getComponent(), e.getX(), e.getY()); } @Override