diff --git a/Menu/menucontextuel/CreatePopupMenu.java b/Menu/menucontextuel/CreatePopupMenu.java index 0e1941b..b7e720e 100644 --- a/Menu/menucontextuel/CreatePopupMenu.java +++ b/Menu/menucontextuel/CreatePopupMenu.java @@ -38,7 +38,7 @@ public class CreatePopupMenu extends JPopupMenu { * Création de la popupmenu.
* @param nod */ - public CreatePopupMenu(node nod) { + public CreatePopupMenu(node nod ) { if(nod!=null) { diff --git a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java b/Menu/menucontextuel/MnGroupeMethodeEvaluer.java index 897ba22..8f31f12 100644 --- a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java +++ b/Menu/menucontextuel/MnGroupeMethodeEvaluer.java @@ -65,7 +65,8 @@ public class MnGroupeMethodeEvaluer { // Pour la méthode AllContent if(listeDesNodesAllContent.isAllContent(nod) ) { mnGroupeMethodeEvaluer.addSeparator(); - mnGroupeMethodeEvaluer.add(new actAllContent()); + mnGroupeMethodeEvaluer.add(new actAllContent()); + mnGroupeMethodeEvaluer.add(new actAllContent()); } // Pour la méthode evalAncrageNumeroAbsoluePage diff --git a/bin/action/actAllContent.class b/bin/action/actAllContent.class index 5b5dd6f..aa9bd99 100644 Binary files a/bin/action/actAllContent.class and b/bin/action/actAllContent.class differ diff --git a/bin/action/actEvalueTrue.class b/bin/action/actEvalueTrue.class index e6c72e1..ff83bf6 100644 Binary files a/bin/action/actEvalueTrue.class and b/bin/action/actEvalueTrue.class differ diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class index f17e455..8b6ae79 100644 Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ diff --git a/bin/menucontextuel/MnGroupeMethodeEvaluer.class b/bin/menucontextuel/MnGroupeMethodeEvaluer.class index f38e8ac..54c80f4 100644 Binary files a/bin/menucontextuel/MnGroupeMethodeEvaluer.class and b/bin/menucontextuel/MnGroupeMethodeEvaluer.class differ diff --git a/src/action/actAllContent.java b/src/action/actAllContent.java index 560a4eb..097651f 100644 --- a/src/action/actAllContent.java +++ b/src/action/actAllContent.java @@ -1,10 +1,12 @@ package action; import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; +import javax.swing.KeyStroke; import cXML.node; import fenetres.allContent; @@ -18,9 +20,10 @@ public class actAllContent extends AbstractAction{ private static final long serialVersionUID = 1L; { putValue( Action.NAME, "Evaluer le contenu du node" ); - putValue( Action.SHORT_DESCRIPTION, "Evaluer le contenu du node" ); + putValue( Action.SHORT_DESCRIPTION, "Evaluer le contenu du node (SHIFT+A)" ); putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/allcontentmini.png")) ); - } + putValue( Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A, KeyEvent.SHIFT_DOWN_MASK) ); + } @Override public void actionPerformed(ActionEvent e) { diff --git a/src/action/actEvalueTrue.java b/src/action/actEvalueTrue.java index 3da35dd..8777d8f 100644 --- a/src/action/actEvalueTrue.java +++ b/src/action/actEvalueTrue.java @@ -1,7 +1,6 @@ package action; import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import javax.swing.AbstractAction; diff --git a/src/fenetres/create.java b/src/fenetres/create.java index a81a1de..6ff4975 100644 --- a/src/fenetres/create.java +++ b/src/fenetres/create.java @@ -90,11 +90,11 @@ public final class create extends JFrame { private JToolBar toolBarPrincipal; private JMenuBar menuBar = new JMenuBar(); private static JButton buttonEvaluate; -// private static JToggleButton tglbtnTousLesNodes; private JPanel panelPrincipal; private static create instance; public static boolean isDispose = true; private static JLabel lblInfo = new JLabel("Fichier d'analyse"); + // private static JTable table = new JTable(); /** * Création de la fenêtre.