From a3a75ac0121439ad2a58edf4fbbb86c04b956bf2 Mon Sep 17 00:00:00 2001 From: pablo rodriguez <58742538+1-pablo-rodriguez@users.noreply.github.com> Date: Sat, 6 Apr 2024 16:10:30 +0200 Subject: [PATCH] MAJ V4.5.0 --- Menu/menucontextuel/CreatePopupMenu.java | 2 +- .../MnGroupeMethodeEvaluer.java | 3 ++- bin/action/actAllContent.class | Bin 1267 -> 1428 bytes bin/action/actEvalueTrue.class | Bin 2936 -> 2936 bytes bin/fenetres/create.class | Bin 16899 -> 16899 bytes .../MnGroupeMethodeEvaluer.class | Bin 4589 -> 4605 bytes src/action/actAllContent.java | 7 +++++-- src/action/actEvalueTrue.java | 1 - src/fenetres/create.java | 2 +- 9 files changed, 9 insertions(+), 6 deletions(-) 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 5b5dd6f600cafe8d21b6d79c31c4135ef4c79e84..aa9bd990bc46579a6de25288f168089b1a60dcd0 100644 GIT binary patch delta 624 zcmZ8eQBx986#nkg$hvJ{D{5xQW>$dIYK2)=LMXWjR)RA%)5~?aG19V3%VPE9k63?2 zPx%5&&NMyu)-UKs`0jLo#++WxnRCu}zVqGh9uFU!SAL#+`wn0Q+lNYsZOyLjal0j4 z-4?pla6I9(^h!&28Wo|(OY3I7JeN(#xWX`8s&m^m2^7RM!&r^)@lQtc1YGlY9s!{&s{*}U0QaT9U>fTiUqk}4F;`M+3XU&bwlP}Z`9 zEnMz3+zs(rfq{h}=KniLlal8)-U}6XaF;=?3h%VXFcmk=MB%K$)8R77DeO98vsK>_ zZkg}cfO!(o%r(coz@bc=7|Q#UtcXU91N>DEvDS>Z7JfdJJRG`?UIC Z^DixN;00b1u|fx5VT;5ul!#kG`47DNgqi>V delta 447 zcmYL^OHaZ;6ot>UXrUH~RWS+$z8 z_^wRbEac3*p3Rv?!E~da7gKCfUHBfQQM!2rSvWJDO+ z!kLDPK>Ep1CK);9cfx~PLtMcWrum1EYEEEI!YogTF>xLX+z}&_Nd`~$>>#7t&ZQ|~ znW6nJ3KG=VlPYw+Aiqe} zU&Uk@=QA%@Jg8wQR>g`~!TLYGwP6cT(jdXL2Dbla^%wgcVG~;fmI=L$9SX*2M)1{MZM1|9|}1_cIb1`P%o22%#1$>%xmM=CIIF(@+dF{m)e0mZc# zv>D79bQ!D}^ckEO3>e%P3>iEbj2L`@>H~l>DGU}284Q*T*+3Qf49*N?46Y1~Kvmrg Y?hKQFDrYiyF)RS8Ue4e@nVq{3050PdRsaA1 delta 127 zcmWN{JBtAT007``P~t9&819f$3hDC5`zFaVvf2&GAdB5>W3t(-W`Dv@@HdR-o4;55 z6~Em>v8aGApT4CfReq*;fs%^3B3F_{`6&(6$NB>K+~hp>DWri5G*e7FC3I3skTQBGXOIfUxylrk zyyZIcRPlvsmZ@QdTE20c@6_>wdVX@3-`r!{S&Z;N#zRHZAQz2_LLMMrbAV9s*Y#6!*ezALan@1J3)2Ptst+|N3SLbX_`L0qhDbL zw8)UYGOSfbw8p5`8PhMuwaKLRm~xU#+aX?C0&na%Gj@{qR-45KJHtmiN7($#S{ZY8 zg->>aMUDbV`zhJtk3&c7n)7W3vFlJW@q6SQBsM)UH7+eN)qOT4&Fk^F-5DOo`0E%( F(Lp+hd9dZd#%MD^cPPdAK~7sKWzdHm zbc*+8f9UwY^SIq{b}c%ABTsb^B`&A;XsOfdt~yof^LX6uGLL2KS%x9^59)VZ6951J 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.