diff --git a/aW2.xml b/aW2.xml
index be6f62c..d8591e5 100644
--- a/aW2.xml
+++ b/aW2.xml
@@ -27,7 +27,7 @@
64/32
- 4.3.2.0
+ 4.4.0.0
analyseWriter
évaluer les mise en forme des fichiers au format ODF.
GNU GLP 3.0
diff --git a/analyseWriter.exe b/analyseWriter.exe
index ed77cfe..e40847c 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/analyseWriter.jar b/analyseWriter.jar
index c0dea16..7901a3e 100644
Binary files a/analyseWriter.jar and b/analyseWriter.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
index 75cdcb7..d092f21 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1 +1,3 @@
/fenetres/
+/resources/
+/MEPTL/
diff --git a/bin/MEPTL/commandes.class b/bin/MEPTL/commandes.class
index 4c31276..d669e56 100644
Binary files a/bin/MEPTL/commandes.class and b/bin/MEPTL/commandes.class differ
diff --git a/bin/fenetres/create$1.class b/bin/fenetres/create$1.class
index bfafe05..a6c4bae 100644
Binary files a/bin/fenetres/create$1.class and b/bin/fenetres/create$1.class differ
diff --git a/bin/fenetres/create$10.class b/bin/fenetres/create$10.class
index 01e6723..cd310cd 100644
Binary files a/bin/fenetres/create$10.class and b/bin/fenetres/create$10.class differ
diff --git a/bin/fenetres/create$11.class b/bin/fenetres/create$11.class
index 897b9f8..7a24728 100644
Binary files a/bin/fenetres/create$11.class and b/bin/fenetres/create$11.class differ
diff --git a/bin/fenetres/create$12.class b/bin/fenetres/create$12.class
index c3f3bbb..5bf9c77 100644
Binary files a/bin/fenetres/create$12.class and b/bin/fenetres/create$12.class differ
diff --git a/bin/fenetres/create$13.class b/bin/fenetres/create$13.class
index f0ae4d5..fed9ca0 100644
Binary files a/bin/fenetres/create$13.class and b/bin/fenetres/create$13.class differ
diff --git a/bin/fenetres/create$14.class b/bin/fenetres/create$14.class
index 6f12388..9918ef5 100644
Binary files a/bin/fenetres/create$14.class and b/bin/fenetres/create$14.class differ
diff --git a/bin/fenetres/create$2.class b/bin/fenetres/create$2.class
index 1d952e7..1fe52a8 100644
Binary files a/bin/fenetres/create$2.class and b/bin/fenetres/create$2.class differ
diff --git a/bin/fenetres/create$3.class b/bin/fenetres/create$3.class
index 47b3c20..fd003f9 100644
Binary files a/bin/fenetres/create$3.class and b/bin/fenetres/create$3.class differ
diff --git a/bin/fenetres/create$4.class b/bin/fenetres/create$4.class
index b5acf09..dc25109 100644
Binary files a/bin/fenetres/create$4.class and b/bin/fenetres/create$4.class differ
diff --git a/bin/fenetres/create$5.class b/bin/fenetres/create$5.class
index 3183236..8e0a897 100644
Binary files a/bin/fenetres/create$5.class and b/bin/fenetres/create$5.class differ
diff --git a/bin/fenetres/create$6.class b/bin/fenetres/create$6.class
index 8f7e367..a8a7ad4 100644
Binary files a/bin/fenetres/create$6.class and b/bin/fenetres/create$6.class differ
diff --git a/bin/fenetres/create$7.class b/bin/fenetres/create$7.class
index a866361..6d3c7f5 100644
Binary files a/bin/fenetres/create$7.class and b/bin/fenetres/create$7.class differ
diff --git a/bin/fenetres/create$8.class b/bin/fenetres/create$8.class
index 24743a1..952fb55 100644
Binary files a/bin/fenetres/create$8.class and b/bin/fenetres/create$8.class differ
diff --git a/bin/fenetres/create$9.class b/bin/fenetres/create$9.class
index 3b6109f..fe8354f 100644
Binary files a/bin/fenetres/create$9.class and b/bin/fenetres/create$9.class differ
diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class
index 43a6fa6..d3a84c5 100644
Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ
diff --git a/bin/fenetres/evaluate$1.class b/bin/fenetres/evaluate$1.class
index 715a6a5..e358570 100644
Binary files a/bin/fenetres/evaluate$1.class and b/bin/fenetres/evaluate$1.class differ
diff --git a/bin/fenetres/evaluate$10.class b/bin/fenetres/evaluate$10.class
index f93f6b9..f4ef6d1 100644
Binary files a/bin/fenetres/evaluate$10.class and b/bin/fenetres/evaluate$10.class differ
diff --git a/bin/fenetres/evaluate$11.class b/bin/fenetres/evaluate$11.class
index fd6c606..22a0ade 100644
Binary files a/bin/fenetres/evaluate$11.class and b/bin/fenetres/evaluate$11.class differ
diff --git a/bin/fenetres/evaluate$12.class b/bin/fenetres/evaluate$12.class
index aa40133..f61e322 100644
Binary files a/bin/fenetres/evaluate$12.class and b/bin/fenetres/evaluate$12.class differ
diff --git a/bin/fenetres/evaluate$13.class b/bin/fenetres/evaluate$13.class
index bed57b1..2aa8589 100644
Binary files a/bin/fenetres/evaluate$13.class and b/bin/fenetres/evaluate$13.class differ
diff --git a/bin/fenetres/evaluate$14.class b/bin/fenetres/evaluate$14.class
index b35e520..0863493 100644
Binary files a/bin/fenetres/evaluate$14.class and b/bin/fenetres/evaluate$14.class differ
diff --git a/bin/fenetres/evaluate$15.class b/bin/fenetres/evaluate$15.class
index eb05bb0..ad9ea0b 100644
Binary files a/bin/fenetres/evaluate$15.class and b/bin/fenetres/evaluate$15.class differ
diff --git a/bin/fenetres/evaluate$16.class b/bin/fenetres/evaluate$16.class
index 72f6508..6f6d4d0 100644
Binary files a/bin/fenetres/evaluate$16.class and b/bin/fenetres/evaluate$16.class differ
diff --git a/bin/fenetres/evaluate$17.class b/bin/fenetres/evaluate$17.class
index 7f742a4..4c6fb10 100644
Binary files a/bin/fenetres/evaluate$17.class and b/bin/fenetres/evaluate$17.class differ
diff --git a/bin/fenetres/evaluate$18.class b/bin/fenetres/evaluate$18.class
index fe90676..fa36c12 100644
Binary files a/bin/fenetres/evaluate$18.class and b/bin/fenetres/evaluate$18.class differ
diff --git a/bin/fenetres/evaluate$19.class b/bin/fenetres/evaluate$19.class
index a46a5d5..71df6b3 100644
Binary files a/bin/fenetres/evaluate$19.class and b/bin/fenetres/evaluate$19.class differ
diff --git a/bin/fenetres/evaluate$2.class b/bin/fenetres/evaluate$2.class
index f985ad7..e176ee0 100644
Binary files a/bin/fenetres/evaluate$2.class and b/bin/fenetres/evaluate$2.class differ
diff --git a/bin/fenetres/evaluate$20.class b/bin/fenetres/evaluate$20.class
index fb68b15..cdff04a 100644
Binary files a/bin/fenetres/evaluate$20.class and b/bin/fenetres/evaluate$20.class differ
diff --git a/bin/fenetres/evaluate$21.class b/bin/fenetres/evaluate$21.class
index ddf01cd..d13cfea 100644
Binary files a/bin/fenetres/evaluate$21.class and b/bin/fenetres/evaluate$21.class differ
diff --git a/bin/fenetres/evaluate$26.class b/bin/fenetres/evaluate$26.class
index 0549f8e..761fa47 100644
Binary files a/bin/fenetres/evaluate$26.class and b/bin/fenetres/evaluate$26.class differ
diff --git a/bin/fenetres/evaluate$27.class b/bin/fenetres/evaluate$27.class
index f83d0f2..83ff6cf 100644
Binary files a/bin/fenetres/evaluate$27.class and b/bin/fenetres/evaluate$27.class differ
diff --git a/bin/fenetres/evaluate$28.class b/bin/fenetres/evaluate$28.class
index 2386e67..746a399 100644
Binary files a/bin/fenetres/evaluate$28.class and b/bin/fenetres/evaluate$28.class differ
diff --git a/bin/fenetres/evaluate$29.class b/bin/fenetres/evaluate$29.class
index de5d715..d6974f9 100644
Binary files a/bin/fenetres/evaluate$29.class and b/bin/fenetres/evaluate$29.class differ
diff --git a/bin/fenetres/evaluate$3.class b/bin/fenetres/evaluate$3.class
index da30d2c..7808654 100644
Binary files a/bin/fenetres/evaluate$3.class and b/bin/fenetres/evaluate$3.class differ
diff --git a/bin/fenetres/evaluate$30.class b/bin/fenetres/evaluate$30.class
index 39c667a..908d84e 100644
Binary files a/bin/fenetres/evaluate$30.class and b/bin/fenetres/evaluate$30.class differ
diff --git a/bin/fenetres/evaluate$31.class b/bin/fenetres/evaluate$31.class
index d139ea0..20a5e32 100644
Binary files a/bin/fenetres/evaluate$31.class and b/bin/fenetres/evaluate$31.class differ
diff --git a/bin/fenetres/evaluate$32.class b/bin/fenetres/evaluate$32.class
index aae079c..b50bb4e 100644
Binary files a/bin/fenetres/evaluate$32.class and b/bin/fenetres/evaluate$32.class differ
diff --git a/bin/fenetres/evaluate$33.class b/bin/fenetres/evaluate$33.class
index 0876079..55bd7fe 100644
Binary files a/bin/fenetres/evaluate$33.class and b/bin/fenetres/evaluate$33.class differ
diff --git a/bin/fenetres/evaluate$4.class b/bin/fenetres/evaluate$4.class
index 609bc09..2a66a43 100644
Binary files a/bin/fenetres/evaluate$4.class and b/bin/fenetres/evaluate$4.class differ
diff --git a/bin/fenetres/evaluate$5.class b/bin/fenetres/evaluate$5.class
index d296bbe..eba6011 100644
Binary files a/bin/fenetres/evaluate$5.class and b/bin/fenetres/evaluate$5.class differ
diff --git a/bin/fenetres/evaluate$6.class b/bin/fenetres/evaluate$6.class
index 9f400a2..f6916a6 100644
Binary files a/bin/fenetres/evaluate$6.class and b/bin/fenetres/evaluate$6.class differ
diff --git a/bin/fenetres/evaluate$7.class b/bin/fenetres/evaluate$7.class
index b82032d..71cb5ec 100644
Binary files a/bin/fenetres/evaluate$7.class and b/bin/fenetres/evaluate$7.class differ
diff --git a/bin/fenetres/evaluate$8.class b/bin/fenetres/evaluate$8.class
index 6370b25..a72389e 100644
Binary files a/bin/fenetres/evaluate$8.class and b/bin/fenetres/evaluate$8.class differ
diff --git a/bin/fenetres/evaluate$9.class b/bin/fenetres/evaluate$9.class
index 0779ecd..d20a51e 100644
Binary files a/bin/fenetres/evaluate$9.class and b/bin/fenetres/evaluate$9.class differ
diff --git a/bin/fenetres/evaluate.class b/bin/fenetres/evaluate.class
index e139dbb..ab52812 100644
Binary files a/bin/fenetres/evaluate.class and b/bin/fenetres/evaluate.class differ
diff --git a/icons/versfichierAnalyse.png b/icons/versfichierAnalyse.png
new file mode 100644
index 0000000..d18c146
Binary files /dev/null and b/icons/versfichierAnalyse.png differ
diff --git a/icons/versfichierAnalyseModifmax.svg b/icons/versfichierAnalyseModifmax.svg
new file mode 100644
index 0000000..ab1d5cf
--- /dev/null
+++ b/icons/versfichierAnalyseModifmax.svg
@@ -0,0 +1,168 @@
+
+
+
+
diff --git a/src/MEPTL/commandes.java b/src/MEPTL/commandes.java
index 373e873..d8f5bda 100644
--- a/src/MEPTL/commandes.java
+++ b/src/MEPTL/commandes.java
@@ -32,7 +32,7 @@ public class commandes {
public static node nodeCSV = null;
//**version
- public static String version ="V4.3.2"; // La version actuelle
+ public static String version ="V4.4.0"; // La version actuelle
public static String branch = "Origin";
public static String Annee ="2022";
diff --git a/src/fenetres/create.java b/src/fenetres/create.java
index 426eed2..f360f82 100644
--- a/src/fenetres/create.java
+++ b/src/fenetres/create.java
@@ -72,7 +72,11 @@ import fenetres.create_act.actUpNode;
-
+/**
+ *
+ * @author pablo rodriguez
+ *
+ */
public final class create extends JFrame {
private static final long serialVersionUID = 1L;
@@ -81,25 +85,15 @@ public final class create extends JFrame {
private static DefaultMutableTreeNode selectNode;
private static afficheText textNodeSelect = new afficheText();
private JToolBar toolBarPrincipal;
-
-
-// private toolBarRecherche bRecherche;
-
-// private JCheckBoxMenuItem chckbxtoolBarRecherche;
-
private JMenuBar menuBar = new JMenuBar();
private static JButton buttonEvaluate;
-
private static JToggleButton tglbtnTousLesNodes;
-
- private JPanel panelPrincipal;
-// private JPanel panel;
-
+ private JPanel panelPrincipal;
private static create instance;
/**
- * Create the application.
+ * Création de la fenêtre.
*/
public create() {
try {
@@ -110,11 +104,16 @@ public final class create extends JFrame {
setVisible(true);
}
+ /**
+ * Obtient l'instance encours.
+ * @return l'instance de la fenêtre.
+ */
public static create getInstance() {
if (instance == null) {
instance = new create();
}
instance.setVisible(true);
+ lectureFichierDejaCharger();
return instance;
}
@@ -174,11 +173,13 @@ public final class create extends JFrame {
this.setExtendedState(MAXIMIZED_BOTH);
ListenerAction();
+
}
/**
- * Selection du node du tree et d'un node CXML
+ * Selection du node du tree et d'un node CXML.
+ * Fermeture de la fenêtre.
*/
private void ListenerAction() {
@@ -196,6 +197,8 @@ public final class create extends JFrame {
// refreshTree(); //repaint l'arbre.
if(tree.isCollapsed(tree.getSelectionPath())){
tree.expandPath(tree.getSelectionPath()); //Etend le node sélectionné.
+ }else {
+ tree.collapsePath(tree.getSelectionPath());
}
}
}
@@ -261,9 +264,6 @@ public final class create extends JFrame {
menuBar.add(mnuEdit);
-// chckbxtoolBarRecherche = new JCheckBoxMenuItem("Barre outils recherche node");
-// chckbxtoolBarRecherche.setSelected(true);
-// mnAffiche.add(chckbxtoolBarRecherche);
// Définition du menu Node
JMenu mnNode = new JMenu("Modifier");
@@ -320,7 +320,9 @@ public final class create extends JFrame {
return menuBar;
}
- /* Methode de construction de la barre d'outils */
+ /**
+ * Methode de construction de la barre d'outils/
+ */
private void createToolBar() {
toolBarPrincipal = new JToolBar();
toolBarPrincipal.setFloatable(false);
@@ -474,7 +476,7 @@ public final class create extends JFrame {
/**
- *
+ * Annule une action.
*/
private AbstractAction actUndo = new AbstractAction() {
@@ -614,6 +616,22 @@ public final class create extends JFrame {
return parent;
}
+ /**
+ * Lecture du fichier déjà chargé.
+ */
+ private static void lectureFichierDejaCharger() {
+ if(commandes.fichierAnalyseValide) {
+ fenetres.create.constructionTree();
+ fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse();
+ fenetres.create.getTglbtnTousLesNodes().setSelected(false);
+ fenetres.create.getButtonEvaluate().setEnabled(true);
+ fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse();
+ }else {
+ fenetres.create.getTextNodeSelect().setContentType("text/plain");
+
+ }
+ }
+
public static JTree getTree() {
return tree;
@@ -684,23 +702,6 @@ public final class create extends JFrame {
-
-
-
-// void saySomething(String eventDescription, TreeExpansionEvent e) {
-// System.out.println(eventDescription + "; " + "path = " + e.getPath());
-// }
-//
-//
-// // Required by TreeExpansionListener interface.
-// public void treeExpanded(TreeExpansionEvent e) {
-// saySomething("Tree-expanded event detected", e);
-// }
-//
-// // Required by TreeExpansionListener interface.
-// public void treeCollapsed(TreeExpansionEvent e) {
-// saySomething("Tree-collapsed event detected", e);
-// }
@@ -710,53 +711,5 @@ public final class create extends JFrame {
-//class MyTreeWillExpandListener implements TreeWillExpandListener {
-//
-//
-// public void treeWillExpand(TreeExpansionEvent evt) throws ExpandVetoException {
-// JTree tree = (JTree) evt.getSource();
-//
-// TreePath path = evt.getPath();
-// boolean veto = false;
-// if (veto) {
-// throw new ExpandVetoException(evt);
-// }
-// }
-//
-// public void treeWillCollapse(TreeExpansionEvent evt) throws ExpandVetoException {
-// JTree tree = (JTree) evt.getSource();
-//
-// TreePath path = evt.getPath();
-// boolean veto = false;
-// if (veto) {
-// throw new ExpandVetoException(evt);
-// }
-// }
-//}
-//class MyTreeExpansionListener implements TreeExpansionListener {
-//
-// public ArrayList Chemin = new ArrayList();
-//
-// public ArrayList getChemin() {
-// return Chemin;
-// }
-//
-// public void setChemin(ArrayList chemin) {
-// Chemin = chemin;
-// }
-//
-// public void treeExpanded(TreeExpansionEvent evt) {
-// TreePath path = evt.getPath();
-// Chemin.add(path);
-// System.out.println("treeExpanded");
-// }
-//
-// public void treeCollapsed(TreeExpansionEvent evt) {
-// TreePath path = evt.getPath();
-// Chemin.remove(path);
-// System.out.println("treeCollapsed");
-//
-// }
-//}
diff --git a/src/fenetres/evaluate.java b/src/fenetres/evaluate.java
index 21d9ac4..790bb5e 100644
--- a/src/fenetres/evaluate.java
+++ b/src/fenetres/evaluate.java
@@ -44,6 +44,11 @@ import fenetres.create_act.actLicence;
import fenetres.create_act.actTutoriels;
import net.miginfocom.swing.MigLayout;
+/**
+ *
+ * @author pablo rodriguez
+ *
+ */
public class evaluate extends JFrame {
/**
@@ -71,7 +76,7 @@ public class evaluate extends JFrame {
private JCheckBox chckbxVerif;
private JCheckBox chckbxNewLogo;
private JCheckBox chckbxNoDetail;
- private afficheText txtpnmessages;
+ private static afficheText txtpnmessages;
private static evaluate instance;
@@ -81,10 +86,6 @@ public class evaluate extends JFrame {
public void initialize() throws UnsupportedLookAndFeelException{
setSize(1200,800);
-
-
-
-
ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") );
this.setIconImage(img.getImage());
setTitle(commandes.Titre + " " + commandes.version + " " + commandes.branch);
@@ -231,7 +232,6 @@ public class evaluate extends JFrame {
panelWest.add(chckbxVerif, "flowy,cell 1 7,growx,aligny top");
chckbxVerif.setSelected(commandes.verifHisto2);
-
lblChargementFichierCSV = new JLabel("Chargement de la liste des étudiants");
panelWest.add(lblChargementFichierCSV, "cell 1 8,alignx left,aligny center");
@@ -346,6 +346,11 @@ public class evaluate extends JFrame {
instance = new evaluate();
}
instance.setVisible(true);
+ if(commandes.fichierAnalyseValide) {
+ txtpnmessages.afficheChargementFichierAnalyse();
+ }else {
+ txtpnmessages.setText(baliseStyle.balise() + "
*** Veuillez charger un fichier d'analyse ***
");
+ }
return instance;
}
@@ -448,7 +453,7 @@ public class evaluate extends JFrame {
public void actionPerformed(ActionEvent e) {
}
});
- btnModifierFichierAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseModif.png")));
+ btnModifierFichierAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/versfichierAnalyse.png")));
btnModifierFichierAnalyse.setHideActionText(true);
toolBar.add(btnModifierFichierAnalyse);
diff --git a/src/resources/versfichierAnalyse.png b/src/resources/versfichierAnalyse.png
new file mode 100644
index 0000000..d18c146
Binary files /dev/null and b/src/resources/versfichierAnalyse.png differ