diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 41ba3eb..ac0ab3d 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate org.eclipse.jdt.core.compiler.codegen.targetPlatform=19 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.compliance=19 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/analyseWriter.exe b/analyseWriter.exe index d54aab5..7f02919 100644 Binary files a/analyseWriter.exe and b/analyseWriter.exe differ diff --git a/analyseWriter.jar b/analyseWriter.jar index 4c1a1cb..6be4b54 100644 Binary files a/analyseWriter.jar and b/analyseWriter.jar differ diff --git a/analyseWriter_lib/cXML.jar b/analyseWriter_lib/cXML.jar new file mode 100644 index 0000000..e64689a Binary files /dev/null and b/analyseWriter_lib/cXML.jar differ diff --git a/analyseWriter_lib/miglayout15-swing.jar b/analyseWriter_lib/miglayout15-swing.jar new file mode 100644 index 0000000..a6e93fb Binary files /dev/null and b/analyseWriter_lib/miglayout15-swing.jar differ diff --git a/analyseWriter_lib/zip4j-1.2.7.jar b/analyseWriter_lib/zip4j-1.2.7.jar new file mode 100644 index 0000000..8cc597e Binary files /dev/null and b/analyseWriter_lib/zip4j-1.2.7.jar differ diff --git a/bin/.gitignore b/bin/.gitignore index f60bb29..40c7a8c 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,15 +1,2 @@ -/MEPTL/ -/OnLineVersions/ -/action/ -/baseEvaluations/ -/baseListesEtudiants/ -/calcul/ -/com/ -/evaluer/ -/list/ -/menucontextuel/ -/sousmenuArbre/ -/sousmenuEvaluation/ -/sousmenuRecherche/ -/sousmenuRepresentation/ -/META-INF/ +/analyseWriter/ +/resources/ diff --git a/jpackage.log b/jpackage.log new file mode 100644 index 0000000..250fe96 Binary files /dev/null and b/jpackage.log differ diff --git a/saveExport.xml b/saveExport.xml index 3e7f4e5..c5db48d 100644 --- a/saveExport.xml +++ b/saveExport.xml @@ -1,24 +1,21 @@ - - - + + + - + - - + - - - - - + + + diff --git a/src/MEPTL/HTML.java b/src/analyseWriter/MEPTL/HTML.java similarity index 99% rename from src/MEPTL/HTML.java rename to src/analyseWriter/MEPTL/HTML.java index 79fd298..51ddf80 100644 --- a/src/MEPTL/HTML.java +++ b/src/analyseWriter/MEPTL/HTML.java @@ -1,10 +1,10 @@ -package MEPTL; +package analyseWriter.MEPTL; import java.text.DecimalFormat; import java.util.ArrayList; +import analyseWriter.evaluer.evaluation; import cXML.node; -import evaluer.evaluation; /** * diff --git a/src/MEPTL/VerificationHistorique.java b/src/analyseWriter/MEPTL/VerificationHistorique.java similarity index 97% rename from src/MEPTL/VerificationHistorique.java rename to src/analyseWriter/MEPTL/VerificationHistorique.java index d82db02..b695fb6 100644 --- a/src/MEPTL/VerificationHistorique.java +++ b/src/analyseWriter/MEPTL/VerificationHistorique.java @@ -1,4 +1,4 @@ -package MEPTL; +package analyseWriter.MEPTL; import java.text.ParseException; import java.util.ArrayList; @@ -8,9 +8,9 @@ import java.util.Hashtable; import javax.swing.JEditorPane; +import analyseWriter.calcul.formatDateWriter; import cXML.Run; import cXML.node; -import calcul.formatDateWriter; public class VerificationHistorique { diff --git a/src/MEPTL/commandes.java b/src/analyseWriter/MEPTL/commandes.java similarity index 97% rename from src/MEPTL/commandes.java rename to src/analyseWriter/MEPTL/commandes.java index 6ee5f2d..90a9c61 100644 --- a/src/MEPTL/commandes.java +++ b/src/analyseWriter/MEPTL/commandes.java @@ -1,4 +1,4 @@ -package MEPTL; +package analyseWriter.MEPTL; import java.io.IOException; import java.nio.file.Paths; diff --git a/src/MEPTL/ecritureSujet.java b/src/analyseWriter/MEPTL/ecritureSujet.java similarity index 94% rename from src/MEPTL/ecritureSujet.java rename to src/analyseWriter/MEPTL/ecritureSujet.java index 57c349a..e22e093 100644 --- a/src/MEPTL/ecritureSujet.java +++ b/src/analyseWriter/MEPTL/ecritureSujet.java @@ -1,16 +1,16 @@ -package MEPTL; +package analyseWriter.MEPTL; import java.text.ParseException; import java.util.ArrayList; import java.util.Date; +import analyseWriter.list.listeDesNodesAnalyseStyle; +import analyseWriter.list.listeDesNodesEvalPlacement; +import analyseWriter.list.listeDesNodesRechercheByContenu; +import analyseWriter.list.listeEvalNameNode; +import analyseWriter.list.listeRechercheParAnchorPageNumber; import cXML.Run; import cXML.node; -import list.listeDesNodesAnalyseStyle; -import list.listeDesNodesEvalPlacement; -import list.listeDesNodesRechercheByContenu; -import list.listeEvalNameNode; -import list.listeRechercheParAnchorPageNumber; /** @@ -46,11 +46,11 @@ public class ecritureSujet { try { //C'est la date d'enregistrement du fichier - nod.getAttributs().put("date", calcul.formatDateWriter.DateLibreOffice(aujourdhui)); + nod.getAttributs().put("date", analyseWriter.calcul.formatDateWriter.DateLibreOffice(aujourdhui)); //La modification date mini permet de réaliser un contrôle des dates. //Les étudiants ne peuvent pas réaliser le contrôle vant cette date. - nod.getAttributs().put("modificationDateMini", calcul.formatDateWriter.DateLibreOffice(aujourdhui)); + nod.getAttributs().put("modificationDateMini", analyseWriter.calcul.formatDateWriter.DateLibreOffice(aujourdhui)); } catch (ParseException e) { e.printStackTrace(); } diff --git a/src/MEPTL/feedbacks.java b/src/analyseWriter/MEPTL/feedbacks.java similarity index 97% rename from src/MEPTL/feedbacks.java rename to src/analyseWriter/MEPTL/feedbacks.java index 8e51a91..7848e3b 100644 --- a/src/MEPTL/feedbacks.java +++ b/src/analyseWriter/MEPTL/feedbacks.java @@ -1,4 +1,4 @@ -package MEPTL; +package analyseWriter.MEPTL; import java.io.BufferedWriter; import java.io.IOException; @@ -18,8 +18,8 @@ import java.util.Enumeration; import java.util.regex.Matcher; import java.util.regex.Pattern; +import analyseWriter.calcul.formatDateWriter; import cXML.node; -import calcul.formatDateWriter; public class feedbacks { diff --git a/src/MEPTL/meptl.java b/src/analyseWriter/MEPTL/meptl.java similarity index 97% rename from src/MEPTL/meptl.java rename to src/analyseWriter/MEPTL/meptl.java index 78eda54..6b10254 100644 --- a/src/MEPTL/meptl.java +++ b/src/analyseWriter/MEPTL/meptl.java @@ -1,4 +1,4 @@ -package MEPTL; +package analyseWriter.MEPTL; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -18,12 +18,12 @@ import java.util.regex.Pattern; import javax.swing.JOptionPane; -import baseListesEtudiants.ecritureBaseListesEtudiants; +import analyseWriter.baseListesEtudiants.ecritureBaseListesEtudiants; +import analyseWriter.calcul.formatDateWriter; +import analyseWriter.evaluer.evaluation; import cXML.Run; import cXML.Run.UserStatus; import cXML.node; -import calcul.formatDateWriter; -import evaluer.evaluation; /** diff --git a/src/MEPTL/rechercherUnNodeStudent.java b/src/analyseWriter/MEPTL/rechercherUnNodeStudent.java similarity index 98% rename from src/MEPTL/rechercherUnNodeStudent.java rename to src/analyseWriter/MEPTL/rechercherUnNodeStudent.java index 6317b13..749b00c 100644 --- a/src/MEPTL/rechercherUnNodeStudent.java +++ b/src/analyseWriter/MEPTL/rechercherUnNodeStudent.java @@ -1,4 +1,4 @@ -package MEPTL; +package analyseWriter.MEPTL; import java.util.ArrayList; @@ -7,9 +7,9 @@ import java.util.regex.Pattern; import javax.swing.JOptionPane; +import analyseWriter.evaluer.evaluation; import cXML.Run; import cXML.node; -import evaluer.evaluation; /** * diff --git a/src/MEPTL/verificationFichierAnalyse_node_commandesSujet.java b/src/analyseWriter/MEPTL/verificationFichierAnalyse_node_commandesSujet.java similarity index 98% rename from src/MEPTL/verificationFichierAnalyse_node_commandesSujet.java rename to src/analyseWriter/MEPTL/verificationFichierAnalyse_node_commandesSujet.java index 79dff52..d99daad 100644 --- a/src/MEPTL/verificationFichierAnalyse_node_commandesSujet.java +++ b/src/analyseWriter/MEPTL/verificationFichierAnalyse_node_commandesSujet.java @@ -1,4 +1,4 @@ -package MEPTL; +package analyseWriter.MEPTL; import java.io.IOException; import java.util.Dictionary; @@ -8,9 +8,9 @@ import java.util.regex.Pattern; import javax.swing.JOptionPane; +import analyseWriter.evaluer.evaluation; import cXML.Run; import cXML.node; -import evaluer.evaluation; /** * diff --git a/src/OnLineVersions/verificationNewVersion.java b/src/analyseWriter/OnLineVersions/verificationNewVersion.java similarity index 95% rename from src/OnLineVersions/verificationNewVersion.java rename to src/analyseWriter/OnLineVersions/verificationNewVersion.java index 676328b..be9aac6 100644 --- a/src/OnLineVersions/verificationNewVersion.java +++ b/src/analyseWriter/OnLineVersions/verificationNewVersion.java @@ -1,4 +1,4 @@ -package OnLineVersions; +package analyseWriter.OnLineVersions; import java.io.BufferedReader; import java.io.IOException; @@ -10,9 +10,7 @@ import java.net.UnknownHostException; import java.util.regex.Matcher; import java.util.regex.Pattern; - - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; diff --git a/src/action/actAPropos.java b/src/analyseWriter/action/actAPropos.java similarity index 85% rename from src/action/actAPropos.java rename to src/analyseWriter/action/actAPropos.java index 5150256..a7e8f5f 100644 --- a/src/action/actAPropos.java +++ b/src/analyseWriter/action/actAPropos.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -9,8 +9,8 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.KeyStroke; -import com.analyseWriter.fenetres.about; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.about; +import analyseWriter.fenetres.create; public class actAPropos extends AbstractAction{ diff --git a/src/action/actAbout.java b/src/analyseWriter/action/actAbout.java similarity index 85% rename from src/action/actAbout.java rename to src/analyseWriter/action/actAbout.java index 6659983..e686386 100644 --- a/src/action/actAbout.java +++ b/src/analyseWriter/action/actAbout.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -9,8 +9,8 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.KeyStroke; -import com.analyseWriter.fenetres.about; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.about; +import analyseWriter.fenetres.create; public class actAbout extends AbstractAction{ diff --git a/src/action/actAddMenuFalse.java b/src/analyseWriter/action/actAddMenuFalse.java similarity index 67% rename from src/action/actAddMenuFalse.java rename to src/analyseWriter/action/actAddMenuFalse.java index c50615e..ad8b170 100644 --- a/src/action/actAddMenuFalse.java +++ b/src/analyseWriter/action/actAddMenuFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actAddMenuFalse extends AbstractAction{ @@ -25,9 +24,9 @@ public class actAddMenuFalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.addMenu(false); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actAddMenuTrue.java b/src/analyseWriter/action/actAddMenuTrue.java similarity index 68% rename from src/action/actAddMenuTrue.java rename to src/analyseWriter/action/actAddMenuTrue.java index b34ea43..62eea2c 100644 --- a/src/action/actAddMenuTrue.java +++ b/src/analyseWriter/action/actAddMenuTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actAddMenuTrue extends AbstractAction{ @@ -25,9 +24,9 @@ public class actAddMenuTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.addMenu(true); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actAfficheInformationFichierAnalyse.java b/src/analyseWriter/action/actAfficheInformationFichierAnalyse.java similarity index 76% rename from src/action/actAfficheInformationFichierAnalyse.java rename to src/analyseWriter/action/actAfficheInformationFichierAnalyse.java index d666ee1..0cbdc7d 100644 --- a/src/action/actAfficheInformationFichierAnalyse.java +++ b/src/analyseWriter/action/actAfficheInformationFichierAnalyse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -17,7 +17,7 @@ public class actAfficheInformationFichierAnalyse extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - com.analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); + analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); } } diff --git a/src/action/actAllContent.java b/src/analyseWriter/action/actAllContent.java similarity index 72% rename from src/action/actAllContent.java rename to src/analyseWriter/action/actAllContent.java index 72a4d1d..607061b 100644 --- a/src/action/actAllContent.java +++ b/src/analyseWriter/action/actAllContent.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -8,11 +8,10 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.KeyStroke; -import com.analyseWriter.fenetres.allContent; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.allContent; +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesAllContent; import cXML.node; -import list.listeDesNodesAllContent; public class actAllContent extends AbstractAction{ @@ -30,9 +29,9 @@ public class actAllContent extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(listeDesNodesAllContent.isAllContent(nod)) { - new allContent(nod,com.analyseWriter.fenetres.create.getTextNodeSelect()); + new allContent(nod,analyseWriter.fenetres.create.getTextNodeSelect()); } } } diff --git a/src/action/actAttribut.java b/src/analyseWriter/action/actAttribut.java similarity index 77% rename from src/action/actAttribut.java rename to src/analyseWriter/action/actAttribut.java index bbba801..2267db9 100644 --- a/src/action/actAttribut.java +++ b/src/analyseWriter/action/actAttribut.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -10,12 +10,11 @@ import javax.swing.ImageIcon; import javax.swing.JOptionPane; import javax.swing.KeyStroke; -import com.analyseWriter.fenetres.attributs; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.attributs; +import analyseWriter.fenetres.create; +import analyseWriter.list.listeAttributsAnalyseWriter; +import analyseWriter.list.listeNodesNonModifiableAttribut; import cXML.node; -import list.listeAttributsAnalyseWriter; -import list.listeNodesNonModifiableAttribut; public class actAttribut extends AbstractAction{ @@ -32,7 +31,7 @@ public class actAttribut extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); int nbrAttribut = nod.getAttributs().size(); @@ -47,7 +46,7 @@ public class actAttribut extends AbstractAction{ if(nbrAttribut>0) { if(listeNodesNonModifiableAttribut.isModifiableAttribut(nod.getNomElt())) { - new attributs(nod,com.analyseWriter.fenetres.create.getTextNodeSelect()); + new attributs(nod,analyseWriter.fenetres.create.getTextNodeSelect()); }else { JOptionPane.showMessageDialog(null, "Vous ne pouvez pas modifier les attributs de ce node."); } diff --git a/src/action/actCoefficient.java b/src/analyseWriter/action/actCoefficient.java similarity index 63% rename from src/action/actCoefficient.java rename to src/analyseWriter/action/actCoefficient.java index 9865524..8309f54 100644 --- a/src/action/actCoefficient.java +++ b/src/analyseWriter/action/actCoefficient.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -11,9 +11,8 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; -import com.analyseWriter.fenetres.baliseStyle; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.baliseStyle; +import analyseWriter.fenetres.create; import cXML.node; public class actCoefficient extends AbstractAction{ @@ -29,7 +28,7 @@ public class actCoefficient extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); double poids = 1.00; if(nod.getAttributs().get("poids")!=null) { try { @@ -54,15 +53,15 @@ public class actCoefficient extends AbstractAction{ poids = Double.valueOf(poidsField.getText()); if(poids<=0) { nod.poids(Double.valueOf(1)); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
poids=1.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
poids=1.

"); }else { nod.poids(Double.valueOf(poids)); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } catch (Exception e2) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
La valeur n'a pas été modifiée.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
La valeur n'a pas été modifiée.

"); } } } diff --git a/src/action/actCollapseAll.java b/src/analyseWriter/action/actCollapseAll.java similarity index 79% rename from src/action/actCollapseAll.java rename to src/analyseWriter/action/actCollapseAll.java index 63b885f..d9f2ef9 100644 --- a/src/action/actCollapseAll.java +++ b/src/analyseWriter/action/actCollapseAll.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,7 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.create; public class actCollapseAll extends AbstractAction{ @@ -22,7 +22,7 @@ public class actCollapseAll extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - com.analyseWriter.fenetres.create.collapseAll(); + analyseWriter.fenetres.create.collapseAll(); } diff --git a/src/action/actCollapseNode.java b/src/analyseWriter/action/actCollapseNode.java similarity index 74% rename from src/action/actCollapseNode.java rename to src/analyseWriter/action/actCollapseNode.java index 82a818e..717aa43 100644 --- a/src/action/actCollapseNode.java +++ b/src/analyseWriter/action/actCollapseNode.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,7 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.create; public class actCollapseNode extends AbstractAction{ @@ -21,7 +21,7 @@ public class actCollapseNode extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - com.analyseWriter.fenetres.create.collapseNode(com.analyseWriter.fenetres.create.getSelectNode()); + analyseWriter.fenetres.create.collapseNode(analyseWriter.fenetres.create.getSelectNode()); } } diff --git a/src/action/actCopy.java b/src/analyseWriter/action/actCopy.java similarity index 77% rename from src/action/actCopy.java rename to src/analyseWriter/action/actCopy.java index 67c18d0..fa2f898 100644 --- a/src/action/actCopy.java +++ b/src/analyseWriter/action/actCopy.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; @@ -11,8 +11,7 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.KeyStroke; -import com.analyseWriter.fenetres.baliseStyle; - +import analyseWriter.fenetres.baliseStyle; import cXML.Run; import cXML.node; @@ -31,7 +30,7 @@ public class actCopy extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); Clipboard cb = Toolkit.getDefaultToolkit().getSystemClipboard(); @@ -42,7 +41,7 @@ public class actCopy extends AbstractAction{ System.out.println(texto.toString()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()+"

Le node est copié dans le presse papier.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()+"

Le node est copié dans le presse papier.

"); } } diff --git a/src/action/actDeleteNode.java b/src/analyseWriter/action/actDeleteNode.java similarity index 81% rename from src/action/actDeleteNode.java rename to src/analyseWriter/action/actDeleteNode.java index cb71dda..3450baa 100644 --- a/src/action/actDeleteNode.java +++ b/src/analyseWriter/action/actDeleteNode.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -14,8 +14,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actDeleteNode extends AbstractAction{ @@ -34,12 +33,12 @@ public class actDeleteNode extends AbstractAction{ public void actionPerformed(ActionEvent e) { - if(com.analyseWriter.fenetres.create.getTree().getSelectionPath()!=null) { + if(analyseWriter.fenetres.create.getTree().getSelectionPath()!=null) { JPanel myPanel = new JPanel(); JLabel message1 = new JLabel("Voulez-vous supprimer ce node ?"); - JLabel message2 = new JLabel(com.analyseWriter.fenetres.create.getSelectNode().toString()); + JLabel message2 = new JLabel(analyseWriter.fenetres.create.getSelectNode().toString()); myPanel.add(message1); myPanel.add(message2); // a spacer @@ -47,24 +46,24 @@ public class actDeleteNode extends AbstractAction{ int result = JOptionPane.showConfirmDialog(null, myPanel, "Suppression d'un node", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(!(nod.getNomElt().equals("setting")||nod.getNomElt().equals("csv")||nod.getNomElt().equals("import_moodle")||nod.getNomElt().equals("zip") ||nod.getNomElt().equals("plagiarism")||nod.getNomElt().equals("text:similarity")||nod.getNomElt().equals("color") ||nod.getNomElt().equals("translation") )) { nod.getParent().supprimeNodeEnfant(nod); - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath().getParentPath(); - DefaultMutableTreeNode nodMu = com.analyseWriter.fenetres.create.getSelectNode(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath().getParentPath(); + DefaultMutableTreeNode nodMu = analyseWriter.fenetres.create.getSelectNode(); DefaultMutableTreeNode SelectParentNode = (DefaultMutableTreeNode) nodMu.getParent(); SelectParentNode.remove(nodMu); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); }else { diff --git a/src/action/actDocumentation.java b/src/analyseWriter/action/actDocumentation.java similarity index 90% rename from src/action/actDocumentation.java rename to src/analyseWriter/action/actDocumentation.java index 29224ce..e8e09ea 100644 --- a/src/action/actDocumentation.java +++ b/src/analyseWriter/action/actDocumentation.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -10,7 +10,7 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.KeyStroke; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.create; public class actDocumentation extends AbstractAction{ diff --git a/src/action/actDownNode.java b/src/analyseWriter/action/actDownNode.java similarity index 76% rename from src/action/actDownNode.java rename to src/analyseWriter/action/actDownNode.java index d29b4eb..3bd85b4 100644 --- a/src/action/actDownNode.java +++ b/src/analyseWriter/action/actDownNode.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -12,9 +12,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.create; import cXML.node; public class actDownNode extends AbstractAction{ @@ -31,24 +30,24 @@ public class actDownNode extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - if(com.analyseWriter.fenetres.create.getTree().getSelectionPath()!=null) { + if(analyseWriter.fenetres.create.getTree().getSelectionPath()!=null) { // int a = JOptionPane.showConfirmDialog(null,"Voulez-vous descendre le node " + fenetres.create.getSelectNode().toString() + "?", "Sélectionner un choix", JOptionPane.YES_NO_OPTION); // // if(a == JOptionPane.YES_NO_OPTION) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(!nod.chemin().contains("setting")) { - DefaultMutableTreeNode selectNode = com.analyseWriter.fenetres.create.getSelectNode(); + DefaultMutableTreeNode selectNode = analyseWriter.fenetres.create.getSelectNode(); DefaultMutableTreeNode selectParentNode = (DefaultMutableTreeNode) selectNode.getParent(); int selectedNodeIndex = selectNode.getParent().getIndex(selectNode); int count = selectNode.getParent().getChildCount(); if(selectedNodeIndexErreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
L'attribut evalAncrageNumeroAbsoluePage a été supprimé."); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
L'attribut evalAncrageNumeroAbsoluePage a été supprimé.

"); }else { for(int i = 0 ; i < nod.getNodes().size();i++) { nod.getNodes().get(i).getAttributs().put("evalAncrageNumeroAbsoluePage", String.valueOf(point)); } } } catch (Exception e2) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalAncrageNumeroAbsoluePageOui.java b/src/analyseWriter/action/actEvalAncrageNumeroAbsoluePageOui.java similarity index 77% rename from src/action/actEvalAncrageNumeroAbsoluePageOui.java rename to src/analyseWriter/action/actEvalAncrageNumeroAbsoluePageOui.java index be5f2d5..0e95d68 100644 --- a/src/action/actEvalAncrageNumeroAbsoluePageOui.java +++ b/src/analyseWriter/action/actEvalAncrageNumeroAbsoluePageOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalAncrageNumeroAbsoluePageOui extends AbstractAction{ @@ -24,13 +23,13 @@ public class actEvalAncrageNumeroAbsoluePageOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalAncrageNumeroAbsoluePage", "

Si le node dans le fichier de l'étudiant est sur la même page de
" + "numéro absolue, alors l'étudiant obtiendra les points ci-dessous.


" + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalAncrageNumeroAbsoluePage.

", new ImageIcon(create.class.getResource("/resources/evalnumeropageancrage.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalEnteteActive.java b/src/analyseWriter/action/actEvalEnteteActive.java similarity index 76% rename from src/action/actEvalEnteteActive.java rename to src/analyseWriter/action/actEvalEnteteActive.java index 34651a7..c831427 100644 --- a/src/action/actEvalEnteteActive.java +++ b/src/analyseWriter/action/actEvalEnteteActive.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalEnteteActive extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalEnteteActive extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalEnteteActive", "

Si ce node dans le fichier de l'étudiant contient le node
" + "style:header-footer-properties (en-tête activé),
" @@ -32,6 +31,6 @@ public class actEvalEnteteActive extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalEnteteActive

", new ImageIcon(create.class.getResource("/resources/enteteoui.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalEntetePasActive.java b/src/analyseWriter/action/actEvalEntetePasActive.java similarity index 77% rename from src/action/actEvalEntetePasActive.java rename to src/analyseWriter/action/actEvalEntetePasActive.java index 0597b13..ddf2222 100644 --- a/src/action/actEvalEntetePasActive.java +++ b/src/analyseWriter/action/actEvalEntetePasActive.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalEntetePasActive extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalEntetePasActive extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalEntetePasActive", "

Si ce node dans le fichier de l'étudiant ne contient pas le node
" + "style:header-footer-properties (en-tête désactivé),
" @@ -32,7 +31,7 @@ public class actEvalEntetePasActive extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalEntetePasActive

", new ImageIcon(create.class.getResource("/resources/entetenon.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalFirstChildTrue.java b/src/analyseWriter/action/actEvalFirstChildTrue.java similarity index 75% rename from src/action/actEvalFirstChildTrue.java rename to src/analyseWriter/action/actEvalFirstChildTrue.java index 3b39eae..7440547 100644 --- a/src/action/actEvalFirstChildTrue.java +++ b/src/analyseWriter/action/actEvalFirstChildTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalFirstChildTrue extends AbstractAction{ @@ -24,14 +23,14 @@ public class actEvalFirstChildTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalFirstChild", "

Si ce node est le premier node dans le fichier de l'étudiant alors
" + "l'étudiant obtiendra les points ci-dessous.


" + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalFirstChild

", new ImageIcon(create.class.getResource("/resources/premierenfant.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalFormatageDirect.java b/src/analyseWriter/action/actEvalFormatageDirect.java similarity index 85% rename from src/action/actEvalFormatageDirect.java rename to src/analyseWriter/action/actEvalFormatageDirect.java index 8a8c712..798e141 100644 --- a/src/action/actEvalFormatageDirect.java +++ b/src/analyseWriter/action/actEvalFormatageDirect.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.util.regex.Matcher; @@ -8,9 +8,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePointCaseCoche; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePointCaseCoche; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalFormatageDirect extends AbstractAction{ @@ -26,7 +25,7 @@ public class actEvalFormatageDirect extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); String namestyle =""; String texteInsert = "

Ce paragraphe ne possède pas de formatage direct.


"; @@ -53,7 +52,7 @@ public class actEvalFormatageDirect extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalFormatageDirect.

", new ImageIcon(create.class.getResource("/resources/evalformatagedirect.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalInitialCreator.java b/src/analyseWriter/action/actEvalInitialCreator.java similarity index 76% rename from src/action/actEvalInitialCreator.java rename to src/analyseWriter/action/actEvalInitialCreator.java index 6f23d00..c162fc9 100644 --- a/src/action/actEvalInitialCreator.java +++ b/src/analyseWriter/action/actEvalInitialCreator.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalInitialCreator extends AbstractAction{ @@ -24,13 +23,13 @@ public class actEvalInitialCreator extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalNameInitialCreator", "

Si ce node contient le prénom et nom du premier auteur,
" + "alors l'étudiant obtiendra les points ci-dessous.


" + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalNameInitialCreator

", new ImageIcon(create.class.getResource("/resources/auteurcreateur.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalLastChildTrue.java b/src/analyseWriter/action/actEvalLastChildTrue.java similarity index 75% rename from src/action/actEvalLastChildTrue.java rename to src/analyseWriter/action/actEvalLastChildTrue.java index cc8ee2c..068463e 100644 --- a/src/action/actEvalLastChildTrue.java +++ b/src/analyseWriter/action/actEvalLastChildTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalLastChildTrue extends AbstractAction{ @@ -24,14 +23,14 @@ public class actEvalLastChildTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalLastChild", "

Si ce node est le dernier node dans le fichier de l'étudiant alors
" + "l'étudiant obtiendra les points ci-dessous.


" + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalLastChild

", new ImageIcon(create.class.getResource("/resources/dernierenfant.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNameNodeOui.java b/src/analyseWriter/action/actEvalNameNodeOui.java similarity index 75% rename from src/action/actEvalNameNodeOui.java rename to src/analyseWriter/action/actEvalNameNodeOui.java index 562c9ef..a14f2d2 100644 --- a/src/action/actEvalNameNodeOui.java +++ b/src/analyseWriter/action/actEvalNameNodeOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNameNodeOui extends AbstractAction{ @@ -24,14 +23,14 @@ public class actEvalNameNodeOui extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalNameNode", "

Si ce node est présent dans le fichier de l'étudiant alors
" + "l'étudiant obtiendra les points ci-dessous.


" + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalNameNode.

", new ImageIcon(create.class.getResource("/resources/evalnode.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNamePageOui.java b/src/analyseWriter/action/actEvalNamePageOui.java similarity index 78% rename from src/action/actEvalNamePageOui.java rename to src/analyseWriter/action/actEvalNamePageOui.java index bc9f388..658c237 100644 --- a/src/action/actEvalNamePageOui.java +++ b/src/analyseWriter/action/actEvalNamePageOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePointpourNumeroPageEtStructure; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePointpourNumeroPageEtStructure; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNamePageOui extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalNamePageOui extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePointpourNumeroPageEtStructure.showCustominputDialog(nod,"evalNamePage", "

Si le node \"page\" dans le fichier de l'étudiant est du
" + "même style de page (même nom de la page) que ce node,
" @@ -34,7 +33,7 @@ public class actEvalNamePageOui extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalNamePage.

", new ImageIcon(create.class.getResource("/resources/evalnamepage.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNameSequenceNon.java b/src/analyseWriter/action/actEvalNameSequenceNon.java similarity index 72% rename from src/action/actEvalNameSequenceNon.java rename to src/analyseWriter/action/actEvalNameSequenceNon.java index a92c192..2decf91 100644 --- a/src/action/actEvalNameSequenceNon.java +++ b/src/analyseWriter/action/actEvalNameSequenceNon.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNameSequenceNon extends AbstractAction{ @@ -23,9 +22,9 @@ public class actEvalNameSequenceNon extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.supprimeAttribut("evalNameSequence"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNameSequenceOui.java b/src/analyseWriter/action/actEvalNameSequenceOui.java similarity index 77% rename from src/action/actEvalNameSequenceOui.java rename to src/analyseWriter/action/actEvalNameSequenceOui.java index a3b8181..894898e 100644 --- a/src/action/actEvalNameSequenceOui.java +++ b/src/analyseWriter/action/actEvalNameSequenceOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNameSequenceOui extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalNameSequenceOui extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalNameSequence", "

Si ce node contient le nom de la variable de séquence
" + "(ex. création d'une catégorie), alors l'étudiant obtiendra
" @@ -32,6 +31,6 @@ public class actEvalNameSequenceOui extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalNameSequence

", new ImageIcon(create.class.getResource("/resources/evalnamesequence.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNombreDePageMaxiNon.java b/src/analyseWriter/action/actEvalNombreDePageMaxiNon.java similarity index 72% rename from src/action/actEvalNombreDePageMaxiNon.java rename to src/analyseWriter/action/actEvalNombreDePageMaxiNon.java index 8ba4f78..f381525 100644 --- a/src/action/actEvalNombreDePageMaxiNon.java +++ b/src/analyseWriter/action/actEvalNombreDePageMaxiNon.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNombreDePageMaxiNon extends AbstractAction{ @@ -23,9 +22,9 @@ public class actEvalNombreDePageMaxiNon extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().remove("evalNombreDePageMaxi"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNombreDePageMaxiOui.java b/src/analyseWriter/action/actEvalNombreDePageMaxiOui.java similarity index 80% rename from src/action/actEvalNombreDePageMaxiOui.java rename to src/analyseWriter/action/actEvalNombreDePageMaxiOui.java index da88ff2..d892b0d 100644 --- a/src/action/actEvalNombreDePageMaxiOui.java +++ b/src/analyseWriter/action/actEvalNombreDePageMaxiOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -11,9 +11,8 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; -import com.analyseWriter.fenetres.baliseStyle; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.baliseStyle; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNombreDePageMaxiOui extends AbstractAction{ @@ -29,7 +28,7 @@ public class actEvalNombreDePageMaxiOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); int point = 0; int nombrePage = 1; if(nod.getAttributs().get("evalNombreDePageMaxi")!=null) { @@ -73,12 +72,12 @@ public class actEvalNombreDePageMaxiOui extends AbstractAction{ } } catch (Exception e2) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
La valeur n'a pas été modifiée.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
La valeur n'a pas été modifiée.

"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalNombreDePageMiniNon.java b/src/analyseWriter/action/actEvalNombreDePageMiniNon.java similarity index 72% rename from src/action/actEvalNombreDePageMiniNon.java rename to src/analyseWriter/action/actEvalNombreDePageMiniNon.java index 074475c..d1054c6 100644 --- a/src/action/actEvalNombreDePageMiniNon.java +++ b/src/analyseWriter/action/actEvalNombreDePageMiniNon.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNombreDePageMiniNon extends AbstractAction{ @@ -23,9 +22,9 @@ public class actEvalNombreDePageMiniNon extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().remove("evalNombreDePageMini"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNombreDePageMiniOui.java b/src/analyseWriter/action/actEvalNombreDePageMiniOui.java similarity index 80% rename from src/action/actEvalNombreDePageMiniOui.java rename to src/analyseWriter/action/actEvalNombreDePageMiniOui.java index 90f2dfd..dc55b43 100644 --- a/src/action/actEvalNombreDePageMiniOui.java +++ b/src/analyseWriter/action/actEvalNombreDePageMiniOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -11,9 +11,8 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; -import com.analyseWriter.fenetres.baliseStyle; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.baliseStyle; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNombreDePageMiniOui extends AbstractAction{ @@ -29,7 +28,7 @@ public class actEvalNombreDePageMiniOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); int point = 0; int nombrePage = 1; if(nod.getAttributs().get("evalNombreDePageMini")!=null) { @@ -73,11 +72,11 @@ public class actEvalNombreDePageMiniOui extends AbstractAction{ } } catch (Exception e2) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
La valeur n'a pas été modifiée.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
La valeur n'a pas été modifiée.

"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNombreParagraphe.java b/src/analyseWriter/action/actEvalNombreParagraphe.java similarity index 77% rename from src/action/actEvalNombreParagraphe.java rename to src/analyseWriter/action/actEvalNombreParagraphe.java index 33a6ad0..c8f587b 100644 --- a/src/action/actEvalNombreParagraphe.java +++ b/src/analyseWriter/action/actEvalNombreParagraphe.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePointInputNombreSansCaseACocher; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePointInputNombreSansCaseACocher; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNombreParagraphe extends AbstractAction{ @@ -21,7 +20,7 @@ public class actEvalNombreParagraphe extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePointInputNombreSansCaseACocher.showCustominputDialog(nod,"evalnombreparagraphe", "

Si le node de l'étudiant contient le même nombre
" + "de paragraphe \"text:p\" et de titre \"text:h\",
" @@ -30,7 +29,7 @@ public class actEvalNombreParagraphe extends AbstractAction{ + "d'évaluation evalnombreparagraphe.


" + "

Le nombre de paragraphe doit être indiqué ci-dessous.

", new ImageIcon(create.class.getResource("/resources/evalnombreparagraphe.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalNumeroAbsoluePageOui.java b/src/analyseWriter/action/actEvalNumeroAbsoluePageOui.java similarity index 78% rename from src/action/actEvalNumeroAbsoluePageOui.java rename to src/analyseWriter/action/actEvalNumeroAbsoluePageOui.java index 4545604..140cffc 100644 --- a/src/action/actEvalNumeroAbsoluePageOui.java +++ b/src/analyseWriter/action/actEvalNumeroAbsoluePageOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePointpourNumeroPageEtStructure; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePointpourNumeroPageEtStructure; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNumeroAbsoluePageOui extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalNumeroAbsoluePageOui extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePointpourNumeroPageEtStructure.showCustominputDialog(nod,"evalNumeroAbsoluePage", "

Si le node \"page\" dans le fichier de l'étudiant est situé
" + "au même numéro de page absolue que ce node de page,
" @@ -34,6 +33,6 @@ public class actEvalNumeroAbsoluePageOui extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalNumeroAbsoluePage.

", new ImageIcon(create.class.getResource("/resources/evalnumeroabsoluepage.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalNumeroPageOui.java b/src/analyseWriter/action/actEvalNumeroPageOui.java similarity index 78% rename from src/action/actEvalNumeroPageOui.java rename to src/analyseWriter/action/actEvalNumeroPageOui.java index b2a6879..5e82e2e 100644 --- a/src/action/actEvalNumeroPageOui.java +++ b/src/analyseWriter/action/actEvalNumeroPageOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePointpourNumeroPageEtStructure; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePointpourNumeroPageEtStructure; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalNumeroPageOui extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalNumeroPageOui extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePointpourNumeroPageEtStructure.showCustominputDialog(nod,"evalNumeroPage", "

Si le node \"page\" dans le fichier de l'étudiant est situé
" + "sur le même numéro de la pagination que ce node,
" @@ -34,6 +33,6 @@ public class actEvalNumeroPageOui extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalNumeroPage.

", new ImageIcon(create.class.getResource("/resources/evalnumeropage.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalPasParagrapheVideOui.java b/src/analyseWriter/action/actEvalPasParagrapheVideOui.java similarity index 78% rename from src/action/actEvalPasParagrapheVideOui.java rename to src/analyseWriter/action/actEvalPasParagrapheVideOui.java index b955a01..00646f0 100644 --- a/src/action/actEvalPasParagrapheVideOui.java +++ b/src/analyseWriter/action/actEvalPasParagrapheVideOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePointpourNumeroPageEtStructure; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePointpourNumeroPageEtStructure; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalPasParagrapheVideOui extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalPasParagrapheVideOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePointpourNumeroPageEtStructure.showCustominputDialog(nod,"evalPasParagrapheVide", "

Si ce node, dans le fichier de l'étudiant, ne contient pas
" + "de paragraphe vide (Empty or blank), alors l'étudiant
" @@ -34,6 +33,6 @@ public class actEvalPasParagrapheVideOui extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalPasParagrapheVide.

", new ImageIcon(create.class.getResource("/resources/evalpasparagraphevide.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalPiedPageActive.java b/src/analyseWriter/action/actEvalPiedPageActive.java similarity index 77% rename from src/action/actEvalPiedPageActive.java rename to src/analyseWriter/action/actEvalPiedPageActive.java index f38b50e..319f72e 100644 --- a/src/action/actEvalPiedPageActive.java +++ b/src/analyseWriter/action/actEvalPiedPageActive.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalPiedPageActive extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalPiedPageActive extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalPiedPageActive", "

Si ce node dans le fichier de l'étudiant ne contient pas le node
" + "style:header-footer-properties (pied de page désactivé),
" @@ -32,7 +31,7 @@ public class actEvalPiedPageActive extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalPiedPageActive

", new ImageIcon(create.class.getResource("/resources/piedpageoui.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalPiedPagePasActive.java b/src/analyseWriter/action/actEvalPiedPagePasActive.java similarity index 77% rename from src/action/actEvalPiedPagePasActive.java rename to src/analyseWriter/action/actEvalPiedPagePasActive.java index 4ef34cf..f7055b9 100644 --- a/src/action/actEvalPiedPagePasActive.java +++ b/src/analyseWriter/action/actEvalPiedPagePasActive.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalPiedPagePasActive extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalPiedPagePasActive extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalPiedPagePasActive", "

Si ce node dans le fichier de l'étudiant contient le node
" + "style:header-footer-properties (pied de page activé),
" @@ -32,7 +31,7 @@ public class actEvalPiedPagePasActive extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalPiedPagePasActive

", new ImageIcon(create.class.getResource("/resources/piedpagenon.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalPlacementEnfantNon.java b/src/analyseWriter/action/actEvalPlacementEnfantNon.java similarity index 72% rename from src/action/actEvalPlacementEnfantNon.java rename to src/analyseWriter/action/actEvalPlacementEnfantNon.java index 69cdeb2..78ebce2 100644 --- a/src/action/actEvalPlacementEnfantNon.java +++ b/src/analyseWriter/action/actEvalPlacementEnfantNon.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,10 +6,9 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesEvalPlacement; import cXML.node; -import list.listeDesNodesEvalPlacement; public class actEvalPlacementEnfantNon extends AbstractAction{ { @@ -24,13 +23,13 @@ public class actEvalPlacementEnfantNon extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); for(int i =0 ; i < nod.getNodes().size(); i++) { if(listeDesNodesEvalPlacement.isPlacement(nod.getNodes().get(i))) { nod.getNodes().get(i).getAttributs().put("evalPlacement", "0"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalPlacementEnfantOui.java b/src/analyseWriter/action/actEvalPlacementEnfantOui.java similarity index 60% rename from src/action/actEvalPlacementEnfantOui.java rename to src/analyseWriter/action/actEvalPlacementEnfantOui.java index c25c588..d5b91dc 100644 --- a/src/action/actEvalPlacementEnfantOui.java +++ b/src/analyseWriter/action/actEvalPlacementEnfantOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -7,11 +7,10 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import com.analyseWriter.fenetres.baliseStyle; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.baliseStyle; +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesEvalPlacement; import cXML.node; -import list.listeDesNodesEvalPlacement; public class actEvalPlacementEnfantOui extends AbstractAction{ { @@ -26,7 +25,7 @@ public class actEvalPlacementEnfantOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); int point = 0; if(nod.getAttributs().get("evalPlacement")!=null) { point = Integer.valueOf(nod.getAttributs().get("evalPlacement")); @@ -36,8 +35,8 @@ public class actEvalPlacementEnfantOui extends AbstractAction{ try { point = Integer.valueOf(a); if(point<=0) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalPlacement a été supprimé.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF SUPÉRIEUR à zéro.
Cependant,l'attribut evalPlacement a été supprimé.

"); for(int i =0 ; i < nod.getNodes().size(); i++) { if(listeDesNodesEvalPlacement.isPlacement(nod.getNodes().get(i))) { nod.getNodes().get(i).supprimeAttribut("evalPlacement"); @@ -51,11 +50,11 @@ public class actEvalPlacementEnfantOui extends AbstractAction{ } } } catch (Exception e2) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalPlacementParagrapheOui.java b/src/analyseWriter/action/actEvalPlacementParagrapheOui.java similarity index 83% rename from src/action/actEvalPlacementParagrapheOui.java rename to src/analyseWriter/action/actEvalPlacementParagrapheOui.java index 8be6b2e..eacfcfc 100644 --- a/src/action/actEvalPlacementParagrapheOui.java +++ b/src/analyseWriter/action/actEvalPlacementParagrapheOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePointCaseCoche; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePointCaseCoche; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalPlacementParagrapheOui extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalPlacementParagrapheOui extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); String nameNode = "null"; String nodAvantContenu = "null"; node nodAvant = nod.retourneLeNodeFrereAvant(); @@ -47,6 +46,6 @@ public class actEvalPlacementParagrapheOui extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalPlacement.

", new ImageIcon(create.class.getResource("/resources/ordreparagraphe.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalSautPageColonneOui.java b/src/analyseWriter/action/actEvalSautPageColonneOui.java similarity index 76% rename from src/action/actEvalSautPageColonneOui.java rename to src/analyseWriter/action/actEvalSautPageColonneOui.java index 72f798b..fa8ec6e 100644 --- a/src/action/actEvalSautPageColonneOui.java +++ b/src/analyseWriter/action/actEvalSautPageColonneOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalSautPageColonneOui extends AbstractAction{ @@ -24,13 +23,13 @@ public class actEvalSautPageColonneOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalSautPageColonne", "

Si ce node contient un saut de page ou de colonne,
" + "alors l'étudiant obtiendra les points ci-dessous.


" + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalSautPageColonne", new ImageIcon(create.class.getResource("/resources/sautpagecolonne.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalTabAlignementGaucheOui.java b/src/analyseWriter/action/actEvalTabAlignementGaucheOui.java similarity index 77% rename from src/action/actEvalTabAlignementGaucheOui.java rename to src/analyseWriter/action/actEvalTabAlignementGaucheOui.java index ccee3d4..5fb5444 100644 --- a/src/action/actEvalTabAlignementGaucheOui.java +++ b/src/analyseWriter/action/actEvalTabAlignementGaucheOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalTabAlignementGaucheOui extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalTabAlignementGaucheOui extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalTABAlignementAGauche", "

Si ce node dans le fichier de l'étudiant ne contient pas le node
" + "style:type (alignement à gauche),
" @@ -32,7 +31,7 @@ public class actEvalTabAlignementGaucheOui extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalPiedPagePasActive

", new ImageIcon(create.class.getResource("/resources/evaltabalgngauche.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalTabDefautStyleLeaderOui.java b/src/analyseWriter/action/actEvalTabDefautStyleLeaderOui.java similarity index 78% rename from src/action/actEvalTabDefautStyleLeaderOui.java rename to src/analyseWriter/action/actEvalTabDefautStyleLeaderOui.java index 02bfb3f..df6d16b 100644 --- a/src/action/actEvalTabDefautStyleLeaderOui.java +++ b/src/analyseWriter/action/actEvalTabDefautStyleLeaderOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalTabDefautStyleLeaderOui extends AbstractAction{ @@ -24,7 +23,7 @@ public class actEvalTabDefautStyleLeaderOui extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalTABStyleLeaderDefault", "

Si ce node dans le fichier de l'étudiant ne contient pas le node
" + "style:leader-text (remplissage des caractères par défaut),
" @@ -32,7 +31,7 @@ public class actEvalTabDefautStyleLeaderOui extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalTABStyleLeaderDefault

", new ImageIcon(create.class.getResource("/resources/evaltabstyleleader.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalTextUserDefinedNon.java b/src/analyseWriter/action/actEvalTextUserDefinedNon.java similarity index 73% rename from src/action/actEvalTextUserDefinedNon.java rename to src/analyseWriter/action/actEvalTextUserDefinedNon.java index 6cb6dde..3fe3f07 100644 --- a/src/action/actEvalTextUserDefinedNon.java +++ b/src/analyseWriter/action/actEvalTextUserDefinedNon.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actEvalTextUserDefinedNon extends AbstractAction{ @@ -23,9 +22,9 @@ public class actEvalTextUserDefinedNon extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.supprimeAttribut("evalTextUserDefined"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalTextUserDefinedOui.java b/src/analyseWriter/action/actEvalTextUserDefinedOui.java similarity index 76% rename from src/action/actEvalTextUserDefinedOui.java rename to src/analyseWriter/action/actEvalTextUserDefinedOui.java index 32996e3..3316f07 100644 --- a/src/action/actEvalTextUserDefinedOui.java +++ b/src/analyseWriter/action/actEvalTextUserDefinedOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actEvalTextUserDefinedOui extends AbstractAction{ @@ -25,13 +24,13 @@ public class actEvalTextUserDefinedOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalTextUserDefined", "

Si ce node contient le texte de la propriété définie par l'utilisateur,
" + "alors l'étudiant obtiendra les points ci-dessous.


" + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalTextUserDefined

", new ImageIcon(create.class.getResource("/resources/evaltextuserdefined.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvalueFalse.java b/src/analyseWriter/action/actEvalueFalse.java similarity index 62% rename from src/action/actEvalueFalse.java rename to src/analyseWriter/action/actEvalueFalse.java index b84d3e7..46858e6 100644 --- a/src/action/actEvalueFalse.java +++ b/src/analyseWriter/action/actEvalueFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -12,8 +12,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actEvalueFalse extends AbstractAction{ @@ -29,23 +28,23 @@ public class actEvalueFalse extends AbstractAction{ putValue( Action.SHORT_DESCRIPTION, "Ne pas évaluer ce node par l'application." ); } public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.evaluerFalse(); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); // fenetres.create.getTree().repaint(); - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvalueTrue.java b/src/analyseWriter/action/actEvalueTrue.java similarity index 73% rename from src/action/actEvalueTrue.java rename to src/analyseWriter/action/actEvalueTrue.java index b424abd..89cbe4e 100644 --- a/src/action/actEvalueTrue.java +++ b/src/analyseWriter/action/actEvalueTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -11,10 +11,9 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; +import analyseWriter.list.listeNodeFormatageDirectDeWriter; import cXML.node; -import list.listeNodeFormatageDirectDeWriter; public class actEvalueTrue extends AbstractAction{ @@ -30,7 +29,7 @@ public class actEvalueTrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.evaluerTrue(); //Ajoute addmenu au node de niveau 1. @@ -65,17 +64,17 @@ public class actEvalueTrue extends AbstractAction{ - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvaluer.java b/src/analyseWriter/action/actEvaluer.java similarity index 85% rename from src/action/actEvaluer.java rename to src/analyseWriter/action/actEvaluer.java index 6edbc75..178c1c0 100644 --- a/src/action/actEvaluer.java +++ b/src/analyseWriter/action/actEvaluer.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -9,11 +9,10 @@ import javax.swing.ImageIcon; import javax.swing.JOptionPane; import javax.swing.KeyStroke; -import com.analyseWriter.fenetres.baseDonneesEvaluations; -import com.analyseWriter.fenetres.create; -import com.analyseWriter.fenetres.evaluate; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.baseDonneesEvaluations; +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.evaluate; public class actEvaluer extends AbstractAction{ diff --git a/src/action/actEvaluerATraversAnalyseStyleTrue.java b/src/analyseWriter/action/actEvaluerATraversAnalyseStyleTrue.java similarity index 59% rename from src/action/actEvaluerATraversAnalyseStyleTrue.java rename to src/analyseWriter/action/actEvaluerATraversAnalyseStyleTrue.java index 6cc821a..922f7e6 100644 --- a/src/action/actEvaluerATraversAnalyseStyleTrue.java +++ b/src/analyseWriter/action/actEvaluerATraversAnalyseStyleTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -9,9 +9,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.CustomInputDialogActivateStyleDansLaStructure; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogActivateStyleDansLaStructure; +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerATraversAnalyseStyleTrue extends AbstractAction{ @@ -27,15 +26,15 @@ public class actEvaluerATraversAnalyseStyleTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogActivateStyleDansLaStructure.showCustominputDialog(nod); - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvaluerLegacyStyleParentFalse.java b/src/analyseWriter/action/actEvaluerLegacyStyleParentFalse.java similarity index 74% rename from src/action/actEvaluerLegacyStyleParentFalse.java rename to src/analyseWriter/action/actEvaluerLegacyStyleParentFalse.java index fc46092..3452f01 100644 --- a/src/action/actEvaluerLegacyStyleParentFalse.java +++ b/src/analyseWriter/action/actEvaluerLegacyStyleParentFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerLegacyStyleParentFalse extends AbstractAction{ @@ -20,9 +19,9 @@ public class actEvaluerLegacyStyleParentFalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.supprimeAttribut("evalLegacyStyleParentPresent"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvaluerLegacyStyleParentTrue.java b/src/analyseWriter/action/actEvaluerLegacyStyleParentTrue.java similarity index 57% rename from src/action/actEvaluerLegacyStyleParentTrue.java rename to src/analyseWriter/action/actEvaluerLegacyStyleParentTrue.java index 01b39c7..e5c052f 100644 --- a/src/action/actEvaluerLegacyStyleParentTrue.java +++ b/src/analyseWriter/action/actEvaluerLegacyStyleParentTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -7,9 +7,8 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import com.analyseWriter.fenetres.baliseStyle; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.baliseStyle; +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerLegacyStyleParentTrue extends AbstractAction{ @@ -22,7 +21,7 @@ public class actEvaluerLegacyStyleParentTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); int point = 0; if(nod.getAttributs().get("evalLegacyStyleParentPresent")!=null) { point = Integer.valueOf(nod.getAttributs().get("evalLegacyStyleParentPresent")); @@ -35,17 +34,17 @@ public class actEvaluerLegacyStyleParentTrue extends AbstractAction{ point = Integer.valueOf(a); if(point<=0) { nod.getAttributs().put("evalLegacyStyleParentPresent", String.valueOf(0)); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalNameLegacyStyle=0.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalNameLegacyStyle=0.

"); }else { nod.getAttributs().put("evalLegacyStyleParentPresent", String.valueOf(point)); } } catch (Exception e2) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvaluerNomDuStyleHeriteTousLesNodesFalse.java b/src/analyseWriter/action/actEvaluerNomDuStyleHeriteTousLesNodesFalse.java similarity index 79% rename from src/action/actEvaluerNomDuStyleHeriteTousLesNodesFalse.java rename to src/analyseWriter/action/actEvaluerNomDuStyleHeriteTousLesNodesFalse.java index 265aebb..7ca44f3 100644 --- a/src/action/actEvaluerNomDuStyleHeriteTousLesNodesFalse.java +++ b/src/analyseWriter/action/actEvaluerNomDuStyleHeriteTousLesNodesFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,10 +6,9 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesAnalyseStyle; import cXML.node; -import list.listeDesNodesAnalyseStyle; public class actEvaluerNomDuStyleHeriteTousLesNodesFalse extends AbstractAction{ { @@ -24,7 +23,7 @@ public class actEvaluerNomDuStyleHeriteTousLesNodesFalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(nod.getNomElt().equals("page")) { supprimeAttribut(nod); } @@ -35,7 +34,7 @@ public class actEvaluerNomDuStyleHeriteTousLesNodesFalse extends AbstractAction{ } } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } private void supprimeAttribut(node nodePage) { diff --git a/src/action/actEvaluerNomDuStyleHeriteTousLesNodesTrue.java b/src/analyseWriter/action/actEvaluerNomDuStyleHeriteTousLesNodesTrue.java similarity index 65% rename from src/action/actEvaluerNomDuStyleHeriteTousLesNodesTrue.java rename to src/analyseWriter/action/actEvaluerNomDuStyleHeriteTousLesNodesTrue.java index bfb4b32..3372205 100644 --- a/src/action/actEvaluerNomDuStyleHeriteTousLesNodesTrue.java +++ b/src/analyseWriter/action/actEvaluerNomDuStyleHeriteTousLesNodesTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -7,11 +7,10 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import com.analyseWriter.fenetres.baliseStyle; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.baliseStyle; +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesAnalyseStyle; import cXML.node; -import list.listeDesNodesAnalyseStyle; public class actEvaluerNomDuStyleHeriteTousLesNodesTrue extends AbstractAction{ { @@ -27,7 +26,7 @@ public class actEvaluerNomDuStyleHeriteTousLesNodesTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); int point = 0; String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point); @@ -37,8 +36,8 @@ public class actEvaluerNomDuStyleHeriteTousLesNodesTrue extends AbstractAction{ point = Integer.valueOf(a); if(point<=0) { nod.getAttributs().put("evalNameNode", String.valueOf(0)); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalNameLegacyStyle=0.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalNameLegacyStyle=0.

"); }else { String pointString = String.valueOf(point); if(nod.getNomElt().equals("page")) { @@ -53,11 +52,11 @@ public class actEvaluerNomDuStyleHeriteTousLesNodesTrue extends AbstractAction{ } } } catch (Exception e2) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } private void ajouteAttribut(node nodePage, String pointString) { diff --git a/src/action/actEvaluerNomDuStyleHeriteTrue.java b/src/analyseWriter/action/actEvaluerNomDuStyleHeriteTrue.java similarity index 86% rename from src/action/actEvaluerNomDuStyleHeriteTrue.java rename to src/analyseWriter/action/actEvaluerNomDuStyleHeriteTrue.java index 9c886ae..02e812d 100644 --- a/src/action/actEvaluerNomDuStyleHeriteTrue.java +++ b/src/analyseWriter/action/actEvaluerNomDuStyleHeriteTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.util.regex.Matcher; @@ -8,10 +8,9 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePointCaseCoche; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.CustomInputDialogSimplePointCaseCoche; +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerNomDuStyleHeriteTrue extends AbstractAction{ @@ -27,7 +26,7 @@ public class actEvaluerNomDuStyleHeriteTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); String nameStyle = ""; String texteInsert =""; @@ -57,7 +56,7 @@ public class actEvaluerNomDuStyleHeriteTrue extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalNameLegacyStyle.

", new ImageIcon(create.class.getResource("/resources/heritagestyle.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvaluerStyleTousLesNodesTrue.java b/src/analyseWriter/action/actEvaluerStyleTousLesNodesTrue.java similarity index 76% rename from src/action/actEvaluerStyleTousLesNodesTrue.java rename to src/analyseWriter/action/actEvaluerStyleTousLesNodesTrue.java index 5819457..53ac5a8 100644 --- a/src/action/actEvaluerStyleTousLesNodesTrue.java +++ b/src/analyseWriter/action/actEvaluerStyleTousLesNodesTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -9,11 +9,10 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesAnalyseStyle; import cXML.node; -import list.listeDesNodesAnalyseStyle; public class actEvaluerStyleTousLesNodesTrue extends AbstractAction{ @@ -25,7 +24,7 @@ public class actEvaluerStyleTousLesNodesTrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(nod.getNomElt().equals("structurepage")) { for(int i = 0 ; i < nod.getNodes().size(); i++) { @@ -36,17 +35,17 @@ public class actEvaluerStyleTousLesNodesTrue extends AbstractAction{ } - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvaluerStyleTouslesNodesFalse.java b/src/analyseWriter/action/actEvaluerStyleTouslesNodesFalse.java similarity index 82% rename from src/action/actEvaluerStyleTouslesNodesFalse.java rename to src/analyseWriter/action/actEvaluerStyleTouslesNodesFalse.java index 4e48d0d..471dfc8 100644 --- a/src/action/actEvaluerStyleTouslesNodesFalse.java +++ b/src/analyseWriter/action/actEvaluerStyleTouslesNodesFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,12 +6,11 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesAnalyseStyle; +import analyseWriter.list.listeNodeFormatageDirectDeWriter; import cXML.node; -import list.listeDesNodesAnalyseStyle; -import list.listeNodeFormatageDirectDeWriter; public class actEvaluerStyleTouslesNodesFalse extends AbstractAction{ @@ -23,7 +22,7 @@ public class actEvaluerStyleTouslesNodesFalse extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(nod.getNomElt().equals("structurepage")) { for(int i = 0 ; i < nod.getNodes().size();i++) { if(nod.getNodes().get(i).getNomElt().equals("page")) { @@ -33,7 +32,7 @@ public class actEvaluerStyleTouslesNodesFalse extends AbstractAction{ } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvaluerStyleTrue.java b/src/analyseWriter/action/actEvaluerStyleTrue.java similarity index 57% rename from src/action/actEvaluerStyleTrue.java rename to src/analyseWriter/action/actEvaluerStyleTrue.java index 8df17d3..8ee91a7 100644 --- a/src/action/actEvaluerStyleTrue.java +++ b/src/analyseWriter/action/actEvaluerStyleTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -9,9 +9,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.CustomInputDialogActivateStyle; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogActivateStyle; +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerStyleTrue extends AbstractAction{ @@ -27,15 +26,15 @@ public class actEvaluerStyleTrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogActivateStyle.showCustominputDialog(nod); - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvaluerTousEnfantsFalse.java b/src/analyseWriter/action/actEvaluerTousEnfantsFalse.java similarity index 76% rename from src/action/actEvaluerTousEnfantsFalse.java rename to src/analyseWriter/action/actEvaluerTousEnfantsFalse.java index f4154ed..07cc7b3 100644 --- a/src/action/actEvaluerTousEnfantsFalse.java +++ b/src/analyseWriter/action/actEvaluerTousEnfantsFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerTousEnfantsFalse extends AbstractAction{ @@ -24,10 +23,10 @@ public class actEvaluerTousEnfantsFalse extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(!nod.getNomElt().equals("fichier")) { nod.evaluerAllChildFalse(); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actEvaluerTousEnfantsTrue.java b/src/analyseWriter/action/actEvaluerTousEnfantsTrue.java similarity index 63% rename from src/action/actEvaluerTousEnfantsTrue.java rename to src/analyseWriter/action/actEvaluerTousEnfantsTrue.java index 4dac6b2..19e6ae0 100644 --- a/src/action/actEvaluerTousEnfantsTrue.java +++ b/src/analyseWriter/action/actEvaluerTousEnfantsTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -9,8 +9,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerTousEnfantsTrue extends AbstractAction{ @@ -27,27 +26,27 @@ public class actEvaluerTousEnfantsTrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(!nod.getNomElt().equals("fichier")) { //Evalue tous les childs et place addmenu=true pour les level=1. nod.evaluerTrue(); nod.evaluerAllChildTrue(); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/actEvaluerTousLesStylesParagraphesFalse.java b/src/analyseWriter/action/actEvaluerTousLesStylesParagraphesFalse.java similarity index 79% rename from src/action/actEvaluerTousLesStylesParagraphesFalse.java rename to src/analyseWriter/action/actEvaluerTousLesStylesParagraphesFalse.java index ef85614..10f2f0c 100644 --- a/src/action/actEvaluerTousLesStylesParagraphesFalse.java +++ b/src/analyseWriter/action/actEvaluerTousLesStylesParagraphesFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -10,9 +10,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerTousLesStylesParagraphesFalse extends AbstractAction{ @@ -28,8 +27,8 @@ public class actEvaluerTousLesStylesParagraphesFalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); boolean retire =false; @@ -59,14 +58,14 @@ public class actEvaluerTousLesStylesParagraphesFalse extends AbstractAction{ } } - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTree().repaint(); + analyseWriter.fenetres.create.getTree().repaint(); } diff --git a/src/action/actEvaluerTousLesStylesParagraphesTrue.java b/src/analyseWriter/action/actEvaluerTousLesStylesParagraphesTrue.java similarity index 77% rename from src/action/actEvaluerTousLesStylesParagraphesTrue.java rename to src/analyseWriter/action/actEvaluerTousLesStylesParagraphesTrue.java index 282291d..096ee7d 100644 --- a/src/action/actEvaluerTousLesStylesParagraphesTrue.java +++ b/src/analyseWriter/action/actEvaluerTousLesStylesParagraphesTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -9,9 +9,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.create; import cXML.node; public class actEvaluerTousLesStylesParagraphesTrue extends AbstractAction{ @@ -27,8 +26,8 @@ public class actEvaluerTousLesStylesParagraphesTrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); for(int i =0 ; i < nod.getNodes().size(); i++) { @@ -49,14 +48,14 @@ public class actEvaluerTousLesStylesParagraphesTrue extends AbstractAction{ } } - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTree().repaint(); + analyseWriter.fenetres.create.getTree().repaint(); } } diff --git a/src/action/actExit.java b/src/analyseWriter/action/actExit.java similarity index 94% rename from src/action/actExit.java rename to src/analyseWriter/action/actExit.java index fe80d69..9e9c633 100644 --- a/src/action/actExit.java +++ b/src/analyseWriter/action/actExit.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.BorderLayout; import java.awt.event.ActionEvent; @@ -14,11 +14,10 @@ import javax.swing.JPanel; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; -import com.analyseWriter.fenetres.baseDonneesEvaluations; -import com.analyseWriter.fenetres.create; -import com.analyseWriter.fenetres.evaluate; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.baseDonneesEvaluations; +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.evaluate; public class actExit extends AbstractAction { diff --git a/src/action/actExpandAll.java b/src/analyseWriter/action/actExpandAll.java similarity index 79% rename from src/action/actExpandAll.java rename to src/analyseWriter/action/actExpandAll.java index 3818378..d441e92 100644 --- a/src/action/actExpandAll.java +++ b/src/analyseWriter/action/actExpandAll.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,7 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.create; public class actExpandAll extends AbstractAction{ @@ -21,7 +21,7 @@ public class actExpandAll extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - com.analyseWriter.fenetres.create.expandAll(); + analyseWriter.fenetres.create.expandAll(); } } diff --git a/src/action/actExpandNode.java b/src/analyseWriter/action/actExpandNode.java similarity index 74% rename from src/action/actExpandNode.java rename to src/analyseWriter/action/actExpandNode.java index fd82db2..42da9e8 100644 --- a/src/action/actExpandNode.java +++ b/src/analyseWriter/action/actExpandNode.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,7 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.create; public class actExpandNode extends AbstractAction{ @@ -21,7 +21,7 @@ public class actExpandNode extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - com.analyseWriter.fenetres.create.expandNode(com.analyseWriter.fenetres.create.getSelectNode()); + analyseWriter.fenetres.create.expandNode(analyseWriter.fenetres.create.getSelectNode()); } } diff --git a/src/action/actInsereInformationFalse.java b/src/analyseWriter/action/actInsereInformationFalse.java similarity index 70% rename from src/action/actInsereInformationFalse.java rename to src/analyseWriter/action/actInsereInformationFalse.java index a21997e..56a3f69 100644 --- a/src/action/actInsereInformationFalse.java +++ b/src/analyseWriter/action/actInsereInformationFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actInsereInformationFalse extends AbstractAction{ @@ -23,9 +22,9 @@ public class actInsereInformationFalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().remove("information"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actInsereInformationMultipleFalse.java b/src/analyseWriter/action/actInsereInformationMultipleFalse.java similarity index 72% rename from src/action/actInsereInformationMultipleFalse.java rename to src/analyseWriter/action/actInsereInformationMultipleFalse.java index f581056..9cab585 100644 --- a/src/action/actInsereInformationMultipleFalse.java +++ b/src/analyseWriter/action/actInsereInformationMultipleFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actInsereInformationMultipleFalse extends AbstractAction{ @@ -23,11 +22,11 @@ public class actInsereInformationMultipleFalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); for(int i = 0 ; i < nod.getNodes().size();i++) { nod.getNodes().get(i).getAttributs().remove("information"); } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actInsereInformationMultipleTrue.java b/src/analyseWriter/action/actInsereInformationMultipleTrue.java similarity index 77% rename from src/action/actInsereInformationMultipleTrue.java rename to src/analyseWriter/action/actInsereInformationMultipleTrue.java index 82aca2b..75c4bd9 100644 --- a/src/action/actInsereInformationMultipleTrue.java +++ b/src/analyseWriter/action/actInsereInformationMultipleTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,10 +6,9 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesInfos; import cXML.node; -import list.listeDesNodesInfos; public class actInsereInformationMultipleTrue extends AbstractAction{ { @@ -24,7 +23,7 @@ public class actInsereInformationMultipleTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); for(int i = 0 ; i < nod.getNodes().size();i++) { if(listeDesNodesInfos.isInfo(nod.getNodes().get(i))) { @@ -36,7 +35,7 @@ public class actInsereInformationMultipleTrue extends AbstractAction{ } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actInsereInformationTrue.java b/src/analyseWriter/action/actInsereInformationTrue.java similarity index 74% rename from src/action/actInsereInformationTrue.java rename to src/analyseWriter/action/actInsereInformationTrue.java index cd30345..63f3be3 100644 --- a/src/action/actInsereInformationTrue.java +++ b/src/analyseWriter/action/actInsereInformationTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,10 +6,9 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; +import analyseWriter.list.listeDesNodesInfos; import cXML.node; -import list.listeDesNodesInfos; public class actInsereInformationTrue extends AbstractAction{ { @@ -24,14 +23,14 @@ public class actInsereInformationTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(listeDesNodesInfos.isInfo(nod)) { String content = nod.retourneLesContenusEnfants(""); if(!content.isEmpty()) if(content.replaceAll(" ", "").length()==0) content=content.replaceAll(" ", ""); if(content.length()>300) content = content.substring(0, 299); content = nod.getNomElt() + " : " + content; nod.getAttributs().put("information", content); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actLicence.java b/src/analyseWriter/action/actLicence.java similarity index 92% rename from src/action/actLicence.java rename to src/analyseWriter/action/actLicence.java index ffa4cd0..fb755a6 100644 --- a/src/action/actLicence.java +++ b/src/analyseWriter/action/actLicence.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.io.IOException; diff --git a/src/action/actNameNodeEnfantsNon.java b/src/analyseWriter/action/actNameNodeEnfantsNon.java similarity index 75% rename from src/action/actNameNodeEnfantsNon.java rename to src/analyseWriter/action/actNameNodeEnfantsNon.java index bc0b664..86ef8f1 100644 --- a/src/action/actNameNodeEnfantsNon.java +++ b/src/analyseWriter/action/actNameNodeEnfantsNon.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actNameNodeEnfantsNon extends AbstractAction{ @@ -23,10 +22,10 @@ public class actNameNodeEnfantsNon extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); for(int i = 0 ; i < nod.getNodes().size();i++) { nod.getNodes().get(i).supprimeAttribut("evalNameNode"); } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actNameNodeEnfantsOui.java b/src/analyseWriter/action/actNameNodeEnfantsOui.java similarity index 59% rename from src/action/actNameNodeEnfantsOui.java rename to src/analyseWriter/action/actNameNodeEnfantsOui.java index e231cb3..cad1885 100644 --- a/src/action/actNameNodeEnfantsOui.java +++ b/src/analyseWriter/action/actNameNodeEnfantsOui.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -7,9 +7,8 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import com.analyseWriter.fenetres.baliseStyle; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.baliseStyle; +import analyseWriter.fenetres.create; import cXML.node; public class actNameNodeEnfantsOui extends AbstractAction{ @@ -25,7 +24,7 @@ public class actNameNodeEnfantsOui extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); int point = 0; if(nod.getAttributs().get("evalNameNode")!=null) { point = Integer.valueOf(nod.getAttributs().get("evalNameNode")); @@ -40,19 +39,19 @@ public class actNameNodeEnfantsOui extends AbstractAction{ for(int i = 0 ; i < nod.getNodes().size();i++) { nod.getNodes().get(i).getAttributs().put("evalNameNode", String.valueOf(0)); } - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalNameNode=0.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalNameNode=0.

"); }else { for(int i = 0 ; i < nod.getNodes().size();i++) { nod.getNodes().get(i).getAttributs().put("evalNameNode", String.valueOf(point)); } } } catch (Exception e2) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(baliseStyle.balise()); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.

"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actNewFichierAnalyse.java b/src/analyseWriter/action/actNewFichierAnalyse.java similarity index 90% rename from src/action/actNewFichierAnalyse.java rename to src/analyseWriter/action/actNewFichierAnalyse.java index 99b9b4a..5c53e58 100644 --- a/src/action/actNewFichierAnalyse.java +++ b/src/analyseWriter/action/actNewFichierAnalyse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.Component; import java.awt.HeadlessException; @@ -24,12 +24,11 @@ import javax.xml.parsers.ParserConfigurationException; import org.xml.sax.SAXException; -import com.analyseWriter.fenetres.evaluate; - -import MEPTL.commandes; -import MEPTL.ecritureSujet; -import MEPTL.meptl; -import MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.ecritureSujet; +import analyseWriter.MEPTL.meptl; +import analyseWriter.MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.fenetres.evaluate; import cXML.Run; import cXML.node; @@ -133,12 +132,12 @@ public class actNewFichierAnalyse extends AbstractAction{ commandes.initialiseParametresEvaluation(); commandes.initialiseParametresSettingProprietes(); - com.analyseWriter.fenetres.create.getTree().setVisible(true); - com.analyseWriter.fenetres.create.constructionTree(); - com.analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); + analyseWriter.fenetres.create.getTree().setVisible(true); + analyseWriter.fenetres.create.constructionTree(); + analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); }else { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("

Le fichier n'est pas valide

"); + analyseWriter.fenetres.create.getTextNodeSelect().setText("

Le fichier n'est pas valide

"); } } catch (ParserConfigurationException | SAXException | IOException | CloneNotSupportedException e1) { @@ -146,7 +145,7 @@ public class actNewFichierAnalyse extends AbstractAction{ } } else { - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(null); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(null); } diff --git a/src/action/actNodeFichier.java b/src/analyseWriter/action/actNodeFichier.java similarity index 83% rename from src/action/actNodeFichier.java rename to src/analyseWriter/action/actNodeFichier.java index 2cc22a8..d682533 100644 --- a/src/action/actNodeFichier.java +++ b/src/analyseWriter/action/actNodeFichier.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; -import com.analyseWriter.fenetres.proprieteFichierAnalyse; +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.proprieteFichierAnalyse; public class actNodeFichier extends AbstractAction{ diff --git a/src/action/actOpen.java b/src/analyseWriter/action/actOpen.java similarity index 60% rename from src/action/actOpen.java rename to src/analyseWriter/action/actOpen.java index b4a040b..936f04e 100644 --- a/src/action/actOpen.java +++ b/src/analyseWriter/action/actOpen.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; @@ -9,10 +9,9 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.KeyStroke; -import com.analyseWriter.fenetres.ChargeFichierXML; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.ChargeFichierXML; +import analyseWriter.fenetres.create; public class actOpen extends AbstractAction{ @@ -31,15 +30,15 @@ public class actOpen extends AbstractAction{ public void actionPerformed(ActionEvent e) { new ChargeFichierXML(); if(commandes.fichierAnalyseValide) { - com.analyseWriter.fenetres.create.getTree().setVisible(true); - com.analyseWriter.fenetres.create.constructionTree(); - com.analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); + analyseWriter.fenetres.create.getTree().setVisible(true); + analyseWriter.fenetres.create.constructionTree(); + analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); // fenetres.create.getTglbtnTousLesNodes().setSelected(false); - com.analyseWriter.fenetres.create.getButtonEvaluate().setEnabled(true); + analyseWriter.fenetres.create.getButtonEvaluate().setEnabled(true); }else { // fenetres.create.constructionTree(); - com.analyseWriter.fenetres.create.getTextNodeSelect().setContentType("text/plain"); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText(commandes.message.toString()); + analyseWriter.fenetres.create.getTextNodeSelect().setContentType("text/plain"); + analyseWriter.fenetres.create.getTextNodeSelect().setText(commandes.message.toString()); } } diff --git a/src/action/actOpenBaseEvaluation.java b/src/analyseWriter/action/actOpenBaseEvaluation.java similarity index 73% rename from src/action/actOpenBaseEvaluation.java rename to src/analyseWriter/action/actOpenBaseEvaluation.java index c241a84..6ef22e6 100644 --- a/src/action/actOpenBaseEvaluation.java +++ b/src/analyseWriter/action/actOpenBaseEvaluation.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.text.ParseException; @@ -7,11 +7,10 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.baseDonneesEvaluations; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; -import baseEvaluations.recupeNodeBaseEvaluations; +import analyseWriter.MEPTL.commandes; +import analyseWriter.baseEvaluations.recupeNodeBaseEvaluations; +import analyseWriter.fenetres.baseDonneesEvaluations; +import analyseWriter.fenetres.create; import cXML.node; public class actOpenBaseEvaluation extends AbstractAction{ @@ -41,7 +40,7 @@ public class actOpenBaseEvaluation extends AbstractAction{ commandes.evaluationsBase = new node(); commandes.evaluationsBase.setNomElt("evaluations"); try { - commandes.evaluationsBase.getAttributs().put("date", calcul.formatDateWriter.dateTodayLibreOffice()); + commandes.evaluationsBase.getAttributs().put("date", analyseWriter.calcul.formatDateWriter.dateTodayLibreOffice()); } catch (ParseException e) { e.printStackTrace(); } diff --git a/src/action/actOpenBaseListesEtudiants.java b/src/analyseWriter/action/actOpenBaseListesEtudiants.java similarity index 82% rename from src/action/actOpenBaseListesEtudiants.java rename to src/analyseWriter/action/actOpenBaseListesEtudiants.java index 2c264ac..ecad91e 100644 --- a/src/action/actOpenBaseListesEtudiants.java +++ b/src/analyseWriter/action/actOpenBaseListesEtudiants.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,11 +6,10 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.baseDonneesListesEtudiants; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; -import baseListesEtudiants.recupeNodeBaseListesEtudiants; +import analyseWriter.MEPTL.commandes; +import analyseWriter.baseListesEtudiants.recupeNodeBaseListesEtudiants; +import analyseWriter.fenetres.baseDonneesListesEtudiants; +import analyseWriter.fenetres.create; public class actOpenBaseListesEtudiants extends AbstractAction{ diff --git a/src/action/actOu.java b/src/analyseWriter/action/actOu.java similarity index 64% rename from src/action/actOu.java rename to src/analyseWriter/action/actOu.java index 623654c..2c39be3 100644 --- a/src/action/actOu.java +++ b/src/analyseWriter/action/actOu.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -23,10 +23,10 @@ public class actOu extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { // TODO Auto-generated method stub - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); - DefaultMutableTreeNode nodMu = com.analyseWriter.fenetres.create.getSelectNode(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); + DefaultMutableTreeNode nodMu = analyseWriter.fenetres.create.getSelectNode(); node nodeOu = new node(); nodeOu.setNomElt("OU"); @@ -39,12 +39,12 @@ public class actOu extends AbstractAction{ DefaultMutableTreeNode node1 = new DefaultMutableTreeNode(nodeOu); nodMu.add(node1); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); } diff --git a/src/action/actPaste.java b/src/analyseWriter/action/actPaste.java similarity index 85% rename from src/action/actPaste.java rename to src/analyseWriter/action/actPaste.java index 243416e..ce80174 100644 --- a/src/action/actPaste.java +++ b/src/analyseWriter/action/actPaste.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; @@ -18,7 +18,7 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; @@ -47,10 +47,10 @@ public class actPaste extends AbstractAction{ node nodCopy = new node(paste); if(!nodCopy.getNomElt().isEmpty()) { - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); - DefaultMutableTreeNode nodeMu = com.analyseWriter.fenetres.create.getSelectNode(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); + DefaultMutableTreeNode nodeMu = analyseWriter.fenetres.create.getSelectNode(); MiseInformationDansLeNodeCopierColler(nodCopy,nod); nod.getNodes().add(nodCopy); @@ -64,12 +64,12 @@ public class actPaste extends AbstractAction{ nodeMu = addNodeMutable(nodCopy,node1); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); }else { JOptionPane.showMessageDialog(null, "Le collage n'est pas réalisé."); diff --git a/src/action/actPathBaseEvaluations.java b/src/analyseWriter/action/actPathBaseEvaluations.java similarity index 79% rename from src/action/actPathBaseEvaluations.java rename to src/analyseWriter/action/actPathBaseEvaluations.java index 7b5a64a0..b6fcc16 100644 --- a/src/action/actPathBaseEvaluations.java +++ b/src/analyseWriter/action/actPathBaseEvaluations.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -7,9 +7,9 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.ChargePathBaseEvaluation; -import com.analyseWriter.fenetres.baseDonneesEvaluations; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.ChargePathBaseEvaluation; +import analyseWriter.fenetres.baseDonneesEvaluations; +import analyseWriter.fenetres.create; public class actPathBaseEvaluations extends AbstractAction{ { diff --git a/src/action/actRechercheAnchorPageNumberFalse.java b/src/analyseWriter/action/actRechercheAnchorPageNumberFalse.java similarity index 72% rename from src/action/actRechercheAnchorPageNumberFalse.java rename to src/analyseWriter/action/actRechercheAnchorPageNumberFalse.java index 891b018..0ffb410 100644 --- a/src/action/actRechercheAnchorPageNumberFalse.java +++ b/src/analyseWriter/action/actRechercheAnchorPageNumberFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actRechercheAnchorPageNumberFalse extends AbstractAction{ @@ -23,9 +22,9 @@ public class actRechercheAnchorPageNumberFalse extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("recherche_anchor-page-number", "false"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actRechercheAnchorPageNumberTrue.java b/src/analyseWriter/action/actRechercheAnchorPageNumberTrue.java similarity index 73% rename from src/action/actRechercheAnchorPageNumberTrue.java rename to src/analyseWriter/action/actRechercheAnchorPageNumberTrue.java index 9eb3f1d..71171e3 100644 --- a/src/action/actRechercheAnchorPageNumberTrue.java +++ b/src/analyseWriter/action/actRechercheAnchorPageNumberTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actRechercheAnchorPageNumberTrue extends AbstractAction{ @@ -23,9 +22,9 @@ public class actRechercheAnchorPageNumberTrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("recherche_anchor-page-number", "true"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actRechercheContenuPlusProcheVoisinfalse.java b/src/analyseWriter/action/actRechercheContenuPlusProcheVoisinfalse.java similarity index 73% rename from src/action/actRechercheContenuPlusProcheVoisinfalse.java rename to src/analyseWriter/action/actRechercheContenuPlusProcheVoisinfalse.java index 43ec1f4..3761d7e 100644 --- a/src/action/actRechercheContenuPlusProcheVoisinfalse.java +++ b/src/analyseWriter/action/actRechercheContenuPlusProcheVoisinfalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actRechercheContenuPlusProcheVoisinfalse extends AbstractAction{ @@ -23,9 +22,9 @@ public class actRechercheContenuPlusProcheVoisinfalse extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("recherche_contenu_plus_proche_voisin", "false"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actRechercheContenuPlusProcheVoisintrue.java b/src/analyseWriter/action/actRechercheContenuPlusProcheVoisintrue.java similarity index 72% rename from src/action/actRechercheContenuPlusProcheVoisintrue.java rename to src/analyseWriter/action/actRechercheContenuPlusProcheVoisintrue.java index d87dd50..19a5e2f 100644 --- a/src/action/actRechercheContenuPlusProcheVoisintrue.java +++ b/src/analyseWriter/action/actRechercheContenuPlusProcheVoisintrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actRechercheContenuPlusProcheVoisintrue extends AbstractAction{ @@ -23,9 +22,9 @@ public class actRechercheContenuPlusProcheVoisintrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("recherche_contenu_plus_proche_voisin", "true"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actRechercheContenufalse.java b/src/analyseWriter/action/actRechercheContenufalse.java similarity index 72% rename from src/action/actRechercheContenufalse.java rename to src/analyseWriter/action/actRechercheContenufalse.java index 702c694..ab8687e 100644 --- a/src/action/actRechercheContenufalse.java +++ b/src/analyseWriter/action/actRechercheContenufalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actRechercheContenufalse extends AbstractAction{ @@ -23,9 +22,9 @@ public class actRechercheContenufalse extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("recherche_contenu_exact", "false"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actRechercheContenutrue.java b/src/analyseWriter/action/actRechercheContenutrue.java similarity index 73% rename from src/action/actRechercheContenutrue.java rename to src/analyseWriter/action/actRechercheContenutrue.java index d022021..1290560 100644 --- a/src/action/actRechercheContenutrue.java +++ b/src/analyseWriter/action/actRechercheContenutrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actRechercheContenutrue extends AbstractAction{ @@ -23,9 +22,9 @@ public class actRechercheContenutrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("recherche_contenu_exact", "true"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actRechercheIndexfalse.java b/src/analyseWriter/action/actRechercheIndexfalse.java similarity index 73% rename from src/action/actRechercheIndexfalse.java rename to src/analyseWriter/action/actRechercheIndexfalse.java index 54ee421..1aeae42 100644 --- a/src/action/actRechercheIndexfalse.java +++ b/src/analyseWriter/action/actRechercheIndexfalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actRechercheIndexfalse extends AbstractAction{ @@ -23,9 +22,9 @@ public class actRechercheIndexfalse extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("recherche_index", "false"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actRechercheIndextrue.java b/src/analyseWriter/action/actRechercheIndextrue.java similarity index 72% rename from src/action/actRechercheIndextrue.java rename to src/analyseWriter/action/actRechercheIndextrue.java index c29d063..20a517a 100644 --- a/src/action/actRechercheIndextrue.java +++ b/src/analyseWriter/action/actRechercheIndextrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actRechercheIndextrue extends AbstractAction{ @@ -23,9 +22,9 @@ public class actRechercheIndextrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("recherche_index", "true"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actSaveAs.java b/src/analyseWriter/action/actSaveAs.java similarity index 80% rename from src/action/actSaveAs.java rename to src/analyseWriter/action/actSaveAs.java index 7a60d63..47b8d89 100644 --- a/src/action/actSaveAs.java +++ b/src/analyseWriter/action/actSaveAs.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -13,8 +13,8 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JFileChooser; -import MEPTL.commandes; -import MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.verificationFichierAnalyse_node_commandesSujet; import cXML.Run; public class actSaveAs extends AbstractAction{ @@ -53,7 +53,7 @@ public class actSaveAs extends AbstractAction{ verificationFichierAnalyse_node_commandesSujet.MiseAJourHashNomFichierAnalyse(fileToSave.getName()); //Mise à jour de la date d'enregistrement du fichier d'analyse try { - commandes.sujet.getAttributs().put("date", calcul.formatDateWriter.dateTodayLibreOffice()); + commandes.sujet.getAttributs().put("date", analyseWriter.calcul.formatDateWriter.dateTodayLibreOffice()); } catch (ParseException e1) { e1.printStackTrace(); } @@ -78,10 +78,10 @@ public class actSaveAs extends AbstractAction{ if(m.find()) { file = new File(commandes.PathFilenameAnalysis + "\\" + commandes.nameSujet); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + " a été renregistré.\n\nIl se trouve dans le dossier " + commandes.PathFilenameAnalysis); + analyseWriter.fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + " a été renregistré.\n\nIl se trouve dans le dossier " + commandes.PathFilenameAnalysis); }else { file = new File(commandes.PathFilenameAnalysis + "\\" + commandes.nameSujet + ".xml"); - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + ".xml\" a été renregistré.\n\nIl se trouve dans le dossier " + commandes.PathFilenameAnalysis); + analyseWriter.fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + ".xml\" a été renregistré.\n\nIl se trouve dans le dossier " + commandes.PathFilenameAnalysis); } diff --git a/src/action/actSaveEvaluation.java b/src/analyseWriter/action/actSaveEvaluation.java similarity index 86% rename from src/action/actSaveEvaluation.java rename to src/analyseWriter/action/actSaveEvaluation.java index 9397ff0..c152186 100644 --- a/src/action/actSaveEvaluation.java +++ b/src/analyseWriter/action/actSaveEvaluation.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -7,9 +7,10 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; import javax.swing.KeyStroke; -import MEPTL.commandes; -import baseEvaluations.creerNouvelleEvaluation; -import baseEvaluations.recupeNodeBaseEvaluations; + +import analyseWriter.MEPTL.commandes; +import analyseWriter.baseEvaluations.creerNouvelleEvaluation; +import analyseWriter.baseEvaluations.recupeNodeBaseEvaluations; import cXML.node; diff --git a/src/action/actSaveFileAnalysis.java b/src/analyseWriter/action/actSaveFileAnalysis.java similarity index 78% rename from src/action/actSaveFileAnalysis.java rename to src/analyseWriter/action/actSaveFileAnalysis.java index 57fc39b..7b85b6b 100644 --- a/src/action/actSaveFileAnalysis.java +++ b/src/analyseWriter/action/actSaveFileAnalysis.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.io.IOException; @@ -11,8 +11,8 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import MEPTL.commandes; -import MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.verificationFichierAnalyse_node_commandesSujet; import cXML.Run; public class actSaveFileAnalysis extends AbstractAction{ @@ -49,7 +49,7 @@ public class actSaveFileAnalysis extends AbstractAction{ verificationFichierAnalyse_node_commandesSujet.MiseAJourHashNomFichierAnalyse(commandes.nameSujet); //Mise à jour de la date d'enregistrement du fichier d'analyse try { - commandes.sujet.getAttributs().put("date", calcul.formatDateWriter.dateTodayLibreOffice()); + commandes.sujet.getAttributs().put("date", analyseWriter.calcul.formatDateWriter.dateTodayLibreOffice()); } catch (ParseException e1) { e1.printStackTrace(); } @@ -57,10 +57,10 @@ public class actSaveFileAnalysis extends AbstractAction{ Run.ecritureNodeEnXML(commandes.sujet, commandes.nameSujet,commandes.PathFilenameAnalysis,Run.TypeFile.Sujet); if(m.find()) { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + " a été réenregistré.\n\n" + analyseWriter.fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + " a été réenregistré.\n\n" + "Il se trouve dans le dossier " + commandes.PathFilenameAnalysis); }else { - com.analyseWriter.fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + ".xml\" a été réenregistré.\n\n" + analyseWriter.fenetres.create.getTextNodeSelect().setText("Le fichier \"" + commandes.nameSujet + ".xml\" a été réenregistré.\n\n" + "Il se trouve dans le dossier " + commandes.PathFilenameAnalysis); } diff --git a/src/action/actSetting.java b/src/analyseWriter/action/actSetting.java similarity index 83% rename from src/action/actSetting.java rename to src/analyseWriter/action/actSetting.java index 8080b01..cb83aac 100644 --- a/src/action/actSetting.java +++ b/src/analyseWriter/action/actSetting.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; -import com.analyseWriter.fenetres.setting; +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.setting; public class actSetting extends AbstractAction{ diff --git a/src/action/actSupprimeTitre.java b/src/analyseWriter/action/actSupprimeTitre.java similarity index 77% rename from src/action/actSupprimeTitre.java rename to src/analyseWriter/action/actSupprimeTitre.java index 41c47b7..704a21a 100644 --- a/src/action/actSupprimeTitre.java +++ b/src/analyseWriter/action/actSupprimeTitre.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -19,7 +19,7 @@ public class actSupprimeTitre extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(nod.getAttributs().get("titre")!=null) { nod.supprimeAttribut("titre"); } @@ -32,7 +32,7 @@ public class actSupprimeTitre extends AbstractAction{ if(nod.getAttributs().get("titre3")!=null) { nod.supprimeAttribut("titre3"); } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actTitre1.java b/src/analyseWriter/action/actTitre1.java similarity index 84% rename from src/action/actTitre1.java rename to src/analyseWriter/action/actTitre1.java index 04faf84..35a655a 100644 --- a/src/action/actTitre1.java +++ b/src/analyseWriter/action/actTitre1.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -27,7 +27,7 @@ public class actTitre1 extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); String titre = ""; if(nod.getAttributs().get("titre1")!=null) { titre = nod.getAttributs().get("titre1"); @@ -44,7 +44,7 @@ public class actTitre1 extends AbstractAction{ int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 1 ", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { nod.titre1(titreField.getText()); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actTitre2.java b/src/analyseWriter/action/actTitre2.java similarity index 85% rename from src/action/actTitre2.java rename to src/analyseWriter/action/actTitre2.java index 47c186b..9c28789 100644 --- a/src/action/actTitre2.java +++ b/src/analyseWriter/action/actTitre2.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -27,7 +27,7 @@ public class actTitre2 extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); String titre = ""; if(nod.getAttributs().get("titre2")!=null) { titre = nod.getAttributs().get("titre2"); @@ -45,7 +45,7 @@ public class actTitre2 extends AbstractAction{ int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 2 ", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { nod.titre2(xField.getText()); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } // // diff --git a/src/action/actTitre3.java b/src/analyseWriter/action/actTitre3.java similarity index 85% rename from src/action/actTitre3.java rename to src/analyseWriter/action/actTitre3.java index b113807..5d2585d 100644 --- a/src/action/actTitre3.java +++ b/src/analyseWriter/action/actTitre3.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -28,7 +28,7 @@ public class actTitre3 extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); String titre = ""; if(nod.getAttributs().get("titre3")!=null) { titre = nod.getAttributs().get("titre3"); @@ -46,7 +46,7 @@ public class actTitre3 extends AbstractAction{ int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 3 ", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { nod.titre3(xField.getText()); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } // String a = JOptionPane.showInputDialog(null,"Quel est le titre?",titre); diff --git a/src/action/actTitrePrincipal.java b/src/analyseWriter/action/actTitrePrincipal.java similarity index 84% rename from src/action/actTitrePrincipal.java rename to src/analyseWriter/action/actTitrePrincipal.java index 3920a3e..f55623f 100644 --- a/src/action/actTitrePrincipal.java +++ b/src/analyseWriter/action/actTitrePrincipal.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -27,7 +27,7 @@ public class actTitrePrincipal extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); String titre = ""; if(nod.getAttributs().get("titre")!=null) { titre = nod.getAttributs().get("titre"); @@ -44,7 +44,7 @@ public class actTitrePrincipal extends AbstractAction{ int result = JOptionPane.showConfirmDialog(null,myPanel,"Saisissez votre titre principal", JOptionPane.OK_CANCEL_OPTION); if (result == JOptionPane.OK_OPTION) { nod.titre(xField.getText()); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actTotalPoint.java b/src/analyseWriter/action/actTotalPoint.java similarity index 69% rename from src/action/actTotalPoint.java rename to src/analyseWriter/action/actTotalPoint.java index 3c64230..668ff8a 100644 --- a/src/action/actTotalPoint.java +++ b/src/analyseWriter/action/actTotalPoint.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - -import calcul.calculNombrePointEvaluation; +import analyseWriter.calcul.calculNombrePointEvaluation; +import analyseWriter.fenetres.create; public class actTotalPoint extends AbstractAction{ @@ -24,7 +23,7 @@ public class actTotalPoint extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - com.analyseWriter.fenetres.create.getTextNodeSelect().afficheListeDesPointsDansToutExercice(calculNombrePointEvaluation.calculPointDansToutExercice()); + analyseWriter.fenetres.create.getTextNodeSelect().afficheListeDesPointsDansToutExercice(calculNombrePointEvaluation.calculPointDansToutExercice()); } } diff --git a/src/action/actTotalPointNode.java b/src/analyseWriter/action/actTotalPointNode.java similarity index 65% rename from src/action/actTotalPointNode.java rename to src/analyseWriter/action/actTotalPointNode.java index 2c39ec3..5b2957c 100644 --- a/src/action/actTotalPointNode.java +++ b/src/analyseWriter/action/actTotalPointNode.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,10 +6,9 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.calcul.calculNombrePointEvaluation; +import analyseWriter.fenetres.create; import cXML.node; -import calcul.calculNombrePointEvaluation; public class actTotalPointNode extends AbstractAction{ @@ -25,8 +24,8 @@ public class actTotalPointNode extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); - com.analyseWriter.fenetres.create.getTextNodeSelect().AfficheTotalPoint(nod,calculNombrePointEvaluation.calculNombreDepoint(nod,0)); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); + analyseWriter.fenetres.create.getTextNodeSelect().AfficheTotalPoint(nod,calculNombrePointEvaluation.calculNombreDepoint(nod,0)); } } diff --git a/src/action/actTousLesNodesEvaluer2.java b/src/analyseWriter/action/actTousLesNodesEvaluer2.java similarity index 94% rename from src/action/actTousLesNodesEvaluer2.java rename to src/analyseWriter/action/actTousLesNodesEvaluer2.java index 3a10577..0a230e3 100644 --- a/src/action/actTousLesNodesEvaluer2.java +++ b/src/analyseWriter/action/actTousLesNodesEvaluer2.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,7 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.create; public class actTousLesNodesEvaluer2 extends AbstractAction{ diff --git a/src/action/actTutoriels.java b/src/analyseWriter/action/actTutoriels.java similarity index 89% rename from src/action/actTutoriels.java rename to src/analyseWriter/action/actTutoriels.java index 33ba3f9..7caa3b8 100644 --- a/src/action/actTutoriels.java +++ b/src/analyseWriter/action/actTutoriels.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -7,7 +7,7 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.create; public class actTutoriels extends AbstractAction { diff --git a/src/action/actUpNode.java b/src/analyseWriter/action/actUpNode.java similarity index 70% rename from src/action/actUpNode.java rename to src/analyseWriter/action/actUpNode.java index 656a309..d7304bb 100644 --- a/src/action/actUpNode.java +++ b/src/analyseWriter/action/actUpNode.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -12,9 +12,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import com.analyseWriter.fenetres.create; - -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.fenetres.create; import cXML.node; public class actUpNode extends AbstractAction{ @@ -31,10 +30,10 @@ public class actUpNode extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - if(com.analyseWriter.fenetres.create.getTree().getSelectionPath()!=null) { + if(analyseWriter.fenetres.create.getTree().getSelectionPath()!=null) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); - DefaultMutableTreeNode selectNode = com.analyseWriter.fenetres.create.getSelectNode(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); + DefaultMutableTreeNode selectNode = analyseWriter.fenetres.create.getSelectNode(); DefaultMutableTreeNode selectParentNode = (DefaultMutableTreeNode) selectNode.getParent(); int selectedNodeIndex = selectNode.getParent().getIndex(selectNode); @@ -42,12 +41,12 @@ public class actUpNode extends AbstractAction{ if(!nod.chemin().contains("setting")) { - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); if(selectedNodeIndex>0) { nod.getParent().upNodeEnfant(nod); - DefaultTreeModel treeModel = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + DefaultTreeModel treeModel = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); treeModel.insertNodeInto(selectNode, selectParentNode, selectedNodeIndex-1); String nameNode = nod.getNomElt(); @@ -57,11 +56,11 @@ public class actUpNode extends AbstractAction{ } DefaultMutableTreeNode root = (DefaultMutableTreeNode) treeModel.getRoot(); - com.analyseWriter.fenetres.create.setTree(treeModel); + analyseWriter.fenetres.create.setTree(treeModel); treeModel.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); } }else { JOptionPane.showMessageDialog(null,"Vous ne devez pas déplacer ce node !", "Oh non!!!", JOptionPane.INFORMATION_MESSAGE); diff --git a/src/action/actevalNameCreator.java b/src/analyseWriter/action/actevalNameCreator.java similarity index 77% rename from src/action/actevalNameCreator.java rename to src/analyseWriter/action/actevalNameCreator.java index cbfe7f4..47148b4 100644 --- a/src/action/actevalNameCreator.java +++ b/src/analyseWriter/action/actevalNameCreator.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,9 +6,8 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.CustomInputDialogSimplePoint; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.CustomInputDialogSimplePoint; +import analyseWriter.fenetres.create; import cXML.node; public class actevalNameCreator extends AbstractAction{ @@ -24,7 +23,7 @@ public class actevalNameCreator extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); CustomInputDialogSimplePoint.showCustominputDialog(nod,"evalNameCreator", "

Si ce node contient le prénom et nom du dernier auteur
" + "(auteur des modifications), alors l'étudiant obtiendra
" @@ -32,6 +31,6 @@ public class actevalNameCreator extends AbstractAction{ + "

Cliquez sur le bouton supprimer pour retirer la méthode
" + "d'évaluation evalNameCreator

", new ImageIcon(create.class.getResource("/resources/auteurediteur.png"))); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actmarquenodefalse.java b/src/analyseWriter/action/actmarquenodefalse.java similarity index 72% rename from src/action/actmarquenodefalse.java rename to src/analyseWriter/action/actmarquenodefalse.java index d14cd0a..d6f0586 100644 --- a/src/action/actmarquenodefalse.java +++ b/src/analyseWriter/action/actmarquenodefalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actmarquenodefalse extends AbstractAction{ @@ -23,11 +22,11 @@ public class actmarquenodefalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); for(int i = 0 ; i < nod.getNodes().size();i++) { nod.getNodes().get(i).getAttributs().remove("marquenode"); } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actmarquenodetrue.java b/src/analyseWriter/action/actmarquenodetrue.java similarity index 74% rename from src/action/actmarquenodetrue.java rename to src/analyseWriter/action/actmarquenodetrue.java index 74fb526..456449b 100644 --- a/src/action/actmarquenodetrue.java +++ b/src/analyseWriter/action/actmarquenodetrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actmarquenodetrue extends AbstractAction{ @@ -23,12 +22,12 @@ public class actmarquenodetrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); for(int i = 0 ; i < nod.getNodes().size();i++) { nod.getNodes().get(i).getAttributs().put("saut", "true"); nod.getNodes().get(i).getAttributs().put("marquenode", "** node ** " + nod.getNodes().get(i).getNomElt() ); } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actsautfalse.java b/src/analyseWriter/action/actsautfalse.java similarity index 69% rename from src/action/actsautfalse.java rename to src/analyseWriter/action/actsautfalse.java index 8f21315..f54af48 100644 --- a/src/action/actsautfalse.java +++ b/src/analyseWriter/action/actsautfalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actsautfalse extends AbstractAction{ @@ -23,9 +22,9 @@ public class actsautfalse extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("saut", "false"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actsautmultiplefalse.java b/src/analyseWriter/action/actsautmultiplefalse.java similarity index 79% rename from src/action/actsautmultiplefalse.java rename to src/analyseWriter/action/actsautmultiplefalse.java index 569ddb1..bb02fe2 100644 --- a/src/action/actsautmultiplefalse.java +++ b/src/analyseWriter/action/actsautmultiplefalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -7,8 +7,7 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actsautmultiplefalse extends AbstractAction{ @@ -24,7 +23,7 @@ public class actsautmultiplefalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); boolean informations = false; if(JOptionPane.showConfirmDialog(null,"Voulez-vous retirer les informations sur le node (contenu du node)?", "Information", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) { informations=true; @@ -33,7 +32,7 @@ public class actsautmultiplefalse extends AbstractAction{ nod.getNodes().get(i).getAttributs().put("saut", "false"); if(informations)nod.getNodes().get(i).getAttributs().remove("information"); } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actsautmultipletrue.java b/src/analyseWriter/action/actsautmultipletrue.java similarity index 86% rename from src/action/actsautmultipletrue.java rename to src/analyseWriter/action/actsautmultipletrue.java index 1b5c4cf..90c6ea4 100644 --- a/src/action/actsautmultipletrue.java +++ b/src/analyseWriter/action/actsautmultipletrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -7,8 +7,7 @@ import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actsautmultipletrue extends AbstractAction{ @@ -24,7 +23,7 @@ public class actsautmultipletrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); boolean informations = false; if(JOptionPane.showConfirmDialog(null,"Voulez-vous placer l'information du node juste après le saut?", "Information", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) { informations=true; @@ -51,7 +50,7 @@ public class actsautmultipletrue extends AbstractAction{ nod.getAttributs().put("information", content); } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/actsauttrue.java b/src/analyseWriter/action/actsauttrue.java similarity index 69% rename from src/action/actsauttrue.java rename to src/analyseWriter/action/actsauttrue.java index 49d050f..f9bb6fc 100644 --- a/src/action/actsauttrue.java +++ b/src/analyseWriter/action/actsauttrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class actsauttrue extends AbstractAction{ @@ -23,9 +22,9 @@ public class actsauttrue extends AbstractAction{ } @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); nod.getAttributs().put("saut", "true"); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } } diff --git a/src/action/addTitreToutesLesPagesFalse.java b/src/analyseWriter/action/addTitreToutesLesPagesFalse.java similarity index 78% rename from src/action/addTitreToutesLesPagesFalse.java rename to src/analyseWriter/action/addTitreToutesLesPagesFalse.java index a6847c1..1611fe9 100644 --- a/src/action/addTitreToutesLesPagesFalse.java +++ b/src/analyseWriter/action/addTitreToutesLesPagesFalse.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class addTitreToutesLesPagesFalse extends AbstractAction{ @@ -23,7 +22,7 @@ public class addTitreToutesLesPagesFalse extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { -node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); +node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(nod.getNomElt().equals("structurepage")) { for(int i = 0 ; i< nod.getNodes().size();i++) { @@ -33,7 +32,7 @@ node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObjec nod.getNodes().get(i).getAttributs().remove("titre1"); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/action/addTitreToutesLesPagesTrue.java b/src/analyseWriter/action/addTitreToutesLesPagesTrue.java similarity index 78% rename from src/action/addTitreToutesLesPagesTrue.java rename to src/analyseWriter/action/addTitreToutesLesPagesTrue.java index db6ab25..a935f10 100644 --- a/src/action/addTitreToutesLesPagesTrue.java +++ b/src/analyseWriter/action/addTitreToutesLesPagesTrue.java @@ -1,4 +1,4 @@ -package action; +package analyseWriter.action; import java.awt.event.ActionEvent; @@ -6,8 +6,7 @@ import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ImageIcon; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; import cXML.node; public class addTitreToutesLesPagesTrue extends AbstractAction{ @@ -23,7 +22,7 @@ public class addTitreToutesLesPagesTrue extends AbstractAction{ @Override public void actionPerformed(ActionEvent e) { - node nod = (node) com.analyseWriter.fenetres.create.getSelectNode().getUserObject(); + node nod = (node) analyseWriter.fenetres.create.getSelectNode().getUserObject(); if(nod.getNomElt().equals("structurepage")) { for(int i = 0 ; i< nod.getNodes().size();i++) { @@ -33,7 +32,7 @@ public class addTitreToutesLesPagesTrue extends AbstractAction{ nod.getNodes().get(i).getAttributs().put("titre1", "page" + String.valueOf(i+1)); } } - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); } diff --git a/src/baseEvaluations/CreerBaseParDefautEvaluation.java b/src/analyseWriter/baseEvaluations/CreerBaseParDefautEvaluation.java similarity index 84% rename from src/baseEvaluations/CreerBaseParDefautEvaluation.java rename to src/analyseWriter/baseEvaluations/CreerBaseParDefautEvaluation.java index 46606ae..6628366 100644 --- a/src/baseEvaluations/CreerBaseParDefautEvaluation.java +++ b/src/analyseWriter/baseEvaluations/CreerBaseParDefautEvaluation.java @@ -1,4 +1,4 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; import java.io.BufferedWriter; import java.io.File; @@ -10,7 +10,7 @@ import java.nio.file.Paths; import java.text.ParseException; import java.util.Date; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; /** * Création de la base de données des évaluations.
@@ -42,7 +42,7 @@ public class CreerBaseParDefautEvaluation { Path outputFilePath = file.toPath(); BufferedWriter fichier = Files.newBufferedWriter(outputFilePath, StandardCharsets.UTF_8); try { - fichier.write(""); + fichier.write(""); fichier.close(); System.out.println("Fermeture du fichier de la base de données des évaluations."); return false; diff --git a/src/baseEvaluations/chargeEvaluation.java b/src/analyseWriter/baseEvaluations/chargeEvaluation.java similarity index 93% rename from src/baseEvaluations/chargeEvaluation.java rename to src/analyseWriter/baseEvaluations/chargeEvaluation.java index 35eb868..6ab86ea 100644 --- a/src/baseEvaluations/chargeEvaluation.java +++ b/src/analyseWriter/baseEvaluations/chargeEvaluation.java @@ -1,4 +1,4 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; import java.io.BufferedReader; import java.io.File; @@ -13,12 +13,11 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; -import com.analyseWriter.fenetres.ChargeFichierXML; - -import MEPTL.commandes; -import MEPTL.meptl; -import MEPTL.verificationFichierAnalyse_node_commandesSujet; -import baseListesEtudiants.chargeListeEtudiants; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.meptl; +import analyseWriter.MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.baseListesEtudiants.chargeListeEtudiants; +import analyseWriter.fenetres.ChargeFichierXML; import cXML.node; /** @@ -301,7 +300,7 @@ public class chargeEvaluation { }else { if(sujetLoad.getAttributs().get("date")!=null) { String dateString = sujetLoad.getAttributs().get("date"); - return calcul.formatDateWriter.DateLibreOffice(dateString); + return analyseWriter.calcul.formatDateWriter.DateLibreOffice(dateString); } } diff --git a/src/baseEvaluations/creerNouvelleEvaluation.java b/src/analyseWriter/baseEvaluations/creerNouvelleEvaluation.java similarity index 89% rename from src/baseEvaluations/creerNouvelleEvaluation.java rename to src/analyseWriter/baseEvaluations/creerNouvelleEvaluation.java index f46e94d..8a8c683 100644 --- a/src/baseEvaluations/creerNouvelleEvaluation.java +++ b/src/analyseWriter/baseEvaluations/creerNouvelleEvaluation.java @@ -1,9 +1,9 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; import java.text.ParseException; import java.util.Date; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; public class creerNouvelleEvaluation { @@ -48,13 +48,13 @@ public class creerNouvelleEvaluation { try { if(!majBase && !importation) { //nouvelle évaluation - evaluation.getAttributs().put("date", calcul.formatDateWriter.DateLibreOffice(aujourdhui)); - evaluation.getAttributs().put("dateModification", calcul.formatDateWriter.DateLibreOffice(aujourdhui)); + evaluation.getAttributs().put("date", analyseWriter.calcul.formatDateWriter.DateLibreOffice(aujourdhui)); + evaluation.getAttributs().put("dateModification", analyseWriter.calcul.formatDateWriter.DateLibreOffice(aujourdhui)); evaluation.getNodes().add(commandes.sujet); commandes.evaluationChargeEnMemoire = evaluation; }else { //Mise à jour - if(!importation) evaluation.getAttributs().put("dateModification", calcul.formatDateWriter.DateLibreOffice(aujourdhui)); + if(!importation) evaluation.getAttributs().put("dateModification", analyseWriter.calcul.formatDateWriter.DateLibreOffice(aujourdhui)); } } catch (ParseException e) { e.printStackTrace(); diff --git a/src/baseEvaluations/ecritureBaseEvaluation.java b/src/analyseWriter/baseEvaluations/ecritureBaseEvaluation.java similarity index 94% rename from src/baseEvaluations/ecritureBaseEvaluation.java rename to src/analyseWriter/baseEvaluations/ecritureBaseEvaluation.java index b9d0e70..33e4a35 100644 --- a/src/baseEvaluations/ecritureBaseEvaluation.java +++ b/src/analyseWriter/baseEvaluations/ecritureBaseEvaluation.java @@ -1,4 +1,4 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -17,7 +17,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.Run; import cXML.node; diff --git a/src/baseEvaluations/evaluationExist.java b/src/analyseWriter/baseEvaluations/evaluationExist.java similarity index 79% rename from src/baseEvaluations/evaluationExist.java rename to src/analyseWriter/baseEvaluations/evaluationExist.java index 19185cd..c8ffc29 100644 --- a/src/baseEvaluations/evaluationExist.java +++ b/src/analyseWriter/baseEvaluations/evaluationExist.java @@ -1,6 +1,6 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; /** * Classe permettant de savoir si une évaluation est déjà présente dans la base. diff --git a/src/baseEvaluations/myTableBaseEvaluation.java b/src/analyseWriter/baseEvaluations/myTableBaseEvaluation.java similarity index 79% rename from src/baseEvaluations/myTableBaseEvaluation.java rename to src/analyseWriter/baseEvaluations/myTableBaseEvaluation.java index 982d6a0..de0565d 100644 --- a/src/baseEvaluations/myTableBaseEvaluation.java +++ b/src/analyseWriter/baseEvaluations/myTableBaseEvaluation.java @@ -1,4 +1,4 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; import java.util.ArrayList; import java.util.Arrays; @@ -6,7 +6,7 @@ import java.util.List; import javax.swing.table.AbstractTableModel; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; /** @@ -59,11 +59,11 @@ public class myTableBaseEvaluation extends AbstractTableModel{ String dateCreation =""; evaluation[i][0] = commandes.evaluationsBase.getNodes().get(i).getAttributs().get("name"); if(commandes.evaluationsBase.getNodes().get(i).getAttributs().get("date")!=null) { - dateCreation = calcul.formatDateWriter.DateEnClairFR( calcul.formatDateWriter.DateLibreOffice(commandes.evaluationsBase.getNodes().get(i).getAttributs().get("date") )); + dateCreation = analyseWriter.calcul.formatDateWriter.DateEnClairFR( analyseWriter.calcul.formatDateWriter.DateLibreOffice(commandes.evaluationsBase.getNodes().get(i).getAttributs().get("date") )); } evaluation[i][1] = dateCreation; if(commandes.evaluationsBase.getNodes().get(i).getAttributs().get("dateModification")!=null) { - evaluation[i][2] = calcul.formatDateWriter.DateEnClairFR( calcul.formatDateWriter.DateLibreOffice(commandes.evaluationsBase.getNodes().get(i).getAttributs().get("dateModification") )); + evaluation[i][2] = analyseWriter.calcul.formatDateWriter.DateEnClairFR( analyseWriter.calcul.formatDateWriter.DateLibreOffice(commandes.evaluationsBase.getNodes().get(i).getAttributs().get("dateModification") )); }else { evaluation[i][2] = dateCreation; } diff --git a/src/baseEvaluations/recupeNodeBaseEvaluations.java b/src/analyseWriter/baseEvaluations/recupeNodeBaseEvaluations.java similarity index 95% rename from src/baseEvaluations/recupeNodeBaseEvaluations.java rename to src/analyseWriter/baseEvaluations/recupeNodeBaseEvaluations.java index 78ccc01..3e0d6b1 100644 --- a/src/baseEvaluations/recupeNodeBaseEvaluations.java +++ b/src/analyseWriter/baseEvaluations/recupeNodeBaseEvaluations.java @@ -1,4 +1,4 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; import java.io.BufferedReader; import java.io.File; @@ -9,7 +9,7 @@ import java.nio.file.Paths; import javax.swing.JLabel; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; /** * Récupère la base des évaluations qui se trouve indiqué par commandes.
diff --git a/src/baseEvaluations/removeEvaluation.java b/src/analyseWriter/baseEvaluations/removeEvaluation.java similarity index 93% rename from src/baseEvaluations/removeEvaluation.java rename to src/analyseWriter/baseEvaluations/removeEvaluation.java index 8eb54ba..489a8c0 100644 --- a/src/baseEvaluations/removeEvaluation.java +++ b/src/analyseWriter/baseEvaluations/removeEvaluation.java @@ -1,4 +1,4 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -17,7 +17,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; public class removeEvaluation { diff --git a/src/baseEvaluations/trierParDateDecroissanteLaBase.java b/src/analyseWriter/baseEvaluations/trierParDateDecroissanteLaBase.java similarity index 85% rename from src/baseEvaluations/trierParDateDecroissanteLaBase.java rename to src/analyseWriter/baseEvaluations/trierParDateDecroissanteLaBase.java index d0d2a8b..099d083 100644 --- a/src/baseEvaluations/trierParDateDecroissanteLaBase.java +++ b/src/analyseWriter/baseEvaluations/trierParDateDecroissanteLaBase.java @@ -1,4 +1,4 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; import java.util.ArrayList; import java.util.Collections; @@ -8,7 +8,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; public class trierParDateDecroissanteLaBase { @@ -22,12 +22,12 @@ public class trierParDateDecroissanteLaBase { Date dateEvaluationCharger = new Date(); if(commandes.evaluationChargeEnMemoire!=null) { - dateEvaluationCharger = calcul.formatDateWriter.DateLibreOffice(commandes.evaluationChargeEnMemoire.getAttributs().get("date")); + dateEvaluationCharger = analyseWriter.calcul.formatDateWriter.DateLibreOffice(commandes.evaluationChargeEnMemoire.getAttributs().get("date")); System.out.println("dateEvaluationCharger="+dateEvaluationCharger); } for(int i = 0 ; i < evaluations.size();i++) { - dateDictionary.put(calcul.formatDateWriter.DateLibreOffice(evaluations.get(i).getAttributs().get("date")),i); + dateDictionary.put(analyseWriter.calcul.formatDateWriter.DateLibreOffice(evaluations.get(i).getAttributs().get("date")),i); } // Convertir le HashMap en liste pour pouvoir trier les éléments diff --git a/src/baseEvaluations/validatorBaseEvaluation.java b/src/analyseWriter/baseEvaluations/validatorBaseEvaluation.java similarity index 79% rename from src/baseEvaluations/validatorBaseEvaluation.java rename to src/analyseWriter/baseEvaluations/validatorBaseEvaluation.java index 515f6b7..6b9de3c 100644 --- a/src/baseEvaluations/validatorBaseEvaluation.java +++ b/src/analyseWriter/baseEvaluations/validatorBaseEvaluation.java @@ -1,6 +1,6 @@ -package baseEvaluations; +package analyseWriter.baseEvaluations; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; public class validatorBaseEvaluation { diff --git a/src/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java b/src/analyseWriter/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java similarity index 80% rename from src/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java rename to src/analyseWriter/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java index 55aba96..1d3ac2b 100644 --- a/src/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java +++ b/src/analyseWriter/baseListesEtudiants/CreerBaseParDefautListesEtudiants.java @@ -1,4 +1,4 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; import java.io.BufferedWriter; import java.io.File; @@ -10,7 +10,7 @@ import java.nio.file.Paths; import java.text.ParseException; import java.util.Date; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; /** * Création de la base de données des listes des étudiants.
@@ -34,7 +34,7 @@ public class CreerBaseParDefautListesEtudiants { Path outputFilePath = file.toPath(); BufferedWriter fichier = Files.newBufferedWriter(outputFilePath, StandardCharsets.UTF_8); try { - fichier.write(""); + fichier.write(""); } catch (IOException e) { e.printStackTrace(); } catch (ParseException e) { diff --git a/src/baseListesEtudiants/EmailValidator.java b/src/analyseWriter/baseListesEtudiants/EmailValidator.java similarity index 87% rename from src/baseListesEtudiants/EmailValidator.java rename to src/analyseWriter/baseListesEtudiants/EmailValidator.java index 28bc45b..70cd6d3 100644 --- a/src/baseListesEtudiants/EmailValidator.java +++ b/src/analyseWriter/baseListesEtudiants/EmailValidator.java @@ -1,4 +1,4 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/baseListesEtudiants/chargeListeEtudiants.java b/src/analyseWriter/baseListesEtudiants/chargeListeEtudiants.java similarity index 88% rename from src/baseListesEtudiants/chargeListeEtudiants.java rename to src/analyseWriter/baseListesEtudiants/chargeListeEtudiants.java index c56be2b..709a456 100644 --- a/src/baseListesEtudiants/chargeListeEtudiants.java +++ b/src/analyseWriter/baseListesEtudiants/chargeListeEtudiants.java @@ -1,6 +1,6 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; public class chargeListeEtudiants { diff --git a/src/baseListesEtudiants/ecritureBaseListesEtudiants.java b/src/analyseWriter/baseListesEtudiants/ecritureBaseListesEtudiants.java similarity index 92% rename from src/baseListesEtudiants/ecritureBaseListesEtudiants.java rename to src/analyseWriter/baseListesEtudiants/ecritureBaseListesEtudiants.java index 8d1653e..2ca951c 100644 --- a/src/baseListesEtudiants/ecritureBaseListesEtudiants.java +++ b/src/analyseWriter/baseListesEtudiants/ecritureBaseListesEtudiants.java @@ -1,4 +1,4 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -19,7 +19,7 @@ import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.Run; import cXML.node; @@ -122,7 +122,7 @@ public class ecritureBaseListesEtudiants { Path outputFilePath = file.toPath(); BufferedWriter fichier = Files.newBufferedWriter(outputFilePath, StandardCharsets.UTF_8); Date aujourdhui = new Date(); - commandes.listesEtudiants.getAttributs().put("date", calcul.formatDateWriter.DateLibreOffice(aujourdhui)); + commandes.listesEtudiants.getAttributs().put("date", analyseWriter.calcul.formatDateWriter.DateLibreOffice(aujourdhui)); commandes.listesEtudiants.getAttributs().put("version",commandes.version); fichier.write(commandes.listesEtudiants.ecritureXML().toString()); fichier.close(); diff --git a/src/baseListesEtudiants/idValidator.java b/src/analyseWriter/baseListesEtudiants/idValidator.java similarity index 85% rename from src/baseListesEtudiants/idValidator.java rename to src/analyseWriter/baseListesEtudiants/idValidator.java index 422a7ad..ed39511 100644 --- a/src/baseListesEtudiants/idValidator.java +++ b/src/analyseWriter/baseListesEtudiants/idValidator.java @@ -1,4 +1,4 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/baseListesEtudiants/myTableBaseListesEtudiants.java b/src/analyseWriter/baseListesEtudiants/myTableBaseListesEtudiants.java similarity index 92% rename from src/baseListesEtudiants/myTableBaseListesEtudiants.java rename to src/analyseWriter/baseListesEtudiants/myTableBaseListesEtudiants.java index 3e240a1..5a0d12d 100644 --- a/src/baseListesEtudiants/myTableBaseListesEtudiants.java +++ b/src/analyseWriter/baseListesEtudiants/myTableBaseListesEtudiants.java @@ -1,4 +1,4 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; import java.util.ArrayList; import java.util.Arrays; @@ -6,7 +6,7 @@ import java.util.List; import javax.swing.table.AbstractTableModel; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; /** * diff --git a/src/baseListesEtudiants/myTableStudent.java b/src/analyseWriter/baseListesEtudiants/myTableStudent.java similarity index 94% rename from src/baseListesEtudiants/myTableStudent.java rename to src/analyseWriter/baseListesEtudiants/myTableStudent.java index e8655ae..72e095f 100644 --- a/src/baseListesEtudiants/myTableStudent.java +++ b/src/analyseWriter/baseListesEtudiants/myTableStudent.java @@ -1,4 +1,4 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; import java.util.ArrayList; import java.util.Arrays; @@ -6,7 +6,7 @@ import java.util.List; import javax.swing.table.AbstractTableModel; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; /** diff --git a/src/baseListesEtudiants/nameStudentValidator.java b/src/analyseWriter/baseListesEtudiants/nameStudentValidator.java similarity index 86% rename from src/baseListesEtudiants/nameStudentValidator.java rename to src/analyseWriter/baseListesEtudiants/nameStudentValidator.java index c4b350b..7b0275c 100644 --- a/src/baseListesEtudiants/nameStudentValidator.java +++ b/src/analyseWriter/baseListesEtudiants/nameStudentValidator.java @@ -1,4 +1,4 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/baseListesEtudiants/recupeNodeBaseListesEtudiants.java b/src/analyseWriter/baseListesEtudiants/recupeNodeBaseListesEtudiants.java similarity index 92% rename from src/baseListesEtudiants/recupeNodeBaseListesEtudiants.java rename to src/analyseWriter/baseListesEtudiants/recupeNodeBaseListesEtudiants.java index b4e8c8c..bcf9046 100644 --- a/src/baseListesEtudiants/recupeNodeBaseListesEtudiants.java +++ b/src/analyseWriter/baseListesEtudiants/recupeNodeBaseListesEtudiants.java @@ -1,4 +1,4 @@ -package baseListesEtudiants; +package analyseWriter.baseListesEtudiants; import java.io.BufferedReader; import java.io.File; @@ -9,7 +9,7 @@ import java.nio.file.Paths; import javax.swing.JLabel; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; /** diff --git a/src/calcul/StringSimilarity.java b/src/analyseWriter/calcul/StringSimilarity.java similarity index 96% rename from src/calcul/StringSimilarity.java rename to src/analyseWriter/calcul/StringSimilarity.java index 6b32cac..e6b3d99 100644 --- a/src/calcul/StringSimilarity.java +++ b/src/analyseWriter/calcul/StringSimilarity.java @@ -1,4 +1,4 @@ -package calcul; +package analyseWriter.calcul; public class StringSimilarity { /** diff --git a/src/calcul/calculIntervalleBaremeABCDE.java b/src/analyseWriter/calcul/calculIntervalleBaremeABCDE.java similarity index 96% rename from src/calcul/calculIntervalleBaremeABCDE.java rename to src/analyseWriter/calcul/calculIntervalleBaremeABCDE.java index b3327f0..a8b3730 100644 --- a/src/calcul/calculIntervalleBaremeABCDE.java +++ b/src/analyseWriter/calcul/calculIntervalleBaremeABCDE.java @@ -1,4 +1,4 @@ -package calcul; +package analyseWriter.calcul; public class calculIntervalleBaremeABCDE { diff --git a/src/calcul/calculNombrePointEvaluation.java b/src/analyseWriter/calcul/calculNombrePointEvaluation.java similarity index 96% rename from src/calcul/calculNombrePointEvaluation.java rename to src/analyseWriter/calcul/calculNombrePointEvaluation.java index a52d8e6..1d25eb0 100644 --- a/src/calcul/calculNombrePointEvaluation.java +++ b/src/analyseWriter/calcul/calculNombrePointEvaluation.java @@ -1,4 +1,4 @@ -package calcul; +package analyseWriter.calcul; import java.util.ArrayList; import java.util.Enumeration; @@ -7,9 +7,9 @@ import java.util.regex.Pattern; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.list.listMethodeEvaluationAnalyseWriter; import cXML.node; -import list.listMethodeEvaluationAnalyseWriter; public class calculNombrePointEvaluation { diff --git a/src/calcul/calculNotesProgression.java b/src/analyseWriter/calcul/calculNotesProgression.java similarity index 95% rename from src/calcul/calculNotesProgression.java rename to src/analyseWriter/calcul/calculNotesProgression.java index e2b66c0..283289d 100644 --- a/src/calcul/calculNotesProgression.java +++ b/src/analyseWriter/calcul/calculNotesProgression.java @@ -1,4 +1,4 @@ -package calcul; +package analyseWriter.calcul; import java.text.DecimalFormat; diff --git a/src/calcul/formatDateWriter.java b/src/analyseWriter/calcul/formatDateWriter.java similarity index 91% rename from src/calcul/formatDateWriter.java rename to src/analyseWriter/calcul/formatDateWriter.java index 221c334..47a7200 100644 --- a/src/calcul/formatDateWriter.java +++ b/src/analyseWriter/calcul/formatDateWriter.java @@ -1,4 +1,4 @@ -package calcul; +package analyseWriter.calcul; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -8,7 +8,7 @@ import java.util.regex.Pattern; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; public class formatDateWriter { @@ -98,7 +98,7 @@ public class formatDateWriter { public static Date dateNodeSujet() { if(commandes.sujet.getAttributs().get("date")!=null) { String dateString = commandes.sujet.getAttributs().get("date"); - return calcul.formatDateWriter.DateLibreOffice(dateString); + return analyseWriter.calcul.formatDateWriter.DateLibreOffice(dateString); } return null; } diff --git a/src/evaluer/analyseFichier.java b/src/analyseWriter/evaluer/analyseFichier.java similarity index 97% rename from src/evaluer/analyseFichier.java rename to src/analyseWriter/evaluer/analyseFichier.java index 676404c..ea13724 100644 --- a/src/evaluer/analyseFichier.java +++ b/src/analyseWriter/evaluer/analyseFichier.java @@ -1,4 +1,4 @@ -package evaluer; +package analyseWriter.evaluer; import java.text.DecimalFormat; import java.util.ArrayList; @@ -7,8 +7,8 @@ import java.util.Enumeration; import javax.swing.JEditorPane; -import MEPTL.commandes; -import MEPTL.meptl; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.meptl; import cXML.Run; import cXML.node; diff --git a/src/evaluer/analyseLesNodesEnfants.java b/src/analyseWriter/evaluer/analyseLesNodesEnfants.java similarity index 96% rename from src/evaluer/analyseLesNodesEnfants.java rename to src/analyseWriter/evaluer/analyseLesNodesEnfants.java index 243693b..5da6024 100644 --- a/src/evaluer/analyseLesNodesEnfants.java +++ b/src/analyseWriter/evaluer/analyseLesNodesEnfants.java @@ -1,7 +1,7 @@ -package evaluer; +package analyseWriter.evaluer; -import MEPTL.meptl; -import MEPTL.rechercherUnNodeStudent; +import analyseWriter.MEPTL.meptl; +import analyseWriter.MEPTL.rechercherUnNodeStudent; import cXML.Run; import cXML.node; diff --git a/src/evaluer/analyseLesNodesPrincipaux.java b/src/analyseWriter/evaluer/analyseLesNodesPrincipaux.java similarity index 97% rename from src/evaluer/analyseLesNodesPrincipaux.java rename to src/analyseWriter/evaluer/analyseLesNodesPrincipaux.java index f33b939..970a872 100644 --- a/src/evaluer/analyseLesNodesPrincipaux.java +++ b/src/analyseWriter/evaluer/analyseLesNodesPrincipaux.java @@ -1,10 +1,10 @@ -package evaluer; +package analyseWriter.evaluer; import java.util.ArrayList; import java.util.Enumeration; -import MEPTL.commandes; -import MEPTL.meptl; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.meptl; import cXML.Run; import cXML.node; diff --git a/src/evaluer/evaluation.java b/src/analyseWriter/evaluer/evaluation.java similarity index 96% rename from src/evaluer/evaluation.java rename to src/analyseWriter/evaluer/evaluation.java index 22141b3..f6933c2 100644 --- a/src/evaluer/evaluation.java +++ b/src/analyseWriter/evaluer/evaluation.java @@ -1,4 +1,4 @@ -package evaluer; +package analyseWriter.evaluer; import java.text.Normalizer; @@ -8,10 +8,10 @@ import java.util.Hashtable; import java.util.regex.Matcher; import java.util.regex.Pattern; -import MEPTL.HTML; -import MEPTL.commandes; +import analyseWriter.MEPTL.HTML; +import analyseWriter.MEPTL.commandes; +import analyseWriter.calcul.StringSimilarity; import cXML.node; -import calcul.StringSimilarity; /** * * @author pablo rodriguez diff --git a/src/evaluer/evaluationAttribut.java b/src/analyseWriter/evaluer/evaluationAttribut.java similarity index 97% rename from src/evaluer/evaluationAttribut.java rename to src/analyseWriter/evaluer/evaluationAttribut.java index 4b406e9..44238d9 100644 --- a/src/evaluer/evaluationAttribut.java +++ b/src/analyseWriter/evaluer/evaluationAttribut.java @@ -1,19 +1,19 @@ -package evaluer; +package analyseWriter.evaluer; import java.util.ArrayList; import java.util.Enumeration; import java.util.regex.Matcher; import java.util.regex.Pattern; -import MEPTL.commandes; -import MEPTL.rechercherUnNodeStudent; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.rechercherUnNodeStudent; +import analyseWriter.list.listMethodeEvaluationAnalyseWriter; +import analyseWriter.list.listeDesNodesAncrable; +import analyseWriter.list.listeDesNodesContenantPargraphesOuTitres; +import analyseWriter.list.listeDesNodesEvalPlacement; +import analyseWriter.list.listeDesNodesFormatageDirect; +import analyseWriter.list.listeDesNodesPourEvaluerPage; import cXML.node; -import list.listMethodeEvaluationAnalyseWriter; -import list.listeDesNodesAncrable; -import list.listeDesNodesContenantPargraphesOuTitres; -import list.listeDesNodesEvalPlacement; -import list.listeDesNodesFormatageDirect; -import list.listeDesNodesPourEvaluerPage; public class evaluationAttribut { diff --git a/src/evaluer/evaluerLesFichiersEtudiants.java b/src/analyseWriter/evaluer/evaluerLesFichiersEtudiants.java similarity index 94% rename from src/evaluer/evaluerLesFichiersEtudiants.java rename to src/analyseWriter/evaluer/evaluerLesFichiersEtudiants.java index f3dbf6c..fba7673 100644 --- a/src/evaluer/evaluerLesFichiersEtudiants.java +++ b/src/analyseWriter/evaluer/evaluerLesFichiersEtudiants.java @@ -1,4 +1,4 @@ -package evaluer; +package analyseWriter.evaluer; import java.io.IOException; import java.text.ParseException; @@ -8,16 +8,15 @@ import javax.xml.parsers.ParserConfigurationException; import org.xml.sax.SAXException; -import com.analyseWriter.fenetres.baliseStyle; - -import MEPTL.VerificationHistorique; -import MEPTL.commandes; -import MEPTL.feedbacks; -import MEPTL.meptl; -import MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.MEPTL.VerificationHistorique; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.feedbacks; +import analyseWriter.MEPTL.meptl; +import analyseWriter.MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.calcul.calculIntervalleBaremeABCDE; +import analyseWriter.fenetres.baliseStyle; import cXML.Run; import cXML.node; -import calcul.calculIntervalleBaremeABCDE; import net.lingala.zip4j.exception.ZipException; public class evaluerLesFichiersEtudiants implements Runnable{ diff --git a/src/com/analyseWriter/fenetres/ChargeFichierXML.java b/src/analyseWriter/fenetres/ChargeFichierXML.java similarity index 93% rename from src/com/analyseWriter/fenetres/ChargeFichierXML.java rename to src/analyseWriter/fenetres/ChargeFichierXML.java index d90158f..90618ff 100644 --- a/src/com/analyseWriter/fenetres/ChargeFichierXML.java +++ b/src/analyseWriter/fenetres/ChargeFichierXML.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Component; import java.awt.Dimension; @@ -17,9 +17,9 @@ import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.filechooser.FileNameExtensionFilter; -import MEPTL.commandes; -import MEPTL.meptl; -import MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.meptl; +import analyseWriter.MEPTL.verificationFichierAnalyse_node_commandesSujet; import cXML.node; /** * Chargement d'un fichier d'analyse diff --git a/src/com/analyseWriter/fenetres/ChargePathBaseEvaluation.java b/src/analyseWriter/fenetres/ChargePathBaseEvaluation.java similarity index 92% rename from src/com/analyseWriter/fenetres/ChargePathBaseEvaluation.java rename to src/analyseWriter/fenetres/ChargePathBaseEvaluation.java index b982df3..6d17539 100644 --- a/src/com/analyseWriter/fenetres/ChargePathBaseEvaluation.java +++ b/src/analyseWriter/fenetres/ChargePathBaseEvaluation.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Component; import java.awt.Dimension; @@ -19,9 +19,9 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.filechooser.FileNameExtensionFilter; -import MEPTL.commandes; -import baseEvaluations.creerNouvelleEvaluation; -import baseEvaluations.recupeNodeBaseEvaluations; +import analyseWriter.MEPTL.commandes; +import analyseWriter.baseEvaluations.creerNouvelleEvaluation; +import analyseWriter.baseEvaluations.recupeNodeBaseEvaluations; import cXML.node; /** diff --git a/src/com/analyseWriter/fenetres/CustomInputDialogActivateStyle.java b/src/analyseWriter/fenetres/CustomInputDialogActivateStyle.java similarity index 96% rename from src/com/analyseWriter/fenetres/CustomInputDialogActivateStyle.java rename to src/analyseWriter/fenetres/CustomInputDialogActivateStyle.java index 0019379..959496d 100644 --- a/src/com/analyseWriter/fenetres/CustomInputDialogActivateStyle.java +++ b/src/analyseWriter/fenetres/CustomInputDialogActivateStyle.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Font; @@ -9,7 +9,7 @@ import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; diff --git a/src/com/analyseWriter/fenetres/CustomInputDialogActivateStyleDansLaStructure.java b/src/analyseWriter/fenetres/CustomInputDialogActivateStyleDansLaStructure.java similarity index 96% rename from src/com/analyseWriter/fenetres/CustomInputDialogActivateStyleDansLaStructure.java rename to src/analyseWriter/fenetres/CustomInputDialogActivateStyleDansLaStructure.java index 6fd8a16..6de6c04 100644 --- a/src/com/analyseWriter/fenetres/CustomInputDialogActivateStyleDansLaStructure.java +++ b/src/analyseWriter/fenetres/CustomInputDialogActivateStyleDansLaStructure.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Font; @@ -8,7 +8,7 @@ import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JOptionPane; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; diff --git a/src/com/analyseWriter/fenetres/CustomInputDialogListeEtudiant.java b/src/analyseWriter/fenetres/CustomInputDialogListeEtudiant.java similarity index 96% rename from src/com/analyseWriter/fenetres/CustomInputDialogListeEtudiant.java rename to src/analyseWriter/fenetres/CustomInputDialogListeEtudiant.java index 0ae4739..082d23d 100644 --- a/src/com/analyseWriter/fenetres/CustomInputDialogListeEtudiant.java +++ b/src/analyseWriter/fenetres/CustomInputDialogListeEtudiant.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Font; @@ -11,8 +11,8 @@ import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.filechooser.FileNameExtensionFilter; -import MEPTL.commandes; -import MEPTL.meptl; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.meptl; import cXML.node; /** * Class permettant de générer une
diff --git a/src/com/analyseWriter/fenetres/CustomInputDialogSimplePoint.java b/src/analyseWriter/fenetres/CustomInputDialogSimplePoint.java similarity index 95% rename from src/com/analyseWriter/fenetres/CustomInputDialogSimplePoint.java rename to src/analyseWriter/fenetres/CustomInputDialogSimplePoint.java index b59c785..93ca89b 100644 --- a/src/com/analyseWriter/fenetres/CustomInputDialogSimplePoint.java +++ b/src/analyseWriter/fenetres/CustomInputDialogSimplePoint.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Font; diff --git a/src/com/analyseWriter/fenetres/CustomInputDialogSimplePointCaseCoche.java b/src/analyseWriter/fenetres/CustomInputDialogSimplePointCaseCoche.java similarity index 96% rename from src/com/analyseWriter/fenetres/CustomInputDialogSimplePointCaseCoche.java rename to src/analyseWriter/fenetres/CustomInputDialogSimplePointCaseCoche.java index 9fd3491..3cdf577 100644 --- a/src/com/analyseWriter/fenetres/CustomInputDialogSimplePointCaseCoche.java +++ b/src/analyseWriter/fenetres/CustomInputDialogSimplePointCaseCoche.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Font; diff --git a/src/com/analyseWriter/fenetres/CustomInputDialogSimplePointInputNombreSansCaseACocher.java b/src/analyseWriter/fenetres/CustomInputDialogSimplePointInputNombreSansCaseACocher.java similarity index 96% rename from src/com/analyseWriter/fenetres/CustomInputDialogSimplePointInputNombreSansCaseACocher.java rename to src/analyseWriter/fenetres/CustomInputDialogSimplePointInputNombreSansCaseACocher.java index 8fd57a1..a7027db 100644 --- a/src/com/analyseWriter/fenetres/CustomInputDialogSimplePointInputNombreSansCaseACocher.java +++ b/src/analyseWriter/fenetres/CustomInputDialogSimplePointInputNombreSansCaseACocher.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Font; diff --git a/src/com/analyseWriter/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java b/src/analyseWriter/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java similarity index 95% rename from src/com/analyseWriter/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java rename to src/analyseWriter/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java index 4436a23..3a48090 100644 --- a/src/com/analyseWriter/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java +++ b/src/analyseWriter/fenetres/CustomInputDialogSimplePointpourNumeroPageEtStructure.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Font; @@ -10,7 +10,7 @@ import javax.swing.JOptionPane; import javax.swing.JTextField; import javax.swing.SwingConstants; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; import cXML.node; diff --git a/src/com/analyseWriter/fenetres/MyCellRenderer.java b/src/analyseWriter/fenetres/MyCellRenderer.java similarity index 95% rename from src/com/analyseWriter/fenetres/MyCellRenderer.java rename to src/analyseWriter/fenetres/MyCellRenderer.java index 4c56694..9577a00 100644 --- a/src/com/analyseWriter/fenetres/MyCellRenderer.java +++ b/src/analyseWriter/fenetres/MyCellRenderer.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Component; diff --git a/src/com/analyseWriter/fenetres/MyTreeCellEditor.java b/src/analyseWriter/fenetres/MyTreeCellEditor.java similarity index 94% rename from src/com/analyseWriter/fenetres/MyTreeCellEditor.java rename to src/analyseWriter/fenetres/MyTreeCellEditor.java index f187b99..f79e6b4 100644 --- a/src/com/analyseWriter/fenetres/MyTreeCellEditor.java +++ b/src/analyseWriter/fenetres/MyTreeCellEditor.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Component; diff --git a/src/com/analyseWriter/fenetres/MyTreeCellRenderer.java b/src/analyseWriter/fenetres/MyTreeCellRenderer.java similarity index 95% rename from src/com/analyseWriter/fenetres/MyTreeCellRenderer.java rename to src/analyseWriter/fenetres/MyTreeCellRenderer.java index a0eeba3..8310501 100644 --- a/src/com/analyseWriter/fenetres/MyTreeCellRenderer.java +++ b/src/analyseWriter/fenetres/MyTreeCellRenderer.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Component; diff --git a/src/com/analyseWriter/fenetres/ProgressBar.java b/src/analyseWriter/fenetres/ProgressBar.java similarity index 94% rename from src/com/analyseWriter/fenetres/ProgressBar.java rename to src/analyseWriter/fenetres/ProgressBar.java index 06264cd..3858a82 100644 --- a/src/com/analyseWriter/fenetres/ProgressBar.java +++ b/src/analyseWriter/fenetres/ProgressBar.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.Container; diff --git a/src/com/analyseWriter/fenetres/about.java b/src/analyseWriter/fenetres/about.java similarity index 59% rename from src/com/analyseWriter/fenetres/about.java rename to src/analyseWriter/fenetres/about.java index 02c5250..c7d4015 100644 --- a/src/com/analyseWriter/fenetres/about.java +++ b/src/analyseWriter/fenetres/about.java @@ -1,18 +1,26 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; +import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Font; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Files; import javax.swing.ImageIcon; import javax.swing.JButton; +import javax.swing.JEditorPane; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JPanel; +import javax.swing.JScrollPane; import javax.swing.SwingConstants; -import MEPTL.commandes; -import java.awt.Color; +import analyseWriter.MEPTL.commandes; public final class about extends JFrame { @@ -51,7 +59,7 @@ public final class about extends JFrame { JPanel contentPane = (JPanel) getContentPane(); JLabel lblNewLabelTitre = new JLabel(); - ImageIcon img2 = new ImageIcon(getClass().getResource("/accueil.png") ); + ImageIcon img2 = new ImageIcon(getClass().getResource("/resources/accueil.png") ); if(commandes.newVersion) { img2 = new ImageIcon(getClass().getResource("/resources/accueil_new_version.png") ); } @@ -64,30 +72,25 @@ public final class about extends JFrame { JLabel lblNewLabelVersion = new JLabel("Version : " + commandes.version + " "+ commandes.nomDeLaBranch + ""); lblNewLabelVersion.setFont(new Font("Tahoma", Font.PLAIN, 16)); - lblNewLabelVersion.setBounds(20, 100, 240, 20); + lblNewLabelVersion.setBounds(20, 120, 240, 20); contentPane.add(lblNewLabelVersion); JLabel lblNewLabelAnnee = new JLabel("Année : " + commandes.Annee + ""); lblNewLabelAnnee.setFont(new Font("Tahoma", Font.PLAIN, 16)); - lblNewLabelAnnee.setBounds(20, 120, 240, 20); + lblNewLabelAnnee.setBounds(20, 142, 240, 20); contentPane.add(lblNewLabelAnnee); JLabel lblCredit = new JLabel("Crédit"); lblCredit.setFont(new Font("Tahoma", Font.BOLD | Font.ITALIC, 14)); - lblCredit.setBounds(20, 268, 60, 20); + lblCredit.setBounds(20, 260, 112, 20); getContentPane().add(lblCredit); - JLabel lblNewLabelAuteur = new JLabel("Auteur : Pablo Rodriguez"); + JLabel lblNewLabelAuteur = new JLabel("Auteur développeur : Pablo Rodriguez"); lblNewLabelAuteur.setFont(new Font("Tahoma", Font.PLAIN, 14)); - lblNewLabelAuteur.setBounds(20, 286, 240, 20); + lblNewLabelAuteur.setBounds(20, 282, 250, 20); contentPane.add(lblNewLabelAuteur); - JLabel lblInformationEnseignant = new JLabel("Enseignants à l'université d'Artois"); - lblInformationEnseignant.setFont(new Font("Tahoma", Font.PLAIN, 12)); - lblInformationEnseignant.setBounds(20, 299, 296, 20); - getContentPane().add(lblInformationEnseignant); - JLabel lblCommentaire = new JLabel("Outil permettant l’évaluation des fichiers réalisés par des étudiants avec un traitement de texte au format ODF."); lblCommentaire.setFont(new Font("Tahoma", Font.PLAIN, 14)); lblCommentaire.setHorizontalAlignment(SwingConstants.LEFT); @@ -97,10 +100,10 @@ public final class about extends JFrame { JLabel lblLicence = new JLabel("Licence : GNU GLP 3.0 "); lblLicence.setFont(new Font("Tahoma", Font.PLAIN, 14)); - lblLicence.setBounds(305, 261, 187, 35); + lblLicence.setBounds(305, 249, 187, 35); getContentPane().add(lblLicence); - JButton btnNewButton = new JButton("

Vérifier s'il y a
une nouvelle version

"); + JButton btnNewButton = new JButton("

Les versions
du logiciel

"); if(commandes.newVersion) { btnNewButton.setText("

Nouvelle version
"+commandes.nameNewVersion +"

"); } @@ -117,13 +120,13 @@ public final class about extends JFrame { } }); - btnNewButton.setBounds(270, 100, 222, 72); + btnNewButton.setBounds(270, 111, 222, 72); getContentPane().add(btnNewButton); JLabel lblGPL3 = new JLabel(""); lblGPL3.setHorizontalAlignment(SwingConstants.CENTER); - lblGPL3.setIcon(new ImageIcon(about.class.getResource("/resources/GPLv3.png"))); - lblGPL3.setBounds(315, 283, 139, 70); + lblGPL3.setIcon(new ImageIcon(getClass().getResource("/resources/GPLv3.png"))); + lblGPL3.setBounds(315, 271, 139, 59); getContentPane().add(lblGPL3); JLabel lblNewVersion = new JLabel(""); @@ -135,7 +138,14 @@ public final class about extends JFrame { lblNewVersion.setBounds(20, 151, 240, 37); getContentPane().add(lblNewVersion); - + JButton btnLicence = new JButton("Licence"); + btnLicence.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + showLicenceFrame(); + } + }); + btnLicence.setBounds(270, 330, 222, 23); + getContentPane().add(btnLicence); } @@ -146,4 +156,46 @@ public final class about extends JFrame { instance.setVisible(true); return instance; } -} + + + + + private static void showLicenceFrame() { + // Créer une nouvelle fenêtre pour afficher la licence + JFrame licenceFrame = new JFrame("GNU GPL 3.0 Licence"); + licenceFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + licenceFrame.setSize(600, 400); + + // Créer un JEditorPane pour afficher le contenu HTML + JEditorPane editorPane = new JEditorPane(); + editorPane.setEditable(false); + try { + // Obtenir l'URL du fichier HTML + URL url = about.class.getResource("/resources/licenceGNUGPL3.html"); + if (url != null) { + // Convertir l'URL en chemin absolu + File file = new File(url.toURI()); + String content = new String(Files.readAllBytes(file.toPath())); + + // Afficher le contenu dans le JEditorPane + editorPane.setContentType("text/html"); + editorPane.setText(content); + } else { + editorPane.setText("Fichier licenceGNUGPL3.html non trouvé."); + } + } catch (IOException | URISyntaxException ex) { + editorPane.setText("Erreur lors du chargement de la licence."); + } + + // Ajouter le JEditorPane à un JScrollPane pour permettre le défilement + JScrollPane scrollPane = new JScrollPane(editorPane); + + // Ajouter le JScrollPane à la fenêtre + licenceFrame.getContentPane().add(scrollPane, BorderLayout.CENTER); + licenceFrame.setVisible(true); + } + + + } + + diff --git a/src/com/analyseWriter/fenetres/addAttributAndValue.java b/src/analyseWriter/fenetres/addAttributAndValue.java similarity index 91% rename from src/com/analyseWriter/fenetres/addAttributAndValue.java rename to src/analyseWriter/fenetres/addAttributAndValue.java index f761b39..53c0d3c 100644 --- a/src/com/analyseWriter/fenetres/addAttributAndValue.java +++ b/src/analyseWriter/fenetres/addAttributAndValue.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.EventQueue; diff --git a/src/com/analyseWriter/fenetres/afficheText.java b/src/analyseWriter/fenetres/afficheText.java similarity index 96% rename from src/com/analyseWriter/fenetres/afficheText.java rename to src/analyseWriter/fenetres/afficheText.java index 90f0d5b..f50107e 100644 --- a/src/com/analyseWriter/fenetres/afficheText.java +++ b/src/analyseWriter/fenetres/afficheText.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Desktop; import java.io.IOException; @@ -16,13 +16,13 @@ import javax.swing.JEditorPane; import javax.swing.event.HyperlinkEvent; import javax.swing.text.DefaultCaret; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.calcul.calculIntervalleBaremeABCDE; +import analyseWriter.calcul.calculNotesProgression; +import analyseWriter.evaluer.evaluation; +import analyseWriter.list.descriptionNode; +import analyseWriter.list.listeAttributsAnalyseWriter; import cXML.node; -import calcul.calculIntervalleBaremeABCDE; -import calcul.calculNotesProgression; -import evaluer.evaluation; -import list.descriptionNode; -import list.listeAttributsAnalyseWriter; public class afficheText extends JEditorPane { @@ -482,14 +482,14 @@ public class afficheText extends JEditorPane { text.append("

Le sujet (metaSujet) est : " + commandes.analyse_metaSujet+"

"); text.append("

L'auteur de l'exercice est : " + commandes.analyse_auteur+"

"); if(commandes.sujet.getAttributs().get("date")!=null) { - dateEnregistrementFichierAnalyse = calcul.formatDateWriter.DateEnClairFR(calcul.formatDateWriter.DateLibreOffice(commandes.sujet.getAttributs().get("date"))); + dateEnregistrementFichierAnalyse = analyseWriter.calcul.formatDateWriter.DateEnClairFR(analyseWriter.calcul.formatDateWriter.DateLibreOffice(commandes.sujet.getAttributs().get("date"))); text.append("

Date d'enregistrement du fichier d'analyse : " + dateEnregistrementFichierAnalyse +"

"); } text.append("

"); if(commandes.analyse_baremeABC==true) { text.append("

La notation est sous la forme d'une note alphabétique ABCDE.

"); text.append("

La progression est de " + String.valueOf(commandes.analyse_progression)+ "

"); - calcul.calculIntervalleBaremeABCDE C = new calculIntervalleBaremeABCDE(commandes.analyse_progression); + analyseWriter.calcul.calculIntervalleBaremeABCDE C = new calculIntervalleBaremeABCDE(commandes.analyse_progression); text.append("

" + C.getMessageLigne() + "

"); }else { text.append("

La notation est sous la forme d'une note numérique.

"); diff --git a/src/com/analyseWriter/fenetres/allContent.java b/src/analyseWriter/fenetres/allContent.java similarity index 90% rename from src/com/analyseWriter/fenetres/allContent.java rename to src/analyseWriter/fenetres/allContent.java index 30c4bdf..e4a2e23 100644 --- a/src/com/analyseWriter/fenetres/allContent.java +++ b/src/analyseWriter/fenetres/allContent.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; @@ -23,9 +23,9 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.list.listeDesNodesAllContent; import cXML.node; -import list.listeDesNodesAllContent; public class allContent extends JFrame { @@ -230,13 +230,13 @@ public class allContent extends JFrame { } J.refreshAffichage(nod); - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); dispose(); } catch (Exception e2) { JOptionPane.showMessageDialog(null, "Le nombre de point doit être un entier."); @@ -256,13 +256,13 @@ public class allContent extends JFrame { supprimeAttributAllConetnetDansLesNodesFreres(nod); } J.refreshAffichage(nod); - TreePath path = com.analyseWriter.fenetres.create.getTree().getSelectionPath(); - DefaultTreeModel model = (DefaultTreeModel) com.analyseWriter.fenetres.create.getTree().getModel(); + TreePath path = analyseWriter.fenetres.create.getTree().getSelectionPath(); + DefaultTreeModel model = (DefaultTreeModel) analyseWriter.fenetres.create.getTree().getModel(); DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot(); model.reload(root); - com.analyseWriter.fenetres.create.getTree().setSelectionPath(path); - com.analyseWriter.fenetres.create.getTree().expandPath(path); - com.analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); + analyseWriter.fenetres.create.getTree().setSelectionPath(path); + analyseWriter.fenetres.create.getTree().expandPath(path); + analyseWriter.fenetres.create.getTextNodeSelect().refreshAffichage(nod); dispose(); } }); diff --git a/src/com/analyseWriter/fenetres/attributs.java b/src/analyseWriter/fenetres/attributs.java similarity index 96% rename from src/com/analyseWriter/fenetres/attributs.java rename to src/analyseWriter/fenetres/attributs.java index 264fc39..c2d5642 100644 --- a/src/com/analyseWriter/fenetres/attributs.java +++ b/src/analyseWriter/fenetres/attributs.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.Color; @@ -26,12 +26,12 @@ import javax.swing.JScrollPane; import javax.swing.JTextField; import javax.swing.border.EmptyBorder; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.list.listeAttributWriterPasEvaluableAvecCodeEvaluateur; +import analyseWriter.list.listeAttributWriterValeurPasModifiable; +import analyseWriter.list.listeAttributsAnalyseWriter; +import analyseWriter.list.listeNodeFormatageDirectDeWriter; import cXML.node; -import list.listeAttributWriterPasEvaluableAvecCodeEvaluateur; -import list.listeAttributWriterValeurPasModifiable; -import list.listeAttributsAnalyseWriter; -import list.listeNodeFormatageDirectDeWriter; import net.miginfocom.swing.MigLayout; diff --git a/src/com/analyseWriter/fenetres/baliseStyle.java b/src/analyseWriter/fenetres/baliseStyle.java similarity index 97% rename from src/com/analyseWriter/fenetres/baliseStyle.java rename to src/analyseWriter/fenetres/baliseStyle.java index b41fc79..8b48de5 100644 --- a/src/com/analyseWriter/fenetres/baliseStyle.java +++ b/src/analyseWriter/fenetres/baliseStyle.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; public class baliseStyle { diff --git a/src/com/analyseWriter/fenetres/baseDonneesEvaluations.java b/src/analyseWriter/fenetres/baseDonneesEvaluations.java similarity index 95% rename from src/com/analyseWriter/fenetres/baseDonneesEvaluations.java rename to src/analyseWriter/fenetres/baseDonneesEvaluations.java index 605d0d7..7e49a01 100644 --- a/src/com/analyseWriter/fenetres/baseDonneesEvaluations.java +++ b/src/analyseWriter/fenetres/baseDonneesEvaluations.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.Color; @@ -31,13 +31,13 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.TableColumnModel; -import MEPTL.commandes; -import baseEvaluations.chargeEvaluation; -import baseEvaluations.creerNouvelleEvaluation; -import baseEvaluations.myTableBaseEvaluation; -import baseEvaluations.recupeNodeBaseEvaluations; -import baseEvaluations.removeEvaluation; -import baseEvaluations.trierParDateDecroissanteLaBase; +import analyseWriter.MEPTL.commandes; +import analyseWriter.baseEvaluations.chargeEvaluation; +import analyseWriter.baseEvaluations.creerNouvelleEvaluation; +import analyseWriter.baseEvaluations.myTableBaseEvaluation; +import analyseWriter.baseEvaluations.recupeNodeBaseEvaluations; +import analyseWriter.baseEvaluations.removeEvaluation; +import analyseWriter.baseEvaluations.trierParDateDecroissanteLaBase; import cXML.Run; import cXML.node; import net.lingala.zip4j.exception.ZipException; diff --git a/src/com/analyseWriter/fenetres/baseDonneesListesEtudiants.java b/src/analyseWriter/fenetres/baseDonneesListesEtudiants.java similarity index 95% rename from src/com/analyseWriter/fenetres/baseDonneesListesEtudiants.java rename to src/analyseWriter/fenetres/baseDonneesListesEtudiants.java index b7d3b3b..1a1f3d3 100644 --- a/src/com/analyseWriter/fenetres/baseDonneesListesEtudiants.java +++ b/src/analyseWriter/fenetres/baseDonneesListesEtudiants.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.Color; @@ -24,14 +24,14 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.TableColumnModel; -import MEPTL.commandes; -import baseListesEtudiants.EmailValidator; -import baseListesEtudiants.chargeListeEtudiants; -import baseListesEtudiants.ecritureBaseListesEtudiants; -import baseListesEtudiants.idValidator; -import baseListesEtudiants.myTableBaseListesEtudiants; -import baseListesEtudiants.myTableStudent; -import baseListesEtudiants.nameStudentValidator; +import analyseWriter.MEPTL.commandes; +import analyseWriter.baseListesEtudiants.EmailValidator; +import analyseWriter.baseListesEtudiants.chargeListeEtudiants; +import analyseWriter.baseListesEtudiants.ecritureBaseListesEtudiants; +import analyseWriter.baseListesEtudiants.idValidator; +import analyseWriter.baseListesEtudiants.myTableBaseListesEtudiants; +import analyseWriter.baseListesEtudiants.myTableStudent; +import analyseWriter.baseListesEtudiants.nameStudentValidator; import cXML.node; import net.miginfocom.swing.MigLayout; diff --git a/src/com/analyseWriter/fenetres/chargeBaseAuDemarrage.java b/src/analyseWriter/fenetres/chargeBaseAuDemarrage.java similarity index 93% rename from src/com/analyseWriter/fenetres/chargeBaseAuDemarrage.java rename to src/analyseWriter/fenetres/chargeBaseAuDemarrage.java index daa260b..791e412 100644 --- a/src/com/analyseWriter/fenetres/chargeBaseAuDemarrage.java +++ b/src/analyseWriter/fenetres/chargeBaseAuDemarrage.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.Color; @@ -21,10 +21,10 @@ import javax.swing.SwingConstants; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import MEPTL.commandes; -import action.actOpenBaseEvaluation; -import baseEvaluations.chargeEvaluation; -import baseEvaluations.myTableBaseEvaluation; +import analyseWriter.MEPTL.commandes; +import analyseWriter.action.actOpenBaseEvaluation; +import analyseWriter.baseEvaluations.chargeEvaluation; +import analyseWriter.baseEvaluations.myTableBaseEvaluation; import net.miginfocom.swing.MigLayout; public class chargeBaseAuDemarrage extends JFrame { diff --git a/src/com/analyseWriter/fenetres/create.java b/src/analyseWriter/fenetres/create.java similarity index 88% rename from src/com/analyseWriter/fenetres/create.java rename to src/analyseWriter/fenetres/create.java index e37e245..7691f72 100644 --- a/src/com/analyseWriter/fenetres/create.java +++ b/src/analyseWriter/fenetres/create.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.Color; @@ -39,78 +39,78 @@ import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import MEPTL.commandes; -import action.actAPropos; -import action.actAbout; -import action.actAfficheInformationFichierAnalyse; -import action.actAllContent; -import action.actAttribut; -import action.actCollapseAll; -import action.actCollapseNode; -import action.actDeleteNode; -import action.actDocumentation; -import action.actDownNode; -import action.actEvalAncrageNumeroAbsoluePageOui; -import action.actEvalEnteteActive; -import action.actEvalEntetePasActive; -import action.actEvalFirstChildTrue; -import action.actEvalFormatageDirect; -import action.actEvalInitialCreator; -import action.actEvalLastChildTrue; -import action.actEvalNameNodeOui; -import action.actEvalNamePageOui; -import action.actEvalNameSequenceOui; -import action.actEvalNombreParagraphe; -import action.actEvalNumeroAbsoluePageOui; -import action.actEvalNumeroPageOui; -import action.actEvalPasParagrapheVideOui; -import action.actEvalPiedPageActive; -import action.actEvalPiedPagePasActive; -import action.actEvalPlacementParagrapheOui; -import action.actEvalSautPageColonneOui; -import action.actEvalTabAlignementGaucheOui; -import action.actEvalTabDefautStyleLeaderOui; -import action.actEvalTextUserDefinedOui; -import action.actEvalueFalse; -import action.actEvalueTrue; -import action.actEvaluer; -import action.actEvaluerATraversAnalyseStyleTrue; -import action.actEvaluerNomDuStyleHeriteTrue; -import action.actEvaluerStyleTrue; -import action.actEvaluerTousEnfantsFalse; -import action.actEvaluerTousEnfantsTrue; -import action.actExit; -import action.actExpandAll; -import action.actExpandNode; -import action.actLicence; -import action.actNewFichierAnalyse; -import action.actNodeFichier; -import action.actOpenBaseEvaluation; -import action.actSaveEvaluation; -import action.actSetting; -import action.actTitre1; -import action.actTitre2; -import action.actTitre3; -import action.actTotalPoint; -import action.actTotalPointNode; -import action.actTutoriels; -import action.actUpNode; -import action.actevalNameCreator; +import analyseWriter.MEPTL.commandes; +import analyseWriter.action.actAPropos; +import analyseWriter.action.actAbout; +import analyseWriter.action.actAfficheInformationFichierAnalyse; +import analyseWriter.action.actAllContent; +import analyseWriter.action.actAttribut; +import analyseWriter.action.actCollapseAll; +import analyseWriter.action.actCollapseNode; +import analyseWriter.action.actDeleteNode; +import analyseWriter.action.actDocumentation; +import analyseWriter.action.actDownNode; +import analyseWriter.action.actEvalAncrageNumeroAbsoluePageOui; +import analyseWriter.action.actEvalEnteteActive; +import analyseWriter.action.actEvalEntetePasActive; +import analyseWriter.action.actEvalFirstChildTrue; +import analyseWriter.action.actEvalFormatageDirect; +import analyseWriter.action.actEvalInitialCreator; +import analyseWriter.action.actEvalLastChildTrue; +import analyseWriter.action.actEvalNameNodeOui; +import analyseWriter.action.actEvalNamePageOui; +import analyseWriter.action.actEvalNameSequenceOui; +import analyseWriter.action.actEvalNombreParagraphe; +import analyseWriter.action.actEvalNumeroAbsoluePageOui; +import analyseWriter.action.actEvalNumeroPageOui; +import analyseWriter.action.actEvalPasParagrapheVideOui; +import analyseWriter.action.actEvalPiedPageActive; +import analyseWriter.action.actEvalPiedPagePasActive; +import analyseWriter.action.actEvalPlacementParagrapheOui; +import analyseWriter.action.actEvalSautPageColonneOui; +import analyseWriter.action.actEvalTabAlignementGaucheOui; +import analyseWriter.action.actEvalTabDefautStyleLeaderOui; +import analyseWriter.action.actEvalTextUserDefinedOui; +import analyseWriter.action.actEvalueFalse; +import analyseWriter.action.actEvalueTrue; +import analyseWriter.action.actEvaluer; +import analyseWriter.action.actEvaluerATraversAnalyseStyleTrue; +import analyseWriter.action.actEvaluerNomDuStyleHeriteTrue; +import analyseWriter.action.actEvaluerStyleTrue; +import analyseWriter.action.actEvaluerTousEnfantsFalse; +import analyseWriter.action.actEvaluerTousEnfantsTrue; +import analyseWriter.action.actExit; +import analyseWriter.action.actExpandAll; +import analyseWriter.action.actExpandNode; +import analyseWriter.action.actLicence; +import analyseWriter.action.actNewFichierAnalyse; +import analyseWriter.action.actNodeFichier; +import analyseWriter.action.actOpenBaseEvaluation; +import analyseWriter.action.actSaveEvaluation; +import analyseWriter.action.actSetting; +import analyseWriter.action.actTitre1; +import analyseWriter.action.actTitre2; +import analyseWriter.action.actTitre3; +import analyseWriter.action.actTotalPoint; +import analyseWriter.action.actTotalPointNode; +import analyseWriter.action.actTutoriels; +import analyseWriter.action.actUpNode; +import analyseWriter.action.actevalNameCreator; +import analyseWriter.fenetres.menu.menucontextuel.CreatePopupMenu; +import analyseWriter.list.listeDesNodesAllContent; +import analyseWriter.list.listeDesNodesAnalyseStyle; +import analyseWriter.list.listeDesNodesAncrable; +import analyseWriter.list.listeDesNodesContenantPargraphesOuTitres; +import analyseWriter.list.listeDesNodesContenantSaut; +import analyseWriter.list.listeDesNodesEvalPlacement; +import analyseWriter.list.listeDesNodesFormatageDirect; +import analyseWriter.list.listeDesNodesPourEvaluationEntetePage; +import analyseWriter.list.listeDesNodesPourEvaluerPage; +import analyseWriter.list.listeDesNodesPourEvaluerPiedDePage; +import analyseWriter.list.listeDesNodesTabStop; +import analyseWriter.list.listeEvalNameNode; import cXML.Run; import cXML.node; -import list.listeDesNodesAllContent; -import list.listeDesNodesAnalyseStyle; -import list.listeDesNodesAncrable; -import list.listeDesNodesContenantPargraphesOuTitres; -import list.listeDesNodesContenantSaut; -import list.listeDesNodesEvalPlacement; -import list.listeDesNodesFormatageDirect; -import list.listeDesNodesPourEvaluationEntetePage; -import list.listeDesNodesPourEvaluerPage; -import list.listeDesNodesPourEvaluerPiedDePage; -import list.listeDesNodesTabStop; -import list.listeEvalNameNode; -import menucontextuel.CreatePopupMenu; import net.miginfocom.swing.MigLayout; @@ -936,10 +936,10 @@ public final class create extends JFrame { private static void lectureFichierDejaCharger() { if(commandes.fichierAnalyseValide) { tree.setVisible(true); - com.analyseWriter.fenetres.create.constructionTree(); - com.analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); - com.analyseWriter.fenetres.create.getButtonEvaluate().setEnabled(true); - com.analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); + analyseWriter.fenetres.create.constructionTree(); + analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); + analyseWriter.fenetres.create.getButtonEvaluate().setEnabled(true); + analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); btnevalNameLegacyStyleTrue.setEnabled(false); btnanalyseStyletrue.setEnabled(false); @@ -970,7 +970,7 @@ public final class create extends JFrame { }else { - com.analyseWriter.fenetres.create.getTextNodeSelect().setContentType("text/plain"); + analyseWriter.fenetres.create.getTextNodeSelect().setContentType("text/plain"); } } diff --git a/src/com/analyseWriter/fenetres/evaluate.java b/src/analyseWriter/fenetres/evaluate.java similarity index 96% rename from src/com/analyseWriter/fenetres/evaluate.java rename to src/analyseWriter/fenetres/evaluate.java index 9365fed..892a501 100644 --- a/src/com/analyseWriter/fenetres/evaluate.java +++ b/src/analyseWriter/fenetres/evaluate.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.Color; @@ -33,19 +33,19 @@ import javax.swing.border.EmptyBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import MEPTL.commandes; -import MEPTL.meptl; -import MEPTL.verificationFichierAnalyse_node_commandesSujet; -import action.actAbout; -import action.actDocumentation; -import action.actExit; -import action.actLicence; -import action.actOpenBaseEvaluation; -import action.actOpenBaseListesEtudiants; -import action.actSaveEvaluation; -import action.actTutoriels; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.meptl; +import analyseWriter.MEPTL.verificationFichierAnalyse_node_commandesSujet; +import analyseWriter.action.actAbout; +import analyseWriter.action.actDocumentation; +import analyseWriter.action.actExit; +import analyseWriter.action.actLicence; +import analyseWriter.action.actOpenBaseEvaluation; +import analyseWriter.action.actOpenBaseListesEtudiants; +import analyseWriter.action.actSaveEvaluation; +import analyseWriter.action.actTutoriels; +import analyseWriter.evaluer.evaluerLesFichiersEtudiants; import cXML.Run; -import evaluer.evaluerLesFichiersEtudiants; import net.miginfocom.swing.MigLayout; /** diff --git a/src/com/analyseWriter/fenetres/mainApp.java b/src/analyseWriter/fenetres/mainApp.java similarity index 92% rename from src/com/analyseWriter/fenetres/mainApp.java rename to src/analyseWriter/fenetres/mainApp.java index bbb0fa5..63d9efa 100644 --- a/src/com/analyseWriter/fenetres/mainApp.java +++ b/src/analyseWriter/fenetres/mainApp.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; import java.awt.Font; @@ -16,13 +16,13 @@ import javax.swing.JOptionPane; import javax.swing.SwingConstants; import javax.swing.UIManager; -import MEPTL.commandes; -import OnLineVersions.verificationNewVersion; -import action.actAbout; -import baseEvaluations.CreerBaseParDefautEvaluation; -import baseEvaluations.recupeNodeBaseEvaluations; -import baseEvaluations.validatorBaseEvaluation; -import baseListesEtudiants.CreerBaseParDefautListesEtudiants; +import analyseWriter.MEPTL.commandes; +import analyseWriter.OnLineVersions.verificationNewVersion; +import analyseWriter.action.actAbout; +import analyseWriter.baseEvaluations.CreerBaseParDefautEvaluation; +import analyseWriter.baseEvaluations.recupeNodeBaseEvaluations; +import analyseWriter.baseEvaluations.validatorBaseEvaluation; +import analyseWriter.baseListesEtudiants.CreerBaseParDefautListesEtudiants; public class mainApp extends JFrame implements ActionListener{ diff --git a/Menu/menucontextuel/CreatePopupMenu.java b/src/analyseWriter/fenetres/menu/menucontextuel/CreatePopupMenu.java similarity index 76% rename from Menu/menucontextuel/CreatePopupMenu.java rename to src/analyseWriter/fenetres/menu/menucontextuel/CreatePopupMenu.java index 6da13b8..263947a 100644 --- a/Menu/menucontextuel/CreatePopupMenu.java +++ b/src/analyseWriter/fenetres/menu/menucontextuel/CreatePopupMenu.java @@ -1,29 +1,28 @@ -package menucontextuel; +package analyseWriter.fenetres.menu.menucontextuel; import javax.swing.ImageIcon; import javax.swing.JMenu; import javax.swing.JPopupMenu; -import com.analyseWriter.fenetres.create; - -import action.actAttribut; -import action.actCoefficient; -import action.actCopy; -import action.actDeleteNode; -import action.actOu; -import action.actPaste; +import analyseWriter.action.actAttribut; +import analyseWriter.action.actCoefficient; +import analyseWriter.action.actCopy; +import analyseWriter.action.actDeleteNode; +import analyseWriter.action.actOu; +import analyseWriter.action.actPaste; +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.menu.sousmenuArbre.mnArbre; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvaluer; +import analyseWriter.list.listeDesNodesAEvaluer; +import analyseWriter.list.listeDesNodesAllContent; +import analyseWriter.list.listeDesNodesAvecOU; +import analyseWriter.list.listeDesNodesPourEvaluationEntetePage; +import analyseWriter.list.listeDesNodesPourEvaluerPage; +import analyseWriter.list.listeDesNodesPourEvaluerPiedDePage; +import analyseWriter.list.listeDesNodesRechercheByContenu; +import analyseWriter.list.listeEvalNameNode; +import analyseWriter.list.listeRechercheParAnchorPageNumber; import cXML.node; -import list.listeDesNodesAEvaluer; -import list.listeDesNodesAllContent; -import list.listeDesNodesAvecOU; -import list.listeDesNodesPourEvaluationEntetePage; -import list.listeDesNodesPourEvaluerPage; -import list.listeDesNodesPourEvaluerPiedDePage; -import list.listeDesNodesRechercheByContenu; -import list.listeEvalNameNode; -import list.listeRechercheParAnchorPageNumber; -import sousmenuArbre.mnArbre; -import sousmenuEvaluation.mnEvaluer; /** * Le menu contextuel des nodes dans le tree.
diff --git a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java b/src/analyseWriter/fenetres/menu/menucontextuel/MnGroupeMethodeEvaluer.java similarity index 68% rename from Menu/menucontextuel/MnGroupeMethodeEvaluer.java rename to src/analyseWriter/fenetres/menu/menucontextuel/MnGroupeMethodeEvaluer.java index 8f94cfc..c913bf1 100644 --- a/Menu/menucontextuel/MnGroupeMethodeEvaluer.java +++ b/src/analyseWriter/fenetres/menu/menucontextuel/MnGroupeMethodeEvaluer.java @@ -1,48 +1,47 @@ -package menucontextuel; +package analyseWriter.fenetres.menu.menucontextuel; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actAllContent; -import action.actEvalAncrageNumeroAbsoluePageOui; -import action.actEvalFirstChildTrue; -import action.actEvalFormatageDirect; -import action.actEvalInitialCreator; -import action.actEvalLastChildTrue; -import action.actEvalNameNodeOui; -import action.actEvalNamePageOui; -import action.actEvalNumeroAbsoluePageOui; -import action.actEvalNumeroPageOui; -import action.actEvalPasParagrapheVideOui; -import action.actEvalPlacementParagrapheOui; -import action.actEvalSautPageColonneOui; -import action.actEvaluerNomDuStyleHeriteTrue; -import action.actEvaluerStyleTrue; -import action.actevalNameCreator; +import analyseWriter.action.actAllContent; +import analyseWriter.action.actEvalAncrageNumeroAbsoluePageOui; +import analyseWriter.action.actEvalFirstChildTrue; +import analyseWriter.action.actEvalFormatageDirect; +import analyseWriter.action.actEvalInitialCreator; +import analyseWriter.action.actEvalLastChildTrue; +import analyseWriter.action.actEvalNameNodeOui; +import analyseWriter.action.actEvalNamePageOui; +import analyseWriter.action.actEvalNumeroAbsoluePageOui; +import analyseWriter.action.actEvalNumeroPageOui; +import analyseWriter.action.actEvalPasParagrapheVideOui; +import analyseWriter.action.actEvalPlacementParagrapheOui; +import analyseWriter.action.actEvalSautPageColonneOui; +import analyseWriter.action.actEvaluerNomDuStyleHeriteTrue; +import analyseWriter.action.actEvaluerStyleTrue; +import analyseWriter.action.actevalNameCreator; +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalEnteteActive; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalEntetePasActive; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalLegacyStyleParentPresent; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalNameSequence; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalPiedPageActive; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalPiedPagePasActive; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalTabAlignementGauche; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalTabDefautStyleLeader; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvalTextUserDefined; +import analyseWriter.fenetres.menu.sousmenuEvaluation.mnEvaluerATraversAnalyseStyle; +import analyseWriter.list.listeDesNodesAllContent; +import analyseWriter.list.listeDesNodesAnalyseStyle; +import analyseWriter.list.listeDesNodesAncrable; +import analyseWriter.list.listeDesNodesContenantSaut; +import analyseWriter.list.listeDesNodesEvalPlacement; +import analyseWriter.list.listeDesNodesFormatageDirect; +import analyseWriter.list.listeDesNodesPourEvaluationEntetePage; +import analyseWriter.list.listeDesNodesPourEvaluerPage; +import analyseWriter.list.listeDesNodesPourEvaluerPiedDePage; +import analyseWriter.list.listeDesNodesTabStop; +import analyseWriter.list.listeEvalNameNode; import cXML.node; -import list.listeDesNodesAllContent; -import list.listeDesNodesAnalyseStyle; -import list.listeDesNodesAncrable; -import list.listeDesNodesContenantSaut; -import list.listeDesNodesEvalPlacement; -import list.listeDesNodesFormatageDirect; -import list.listeDesNodesPourEvaluationEntetePage; -import list.listeDesNodesPourEvaluerPage; -import list.listeDesNodesPourEvaluerPiedDePage; -import list.listeDesNodesTabStop; -import list.listeEvalNameNode; -import sousmenuEvaluation.mnEvalEnteteActive; -import sousmenuEvaluation.mnEvalEntetePasActive; -import sousmenuEvaluation.mnEvalLegacyStyleParentPresent; -import sousmenuEvaluation.mnEvalNameSequence; -import sousmenuEvaluation.mnEvalPiedPageActive; -import sousmenuEvaluation.mnEvalPiedPagePasActive; -import sousmenuEvaluation.mnEvalTabAlignementGauche; -import sousmenuEvaluation.mnEvalTabDefautStyleLeader; -import sousmenuEvaluation.mnEvalTextUserDefined; -import sousmenuEvaluation.mnEvaluerATraversAnalyseStyle; public class MnGroupeMethodeEvaluer { diff --git a/Menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java b/src/analyseWriter/fenetres/menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java similarity index 95% rename from Menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java rename to src/analyseWriter/fenetres/menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java index 8ef38b2..f56722b 100644 --- a/Menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java +++ b/src/analyseWriter/fenetres/menu/menucontextuel/MnGroupeMethodeEvaluerMultiple.java @@ -1,4 +1,4 @@ -package menucontextuel; +package analyseWriter.fenetres.menu.menucontextuel; /** * Pour évaluer les nodes enfants. diff --git a/Menu/menucontextuel/MnGroupePourFeedback.java b/src/analyseWriter/fenetres/menu/menucontextuel/MnGroupePourFeedback.java similarity index 59% rename from Menu/menucontextuel/MnGroupePourFeedback.java rename to src/analyseWriter/fenetres/menu/menucontextuel/MnGroupePourFeedback.java index ac486b7..e1dd08f 100644 --- a/Menu/menucontextuel/MnGroupePourFeedback.java +++ b/src/analyseWriter/fenetres/menu/menucontextuel/MnGroupePourFeedback.java @@ -1,20 +1,19 @@ -package menucontextuel; +package analyseWriter.fenetres.menu.menucontextuel; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnAddMenuNiveauSup1; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnInsereInformation; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnInsereInformationMultiple; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnMarqueNode; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnSaut; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnSautMultiple; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnTitre; +import analyseWriter.list.listeDesNodesInfos; +import analyseWriter.list.listeDesNodesPourEvaluerPage; import cXML.node; -import list.listeDesNodesInfos; -import list.listeDesNodesPourEvaluerPage; -import sousmenuRepresentation.mnAddMenuNiveauSup1; -import sousmenuRepresentation.mnInsereInformation; -import sousmenuRepresentation.mnInsereInformationMultiple; -import sousmenuRepresentation.mnMarqueNode; -import sousmenuRepresentation.mnSaut; -import sousmenuRepresentation.mnSautMultiple; -import sousmenuRepresentation.mnTitre; /** * Menu pour la représentation dans les feedbacks des étudiants.
diff --git a/Menu/menucontextuel/MnGroupePourFeedbackNiveau1.java b/src/analyseWriter/fenetres/menu/menucontextuel/MnGroupePourFeedbackNiveau1.java similarity index 66% rename from Menu/menucontextuel/MnGroupePourFeedbackNiveau1.java rename to src/analyseWriter/fenetres/menu/menucontextuel/MnGroupePourFeedbackNiveau1.java index 605243c..4abff45 100644 --- a/Menu/menucontextuel/MnGroupePourFeedbackNiveau1.java +++ b/src/analyseWriter/fenetres/menu/menucontextuel/MnGroupePourFeedbackNiveau1.java @@ -1,15 +1,14 @@ -package menucontextuel; +package analyseWriter.fenetres.menu.menucontextuel; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnAddMenuNiveau1; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnSautNiveau1; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnTitreNiveau1; +import analyseWriter.fenetres.menu.sousmenuRepresentation.mnaddTitreToutesLesPages; import cXML.node; -import sousmenuRepresentation.mnAddMenuNiveau1; -import sousmenuRepresentation.mnSautNiveau1; -import sousmenuRepresentation.mnTitreNiveau1; -import sousmenuRepresentation.mnaddTitreToutesLesPages; /** * Menu pour la représentation des nodes de niveau 1.
diff --git a/Menu/menucontextuel/mnGroupeRechercheContenu.java b/src/analyseWriter/fenetres/menu/menucontextuel/mnGroupeRechercheContenu.java similarity index 67% rename from Menu/menucontextuel/mnGroupeRechercheContenu.java rename to src/analyseWriter/fenetres/menu/menucontextuel/mnGroupeRechercheContenu.java index 442dab7..38df8a8 100644 --- a/Menu/menucontextuel/mnGroupeRechercheContenu.java +++ b/src/analyseWriter/fenetres/menu/menucontextuel/mnGroupeRechercheContenu.java @@ -1,17 +1,16 @@ -package menucontextuel; +package analyseWriter.fenetres.menu.menucontextuel; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - +import analyseWriter.fenetres.create; +import analyseWriter.fenetres.menu.sousmenuRecherche.mnRechercheContenuExact; +import analyseWriter.fenetres.menu.sousmenuRecherche.mnRechercheContenuPlusProcheVoisin; +import analyseWriter.fenetres.menu.sousmenuRecherche.mnRechercheIndex; +import analyseWriter.fenetres.menu.sousmenuRecherche.mnRechercheParNumeroPageAncrer; +import analyseWriter.list.listeDesNodesRechercheByContenu; +import analyseWriter.list.listeRechercheParAnchorPageNumber; import cXML.node; -import list.listeDesNodesRechercheByContenu; -import list.listeRechercheParAnchorPageNumber; -import sousmenuRecherche.mnRechercheContenuExact; -import sousmenuRecherche.mnRechercheContenuPlusProcheVoisin; -import sousmenuRecherche.mnRechercheIndex; -import sousmenuRecherche.mnRechercheParNumeroPageAncrer; /** * Menu regroupant les menus permettant de recherche un node par son contenu textuel.
diff --git a/Menu/sousmenuArbre/mnArbre.java b/src/analyseWriter/fenetres/menu/sousmenuArbre/mnArbre.java similarity index 60% rename from Menu/sousmenuArbre/mnArbre.java rename to src/analyseWriter/fenetres/menu/sousmenuArbre/mnArbre.java index 6a6db3f..463c687 100644 --- a/Menu/sousmenuArbre/mnArbre.java +++ b/src/analyseWriter/fenetres/menu/sousmenuArbre/mnArbre.java @@ -1,13 +1,13 @@ -package sousmenuArbre; +package analyseWriter.fenetres.menu.sousmenuArbre; import javax.swing.JMenu; -import action.actCollapseAll; -import action.actCollapseNode; -import action.actDownNode; -import action.actExpandAll; -import action.actExpandNode; -import action.actUpNode; +import analyseWriter.action.actCollapseAll; +import analyseWriter.action.actCollapseNode; +import analyseWriter.action.actDownNode; +import analyseWriter.action.actExpandAll; +import analyseWriter.action.actExpandNode; +import analyseWriter.action.actUpNode; /** * Menu Arbre.
diff --git a/Menu/sousmenuEvaluation/mnAnalyseStyleTousLesNodes.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnAnalyseStyleTousLesNodes.java similarity index 65% rename from Menu/sousmenuEvaluation/mnAnalyseStyleTousLesNodes.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnAnalyseStyleTousLesNodes.java index d317a2a..7445baf 100644 --- a/Menu/sousmenuEvaluation/mnAnalyseStyleTousLesNodes.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnAnalyseStyleTousLesNodes.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvaluerStyleTousLesNodesTrue; -import action.actEvaluerStyleTouslesNodesFalse; +import analyseWriter.action.actEvaluerStyleTousLesNodesTrue; +import analyseWriter.action.actEvaluerStyleTouslesNodesFalse; +import analyseWriter.fenetres.create; public class mnAnalyseStyleTousLesNodes { public static JMenu menu() { diff --git a/Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java similarity index 82% rename from Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java index 1ff62c0..7c945f5 100644 --- a/Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPage.java @@ -1,11 +1,10 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalAncrageNumeroAbsoluePageOui; +import analyseWriter.action.actEvalAncrageNumeroAbsoluePageOui; +import analyseWriter.fenetres.create; /** * Evaluation de l'ancrage du node dans la page par son numéro absolue.
diff --git a/Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPageEnfants.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPageEnfants.java similarity index 71% rename from Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPageEnfants.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPageEnfants.java index ceb70e8..ed641a1 100644 --- a/Menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPageEnfants.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalAncrageNumeroAbsoluPageEnfants.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalAncrageNumeroAbsoluePageEnfantsNon; -import action.actEvalAncrageNumeroAbsoluePageEnfantsOui; +import analyseWriter.action.actEvalAncrageNumeroAbsoluePageEnfantsNon; +import analyseWriter.action.actEvalAncrageNumeroAbsoluePageEnfantsOui; +import analyseWriter.fenetres.create; /** * diff --git a/Menu/sousmenuEvaluation/mnEvalEnteteActive.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalEnteteActive.java similarity index 72% rename from Menu/sousmenuEvaluation/mnEvalEnteteActive.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalEnteteActive.java index 293e3f2..75fb7bf 100644 --- a/Menu/sousmenuEvaluation/mnEvalEnteteActive.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalEnteteActive.java @@ -1,11 +1,10 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalEnteteActive; +import analyseWriter.action.actEvalEnteteActive; +import analyseWriter.fenetres.create; /** * Menu entête active.
diff --git a/Menu/sousmenuEvaluation/mnEvalEntetePasActive.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalEntetePasActive.java similarity index 72% rename from Menu/sousmenuEvaluation/mnEvalEntetePasActive.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalEntetePasActive.java index 965c03a..d7358a4 100644 --- a/Menu/sousmenuEvaluation/mnEvalEntetePasActive.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalEntetePasActive.java @@ -1,11 +1,10 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalEntetePasActive; +import analyseWriter.action.actEvalEntetePasActive; +import analyseWriter.fenetres.create; /** * Menu entête pas active.
diff --git a/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalFormatageDirect.java similarity index 88% rename from Menu/sousmenuEvaluation/mnEvalFormatageDirect.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalFormatageDirect.java index b209085..f92d773 100644 --- a/Menu/sousmenuEvaluation/mnEvalFormatageDirect.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalFormatageDirect.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Evaluer l'absence ou la présence du formatage direct.
diff --git a/Menu/sousmenuEvaluation/mnEvalLegacyStyleParentPresent.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalLegacyStyleParentPresent.java similarity index 70% rename from Menu/sousmenuEvaluation/mnEvalLegacyStyleParentPresent.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalLegacyStyleParentPresent.java index 6629e9c..da54483 100644 --- a/Menu/sousmenuEvaluation/mnEvalLegacyStyleParentPresent.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalLegacyStyleParentPresent.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvaluerLegacyStyleParentFalse; -import action.actEvaluerLegacyStyleParentTrue; +import analyseWriter.action.actEvaluerLegacyStyleParentFalse; +import analyseWriter.action.actEvaluerLegacyStyleParentTrue; +import analyseWriter.fenetres.create; public class mnEvalLegacyStyleParentPresent { public static JMenu menu(){ diff --git a/Menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java similarity index 87% rename from Menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java index bab0dd0..de6ba70 100644 --- a/Menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameLegacyStyle.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu pour évaluer le nom du style hérité.
diff --git a/Menu/sousmenuEvaluation/mnEvalNameLegacyStyleTousLesNodes.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameLegacyStyleTousLesNodes.java similarity index 74% rename from Menu/sousmenuEvaluation/mnEvalNameLegacyStyleTousLesNodes.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameLegacyStyleTousLesNodes.java index f6b06ac..fe45b6f 100644 --- a/Menu/sousmenuEvaluation/mnEvalNameLegacyStyleTousLesNodes.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameLegacyStyleTousLesNodes.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvaluerNomDuStyleHeriteTousLesNodesFalse; -import action.actEvaluerNomDuStyleHeriteTousLesNodesTrue; +import analyseWriter.action.actEvaluerNomDuStyleHeriteTousLesNodesFalse; +import analyseWriter.action.actEvaluerNomDuStyleHeriteTousLesNodesTrue; +import analyseWriter.fenetres.create; /** * Menu pour évaluer le nom du style hérité de tous les nodes text:p, text:h, text:span (voir plus tard text:list).
diff --git a/Menu/sousmenuEvaluation/mnEvalNameNode.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameNode.java similarity index 85% rename from Menu/sousmenuEvaluation/mnEvalNameNode.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameNode.java index 2e9f7c7..c26e9ee 100644 --- a/Menu/sousmenuEvaluation/mnEvalNameNode.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameNode.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu évaluer le nom du node.
diff --git a/Menu/sousmenuEvaluation/mnEvalNameNodeEnfants.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameNodeEnfants.java similarity index 69% rename from Menu/sousmenuEvaluation/mnEvalNameNodeEnfants.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameNodeEnfants.java index 4801771..b870d2e 100644 --- a/Menu/sousmenuEvaluation/mnEvalNameNodeEnfants.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameNodeEnfants.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actNameNodeEnfantsNon; -import action.actNameNodeEnfantsOui; +import analyseWriter.action.actNameNodeEnfantsNon; +import analyseWriter.action.actNameNodeEnfantsOui; +import analyseWriter.fenetres.create; /** * diff --git a/Menu/sousmenuEvaluation/mnEvalNamePage.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNamePage.java similarity index 84% rename from Menu/sousmenuEvaluation/mnEvalNamePage.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNamePage.java index f490087..f952213 100644 --- a/Menu/sousmenuEvaluation/mnEvalNamePage.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNamePage.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu évaluer le nom de la page.
diff --git a/Menu/sousmenuEvaluation/mnEvalNameSequence.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameSequence.java similarity index 70% rename from Menu/sousmenuEvaluation/mnEvalNameSequence.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameSequence.java index 22e646c..c9431d6 100644 --- a/Menu/sousmenuEvaluation/mnEvalNameSequence.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNameSequence.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalNameSequenceNon; -import action.actEvalNameSequenceOui; +import analyseWriter.action.actEvalNameSequenceNon; +import analyseWriter.action.actEvalNameSequenceOui; +import analyseWriter.fenetres.create; /** * Menu évaluer une variable de séquence.
diff --git a/Menu/sousmenuEvaluation/mnEvalNombreDePageMaxi.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNombreDePageMaxi.java similarity index 70% rename from Menu/sousmenuEvaluation/mnEvalNombreDePageMaxi.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNombreDePageMaxi.java index ee4891b..0c0ac38 100644 --- a/Menu/sousmenuEvaluation/mnEvalNombreDePageMaxi.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNombreDePageMaxi.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalNombreDePageMaxiNon; -import action.actEvalNombreDePageMaxiOui; +import analyseWriter.action.actEvalNombreDePageMaxiNon; +import analyseWriter.action.actEvalNombreDePageMaxiOui; +import analyseWriter.fenetres.create; /** * Menu pour évaluer le nombre de page maxi.
diff --git a/Menu/sousmenuEvaluation/mnEvalNombreDePageMini.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNombreDePageMini.java similarity index 70% rename from Menu/sousmenuEvaluation/mnEvalNombreDePageMini.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNombreDePageMini.java index 6e059a8..4e94cb3 100644 --- a/Menu/sousmenuEvaluation/mnEvalNombreDePageMini.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNombreDePageMini.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalNombreDePageMiniNon; -import action.actEvalNombreDePageMiniOui; +import analyseWriter.action.actEvalNombreDePageMiniNon; +import analyseWriter.action.actEvalNombreDePageMiniOui; +import analyseWriter.fenetres.create; /** * Menu pour évaluer le nombre de page mini.
diff --git a/Menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java similarity index 86% rename from Menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java index 5675f41..e6a0c7b 100644 --- a/Menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNumeroAbsoluePage.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu évaluer le numéro absolu de la page.
diff --git a/Menu/sousmenuEvaluation/mnEvalNumeroPage.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNumeroPage.java similarity index 85% rename from Menu/sousmenuEvaluation/mnEvalNumeroPage.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNumeroPage.java index 22a3487..b613c55 100644 --- a/Menu/sousmenuEvaluation/mnEvalNumeroPage.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalNumeroPage.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu évaluer le numéro de la page.
diff --git a/Menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java similarity index 88% rename from Menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java index 1cc4b20..e7016d9 100644 --- a/Menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPasParagrapheVide.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Evaluer l'absence de paragraphe vide dans les pages.
diff --git a/Menu/sousmenuEvaluation/mnEvalPasParagrapheVideTousLesPages.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPasParagrapheVideTousLesPages.java similarity index 90% rename from Menu/sousmenuEvaluation/mnEvalPasParagrapheVideTousLesPages.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPasParagrapheVideTousLesPages.java index 39cc868..b2691a8 100644 --- a/Menu/sousmenuEvaluation/mnEvalPasParagrapheVideTousLesPages.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPasParagrapheVideTousLesPages.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Evaluer l'absence de paragraphe vide dans les pages.
diff --git a/Menu/sousmenuEvaluation/mnEvalPiedPageActive.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPiedPageActive.java similarity index 72% rename from Menu/sousmenuEvaluation/mnEvalPiedPageActive.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPiedPageActive.java index 820e1c0..28dfa65 100644 --- a/Menu/sousmenuEvaluation/mnEvalPiedPageActive.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPiedPageActive.java @@ -1,11 +1,10 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalPiedPageActive; +import analyseWriter.action.actEvalPiedPageActive; +import analyseWriter.fenetres.create; /** * Menu pied de page active.
diff --git a/Menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java similarity index 73% rename from Menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java index 001fe6c..ebdd094 100644 --- a/Menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPiedPagePasActive.java @@ -1,11 +1,10 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalPiedPagePasActive; +import analyseWriter.action.actEvalPiedPagePasActive; +import analyseWriter.fenetres.create; /** * Menu pied de page pas active.
diff --git a/Menu/sousmenuEvaluation/mnEvalPlacementDesEnfants.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPlacementDesEnfants.java similarity index 70% rename from Menu/sousmenuEvaluation/mnEvalPlacementDesEnfants.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPlacementDesEnfants.java index b20ca31..ed160b0 100644 --- a/Menu/sousmenuEvaluation/mnEvalPlacementDesEnfants.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPlacementDesEnfants.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalPlacementEnfantNon; -import action.actEvalPlacementEnfantOui; +import analyseWriter.action.actEvalPlacementEnfantNon; +import analyseWriter.action.actEvalPlacementEnfantOui; +import analyseWriter.fenetres.create; /** * diff --git a/Menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java similarity index 88% rename from Menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java index 5a6a607..bd4c976 100644 --- a/Menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalPlacementParagraphe.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu respecter l'ordre des paragraphes.
diff --git a/Menu/sousmenuEvaluation/mnEvalSautPageColonne.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalSautPageColonne.java similarity index 87% rename from Menu/sousmenuEvaluation/mnEvalSautPageColonne.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalSautPageColonne.java index 33bb161..96a0e76 100644 --- a/Menu/sousmenuEvaluation/mnEvalSautPageColonne.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalSautPageColonne.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu permettant d'évaluer la présence d'un saut de page ou un saut de colonne dans un paragraphe.
diff --git a/Menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java similarity index 72% rename from Menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java index d7160e6..7ed1097 100644 --- a/Menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTabAlignementGauche.java @@ -1,11 +1,10 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalTabAlignementGaucheOui; +import analyseWriter.action.actEvalTabAlignementGaucheOui; +import analyseWriter.fenetres.create; public class mnEvalTabAlignementGauche { public static JMenu menu(){ diff --git a/Menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java similarity index 73% rename from Menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java index 3f996f0..bde13af 100644 --- a/Menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTabDefautStyleLeader.java @@ -1,11 +1,10 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalTabDefautStyleLeaderOui; +import analyseWriter.action.actEvalTabDefautStyleLeaderOui; +import analyseWriter.fenetres.create; public class mnEvalTabDefautStyleLeader { public static JMenu menu(){ diff --git a/Menu/sousmenuEvaluation/mnEvalTextUserDefined.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTextUserDefined.java similarity index 70% rename from Menu/sousmenuEvaluation/mnEvalTextUserDefined.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTextUserDefined.java index b69d8b8..f6c9d93 100644 --- a/Menu/sousmenuEvaluation/mnEvalTextUserDefined.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTextUserDefined.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalTextUserDefinedNon; -import action.actEvalTextUserDefinedOui; +import analyseWriter.action.actEvalTextUserDefinedNon; +import analyseWriter.action.actEvalTextUserDefinedOui; +import analyseWriter.fenetres.create; /** * Evaluer la propriété personnalisé.
diff --git a/Menu/sousmenuEvaluation/mnEvalTousParagraphes.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTousParagraphes.java similarity index 85% rename from Menu/sousmenuEvaluation/mnEvalTousParagraphes.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTousParagraphes.java index 3352ae9..63e7a7c 100644 --- a/Menu/sousmenuEvaluation/mnEvalTousParagraphes.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvalTousParagraphes.java @@ -1,9 +1,9 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; +import analyseWriter.fenetres.create; /** * menu pour le node structure pour evaluer tous les nodes text:p (paragraphe). diff --git a/Menu/sousmenuEvaluation/mnEvaluer.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluer.java similarity index 66% rename from Menu/sousmenuEvaluation/mnEvaluer.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluer.java index 4afcb03..009f602 100644 --- a/Menu/sousmenuEvaluation/mnEvaluer.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluer.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvalueFalse; -import action.actEvalueTrue; +import analyseWriter.action.actEvalueFalse; +import analyseWriter.action.actEvalueTrue; +import analyseWriter.fenetres.create; /** * Menu Evaluer.
diff --git a/Menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java similarity index 75% rename from Menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java index beebace..681b347 100644 --- a/Menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerATraversAnalyseStyle.java @@ -1,11 +1,10 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvaluerATraversAnalyseStyleTrue; +import analyseWriter.action.actEvaluerATraversAnalyseStyleTrue; +import analyseWriter.fenetres.create; /** * Menu Evaluer un style dans la structure.
diff --git a/Menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java similarity index 86% rename from Menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java index efaed0b..4a12634 100644 --- a/Menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerDernierEnfant.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu pour évaluer si le node est le dernier enfant.
diff --git a/Menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java similarity index 86% rename from Menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java index e11b31c..aa45fbc 100644 --- a/Menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerPremierEnfant.java @@ -1,4 +1,4 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; /** * Menu pour évaluer si le node est le dernier enfant.
diff --git a/Menu/sousmenuEvaluation/mnEvaluerStylesParagraphes.java b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerStylesParagraphes.java similarity index 74% rename from Menu/sousmenuEvaluation/mnEvaluerStylesParagraphes.java rename to src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerStylesParagraphes.java index 7471179..d21d439 100644 --- a/Menu/sousmenuEvaluation/mnEvaluerStylesParagraphes.java +++ b/src/analyseWriter/fenetres/menu/sousmenuEvaluation/mnEvaluerStylesParagraphes.java @@ -1,12 +1,11 @@ -package sousmenuEvaluation; +package analyseWriter.fenetres.menu.sousmenuEvaluation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actEvaluerTousLesStylesParagraphesFalse; -import action.actEvaluerTousLesStylesParagraphesTrue; +import analyseWriter.action.actEvaluerTousLesStylesParagraphesFalse; +import analyseWriter.action.actEvaluerTousLesStylesParagraphesTrue; +import analyseWriter.fenetres.create; /** * Menu pour évaluer les tous les styles de paragraphe ou de titre.
diff --git a/Menu/sousmenuRecherche/mnRechercheContenuExact.java b/src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheContenuExact.java similarity index 72% rename from Menu/sousmenuRecherche/mnRechercheContenuExact.java rename to src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheContenuExact.java index 07c4bc8..a28524b 100644 --- a/Menu/sousmenuRecherche/mnRechercheContenuExact.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheContenuExact.java @@ -1,12 +1,11 @@ -package sousmenuRecherche; +package analyseWriter.fenetres.menu.sousmenuRecherche; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actRechercheContenufalse; -import action.actRechercheContenutrue; +import analyseWriter.action.actRechercheContenufalse; +import analyseWriter.action.actRechercheContenutrue; +import analyseWriter.fenetres.create; /** * Menu rechercher par le contenu exact.
diff --git a/Menu/sousmenuRecherche/mnRechercheContenuPlusProcheVoisin.java b/src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheContenuPlusProcheVoisin.java similarity index 73% rename from Menu/sousmenuRecherche/mnRechercheContenuPlusProcheVoisin.java rename to src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheContenuPlusProcheVoisin.java index efec19a..ac0af2d 100644 --- a/Menu/sousmenuRecherche/mnRechercheContenuPlusProcheVoisin.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheContenuPlusProcheVoisin.java @@ -1,12 +1,11 @@ -package sousmenuRecherche; +package analyseWriter.fenetres.menu.sousmenuRecherche; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actRechercheContenuPlusProcheVoisinfalse; -import action.actRechercheContenuPlusProcheVoisintrue; +import analyseWriter.action.actRechercheContenuPlusProcheVoisinfalse; +import analyseWriter.action.actRechercheContenuPlusProcheVoisintrue; +import analyseWriter.fenetres.create; /** * Menu rechercher par le contenu du plus proche voisin.
diff --git a/Menu/sousmenuRecherche/mnRechercheIndex.java b/src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheIndex.java similarity index 69% rename from Menu/sousmenuRecherche/mnRechercheIndex.java rename to src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheIndex.java index f2a200f..cd34091 100644 --- a/Menu/sousmenuRecherche/mnRechercheIndex.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheIndex.java @@ -1,12 +1,11 @@ -package sousmenuRecherche; +package analyseWriter.fenetres.menu.sousmenuRecherche; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actRechercheIndexfalse; -import action.actRechercheIndextrue; +import analyseWriter.action.actRechercheIndexfalse; +import analyseWriter.action.actRechercheIndextrue; +import analyseWriter.fenetres.create; /** * Menu rechercher par l'index.
diff --git a/Menu/sousmenuRecherche/mnRechercheParNumeroPageAncrer.java b/src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheParNumeroPageAncrer.java similarity index 75% rename from Menu/sousmenuRecherche/mnRechercheParNumeroPageAncrer.java rename to src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheParNumeroPageAncrer.java index 0642444..0f36563 100644 --- a/Menu/sousmenuRecherche/mnRechercheParNumeroPageAncrer.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRecherche/mnRechercheParNumeroPageAncrer.java @@ -1,12 +1,11 @@ -package sousmenuRecherche; +package analyseWriter.fenetres.menu.sousmenuRecherche; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actRechercheAnchorPageNumberFalse; -import action.actRechercheAnchorPageNumberTrue; +import analyseWriter.action.actRechercheAnchorPageNumberFalse; +import analyseWriter.action.actRechercheAnchorPageNumberTrue; +import analyseWriter.fenetres.create; /** * Menu rechercher par le numéro de la page ancrer.
diff --git a/Menu/sousmenuRepresentation/mnAddMenuNiveau1.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnAddMenuNiveau1.java similarity index 69% rename from Menu/sousmenuRepresentation/mnAddMenuNiveau1.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnAddMenuNiveau1.java index 595c9c1..0dfe601 100644 --- a/Menu/sousmenuRepresentation/mnAddMenuNiveau1.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnAddMenuNiveau1.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actAddMenuFalse; -import action.actAddMenuTrue; +import analyseWriter.action.actAddMenuFalse; +import analyseWriter.action.actAddMenuTrue; +import analyseWriter.fenetres.create; /** * Menu lien de menu vers les niveau 1.
diff --git a/Menu/sousmenuRepresentation/mnAddMenuNiveauSup1.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnAddMenuNiveauSup1.java similarity index 70% rename from Menu/sousmenuRepresentation/mnAddMenuNiveauSup1.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnAddMenuNiveauSup1.java index 31f3f6d..bda738f 100644 --- a/Menu/sousmenuRepresentation/mnAddMenuNiveauSup1.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnAddMenuNiveauSup1.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actAddMenuFalse; -import action.actAddMenuTrue; +import analyseWriter.action.actAddMenuFalse; +import analyseWriter.action.actAddMenuTrue; +import analyseWriter.fenetres.create; /** * Menu lien de menu vers les niveau supérieur à 1.
diff --git a/Menu/sousmenuRepresentation/mnInsereInformation.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnInsereInformation.java similarity index 70% rename from Menu/sousmenuRepresentation/mnInsereInformation.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnInsereInformation.java index 88f2b76..ce441d4 100644 --- a/Menu/sousmenuRepresentation/mnInsereInformation.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnInsereInformation.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actInsereInformationFalse; -import action.actInsereInformationTrue; +import analyseWriter.action.actInsereInformationFalse; +import analyseWriter.action.actInsereInformationTrue; +import analyseWriter.fenetres.create; /** * Insertion de l'information du node.
diff --git a/Menu/sousmenuRepresentation/mnInsereInformationMultiple.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnInsereInformationMultiple.java similarity index 72% rename from Menu/sousmenuRepresentation/mnInsereInformationMultiple.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnInsereInformationMultiple.java index 7d37fcd..66160fa 100644 --- a/Menu/sousmenuRepresentation/mnInsereInformationMultiple.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnInsereInformationMultiple.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actInsereInformationMultipleFalse; -import action.actInsereInformationMultipleTrue; +import analyseWriter.action.actInsereInformationMultipleFalse; +import analyseWriter.action.actInsereInformationMultipleTrue; +import analyseWriter.fenetres.create; /** * Insertion de l'information sur tous les nodes de la page.
diff --git a/Menu/sousmenuRepresentation/mnMarqueNode.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnMarqueNode.java similarity index 73% rename from Menu/sousmenuRepresentation/mnMarqueNode.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnMarqueNode.java index 5e77973..5656d91 100644 --- a/Menu/sousmenuRepresentation/mnMarqueNode.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnMarqueNode.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actmarquenodefalse; -import action.actmarquenodetrue; +import analyseWriter.action.actmarquenodefalse; +import analyseWriter.action.actmarquenodetrue; +import analyseWriter.fenetres.create; /** * Menu pour marquer les nodes évaluer dans le feedback des étudiants.
diff --git a/Menu/sousmenuRepresentation/mnSaut.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSaut.java similarity index 65% rename from Menu/sousmenuRepresentation/mnSaut.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSaut.java index 8193235..bd6560c 100644 --- a/Menu/sousmenuRepresentation/mnSaut.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSaut.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actsautfalse; -import action.actsauttrue; +import analyseWriter.action.actsautfalse; +import analyseWriter.action.actsauttrue; +import analyseWriter.fenetres.create; /** * Menu saut de ligne.
diff --git a/Menu/sousmenuRepresentation/mnSautMultiple.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSautMultiple.java similarity index 68% rename from Menu/sousmenuRepresentation/mnSautMultiple.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSautMultiple.java index 07522ee..de34cf4 100644 --- a/Menu/sousmenuRepresentation/mnSautMultiple.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSautMultiple.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actsautmultiplefalse; -import action.actsautmultipletrue; +import analyseWriter.action.actsautmultiplefalse; +import analyseWriter.action.actsautmultipletrue; +import analyseWriter.fenetres.create; /** * Menu saut de ligne entre les nodes. diff --git a/Menu/sousmenuRepresentation/mnSautNiveau1.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSautNiveau1.java similarity index 68% rename from Menu/sousmenuRepresentation/mnSautNiveau1.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSautNiveau1.java index 4cd88c6..59f1c4a 100644 --- a/Menu/sousmenuRepresentation/mnSautNiveau1.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnSautNiveau1.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actsautfalse; -import action.actsauttrue; +import analyseWriter.action.actsautfalse; +import analyseWriter.action.actsauttrue; +import analyseWriter.fenetres.create; /** * Menu saut de ligne pour les niveau 1.
diff --git a/Menu/sousmenuRepresentation/mnTitre.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnTitre.java similarity index 60% rename from Menu/sousmenuRepresentation/mnTitre.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnTitre.java index 3fe5bc4..da97cc2 100644 --- a/Menu/sousmenuRepresentation/mnTitre.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnTitre.java @@ -1,15 +1,14 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actSupprimeTitre; -import action.actTitre1; -import action.actTitre2; -import action.actTitre3; -import action.actTitrePrincipal; +import analyseWriter.action.actSupprimeTitre; +import analyseWriter.action.actTitre1; +import analyseWriter.action.actTitre2; +import analyseWriter.action.actTitre3; +import analyseWriter.action.actTitrePrincipal; +import analyseWriter.fenetres.create; /** * Menu Titre.
diff --git a/Menu/sousmenuRepresentation/mnTitreNiveau1.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnTitreNiveau1.java similarity index 63% rename from Menu/sousmenuRepresentation/mnTitreNiveau1.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnTitreNiveau1.java index a26e446..1da989f 100644 --- a/Menu/sousmenuRepresentation/mnTitreNiveau1.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnTitreNiveau1.java @@ -1,15 +1,14 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.actSupprimeTitre; -import action.actTitre1; -import action.actTitre2; -import action.actTitre3; -import action.actTitrePrincipal; +import analyseWriter.action.actSupprimeTitre; +import analyseWriter.action.actTitre1; +import analyseWriter.action.actTitre2; +import analyseWriter.action.actTitre3; +import analyseWriter.action.actTitrePrincipal; +import analyseWriter.fenetres.create; /** * Menu Titre pour le niveau 1.
diff --git a/Menu/sousmenuRepresentation/mnaddTitreToutesLesPages.java b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnaddTitreToutesLesPages.java similarity index 72% rename from Menu/sousmenuRepresentation/mnaddTitreToutesLesPages.java rename to src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnaddTitreToutesLesPages.java index 896a064..b1481a1 100644 --- a/Menu/sousmenuRepresentation/mnaddTitreToutesLesPages.java +++ b/src/analyseWriter/fenetres/menu/sousmenuRepresentation/mnaddTitreToutesLesPages.java @@ -1,12 +1,11 @@ -package sousmenuRepresentation; +package analyseWriter.fenetres.menu.sousmenuRepresentation; import javax.swing.ImageIcon; import javax.swing.JMenu; -import com.analyseWriter.fenetres.create; - -import action.addTitreToutesLesPagesFalse; -import action.addTitreToutesLesPagesTrue; +import analyseWriter.action.addTitreToutesLesPagesFalse; +import analyseWriter.action.addTitreToutesLesPagesTrue; +import analyseWriter.fenetres.create; /** * Menu permettant ajouter des titre1 à toutes les pages.
diff --git a/src/com/analyseWriter/fenetres/modifStudent.java b/src/analyseWriter/fenetres/modifStudent.java similarity index 94% rename from src/com/analyseWriter/fenetres/modifStudent.java rename to src/analyseWriter/fenetres/modifStudent.java index af9a203..7308d5d 100644 --- a/src/com/analyseWriter/fenetres/modifStudent.java +++ b/src/analyseWriter/fenetres/modifStudent.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.EventQueue; @@ -6,8 +6,8 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.border.EmptyBorder; -import MEPTL.commandes; -import MEPTL.meptl; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.meptl; import cXML.node; import javax.swing.JTextField; diff --git a/src/com/analyseWriter/fenetres/msgBox.java b/src/analyseWriter/fenetres/msgBox.java similarity index 94% rename from src/com/analyseWriter/fenetres/msgBox.java rename to src/analyseWriter/fenetres/msgBox.java index 7d96e53..d8acc30 100644 --- a/src/com/analyseWriter/fenetres/msgBox.java +++ b/src/analyseWriter/fenetres/msgBox.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.FlowLayout; diff --git a/src/com/analyseWriter/fenetres/myTableModel.java b/src/analyseWriter/fenetres/myTableModel.java similarity index 89% rename from src/com/analyseWriter/fenetres/myTableModel.java rename to src/analyseWriter/fenetres/myTableModel.java index 194f2bd..9050811 100644 --- a/src/com/analyseWriter/fenetres/myTableModel.java +++ b/src/analyseWriter/fenetres/myTableModel.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.util.List; diff --git a/src/analyseWriter/fenetres/package-info.java b/src/analyseWriter/fenetres/package-info.java new file mode 100644 index 0000000..977184a --- /dev/null +++ b/src/analyseWriter/fenetres/package-info.java @@ -0,0 +1 @@ +package analyseWriter.fenetres; \ No newline at end of file diff --git a/src/com/analyseWriter/fenetres/proprieteFichierAnalyse.java b/src/analyseWriter/fenetres/proprieteFichierAnalyse.java similarity index 96% rename from src/com/analyseWriter/fenetres/proprieteFichierAnalyse.java rename to src/analyseWriter/fenetres/proprieteFichierAnalyse.java index 7bb84e1..f816226 100644 --- a/src/com/analyseWriter/fenetres/proprieteFichierAnalyse.java +++ b/src/analyseWriter/fenetres/proprieteFichierAnalyse.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.Color; @@ -17,10 +17,10 @@ import javax.swing.JPanel; import javax.swing.JTextArea; import javax.swing.JTextField; -import MEPTL.commandes; -import MEPTL.meptl; -import calcul.calculNotesProgression; -import calcul.formatDateWriter; +import analyseWriter.MEPTL.commandes; +import analyseWriter.MEPTL.meptl; +import analyseWriter.calcul.calculNotesProgression; +import analyseWriter.calcul.formatDateWriter; import net.miginfocom.swing.MigLayout; public final class proprieteFichierAnalyse extends JFrame { @@ -476,7 +476,7 @@ public final class proprieteFichierAnalyse extends JFrame { btnVoirBaremeABC.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { double progression = Double.valueOf(textFieldProgression.getText()); - calcul.calculIntervalleBaremeABCDE C = new calcul.calculIntervalleBaremeABCDE(progression); + analyseWriter.calcul.calculIntervalleBaremeABCDE C = new analyseWriter.calcul.calculIntervalleBaremeABCDE(progression); JOptionPane.showMessageDialog(null, C.getMessageHTMLColonne()); } }); @@ -519,7 +519,7 @@ public final class proprieteFichierAnalyse extends JFrame { meptl.chargementParametresFichierAnalyse(); - com.analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); + analyseWriter.fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse(); dispose(); } diff --git a/src/com/analyseWriter/fenetres/setting.java b/src/analyseWriter/fenetres/setting.java similarity index 97% rename from src/com/analyseWriter/fenetres/setting.java rename to src/analyseWriter/fenetres/setting.java index 26c93d9..9d68b22 100644 --- a/src/com/analyseWriter/fenetres/setting.java +++ b/src/analyseWriter/fenetres/setting.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Font; @@ -28,10 +28,10 @@ import javax.swing.SwingConstants; import javax.swing.border.EmptyBorder; import javax.swing.filechooser.FileNameExtensionFilter; -import MEPTL.commandes; +import analyseWriter.MEPTL.commandes; +import analyseWriter.evaluer.evaluation; import cXML.Run; import cXML.node; -import evaluer.evaluation; import javax.swing.JCheckBox; diff --git a/src/com/analyseWriter/fenetres/toolBarRecherche.java b/src/analyseWriter/fenetres/toolBarRecherche.java similarity index 94% rename from src/com/analyseWriter/fenetres/toolBarRecherche.java rename to src/analyseWriter/fenetres/toolBarRecherche.java index afa3f1d..b1fb772 100644 --- a/src/com/analyseWriter/fenetres/toolBarRecherche.java +++ b/src/analyseWriter/fenetres/toolBarRecherche.java @@ -1,4 +1,4 @@ -package com.analyseWriter.fenetres; +package analyseWriter.fenetres; import javax.swing.ImageIcon; import javax.swing.JButton; diff --git a/src/list/descriptionNode.java b/src/analyseWriter/list/descriptionNode.java similarity index 98% rename from src/list/descriptionNode.java rename to src/analyseWriter/list/descriptionNode.java index 3c643ea..8f6257f 100644 --- a/src/list/descriptionNode.java +++ b/src/analyseWriter/list/descriptionNode.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; public class descriptionNode { diff --git a/src/list/listMethodeEvaluationAnalyseWriter.java b/src/analyseWriter/list/listMethodeEvaluationAnalyseWriter.java similarity index 91% rename from src/list/listMethodeEvaluationAnalyseWriter.java rename to src/analyseWriter/list/listMethodeEvaluationAnalyseWriter.java index 97e789b..55e66f9 100644 --- a/src/list/listMethodeEvaluationAnalyseWriter.java +++ b/src/analyseWriter/list/listMethodeEvaluationAnalyseWriter.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; /** * les méthodes d'analyseWriter qui peuvent être évaluées
diff --git a/src/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java b/src/analyseWriter/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java similarity index 93% rename from src/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java rename to src/analyseWriter/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java index df1264b..7fbb57b 100644 --- a/src/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java +++ b/src/analyseWriter/list/listeAttributWriterPasEvaluableAvecCodeEvaluateur.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; public class listeAttributWriterPasEvaluableAvecCodeEvaluateur { diff --git a/src/list/listeAttributWriterValeurPasModifiable.java b/src/analyseWriter/list/listeAttributWriterValeurPasModifiable.java similarity index 93% rename from src/list/listeAttributWriterValeurPasModifiable.java rename to src/analyseWriter/list/listeAttributWriterValeurPasModifiable.java index 115f2e8..e0bb309 100644 --- a/src/list/listeAttributWriterValeurPasModifiable.java +++ b/src/analyseWriter/list/listeAttributWriterValeurPasModifiable.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; public class listeAttributWriterValeurPasModifiable { diff --git a/src/list/listeAttributsAnalyseWriter.java b/src/analyseWriter/list/listeAttributsAnalyseWriter.java similarity index 96% rename from src/list/listeAttributsAnalyseWriter.java rename to src/analyseWriter/list/listeAttributsAnalyseWriter.java index 780a9a2..5c93482 100644 --- a/src/list/listeAttributsAnalyseWriter.java +++ b/src/analyseWriter/list/listeAttributsAnalyseWriter.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; public class listeAttributsAnalyseWriter { diff --git a/src/list/listeDesNodesAEvaluer.java b/src/analyseWriter/list/listeDesNodesAEvaluer.java similarity index 89% rename from src/list/listeDesNodesAEvaluer.java rename to src/analyseWriter/list/listeDesNodesAEvaluer.java index 7140e77..2ea9fe4 100644 --- a/src/list/listeDesNodesAEvaluer.java +++ b/src/analyseWriter/list/listeDesNodesAEvaluer.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesAllContent.java b/src/analyseWriter/list/listeDesNodesAllContent.java similarity index 94% rename from src/list/listeDesNodesAllContent.java rename to src/analyseWriter/list/listeDesNodesAllContent.java index ac27981..d699aaa 100644 --- a/src/list/listeDesNodesAllContent.java +++ b/src/analyseWriter/list/listeDesNodesAllContent.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesAnalyseSpan.java b/src/analyseWriter/list/listeDesNodesAnalyseSpan.java similarity index 86% rename from src/list/listeDesNodesAnalyseSpan.java rename to src/analyseWriter/list/listeDesNodesAnalyseSpan.java index 6733cc9..2642f2d 100644 --- a/src/list/listeDesNodesAnalyseSpan.java +++ b/src/analyseWriter/list/listeDesNodesAnalyseSpan.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesAnalyseStyle.java b/src/analyseWriter/list/listeDesNodesAnalyseStyle.java similarity index 87% rename from src/list/listeDesNodesAnalyseStyle.java rename to src/analyseWriter/list/listeDesNodesAnalyseStyle.java index 4ddb0d8..8164884 100644 --- a/src/list/listeDesNodesAnalyseStyle.java +++ b/src/analyseWriter/list/listeDesNodesAnalyseStyle.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesAncrable.java b/src/analyseWriter/list/listeDesNodesAncrable.java similarity index 93% rename from src/list/listeDesNodesAncrable.java rename to src/analyseWriter/list/listeDesNodesAncrable.java index 5ed80d9..7aa426f 100644 --- a/src/list/listeDesNodesAncrable.java +++ b/src/analyseWriter/list/listeDesNodesAncrable.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesAvecOU.java b/src/analyseWriter/list/listeDesNodesAvecOU.java similarity index 90% rename from src/list/listeDesNodesAvecOU.java rename to src/analyseWriter/list/listeDesNodesAvecOU.java index ae69454..a03f297 100644 --- a/src/list/listeDesNodesAvecOU.java +++ b/src/analyseWriter/list/listeDesNodesAvecOU.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesContenantPargraphesOuTitres.java b/src/analyseWriter/list/listeDesNodesContenantPargraphesOuTitres.java similarity index 90% rename from src/list/listeDesNodesContenantPargraphesOuTitres.java rename to src/analyseWriter/list/listeDesNodesContenantPargraphesOuTitres.java index 7004bd0..2760ccb 100644 --- a/src/list/listeDesNodesContenantPargraphesOuTitres.java +++ b/src/analyseWriter/list/listeDesNodesContenantPargraphesOuTitres.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; /** diff --git a/src/list/listeDesNodesContenantSaut.java b/src/analyseWriter/list/listeDesNodesContenantSaut.java similarity index 91% rename from src/list/listeDesNodesContenantSaut.java rename to src/analyseWriter/list/listeDesNodesContenantSaut.java index c651dfb..9548882 100644 --- a/src/list/listeDesNodesContenantSaut.java +++ b/src/analyseWriter/list/listeDesNodesContenantSaut.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; /** diff --git a/src/list/listeDesNodesContientEnfant.java b/src/analyseWriter/list/listeDesNodesContientEnfant.java similarity index 89% rename from src/list/listeDesNodesContientEnfant.java rename to src/analyseWriter/list/listeDesNodesContientEnfant.java index cdcd69f..1b43125 100644 --- a/src/list/listeDesNodesContientEnfant.java +++ b/src/analyseWriter/list/listeDesNodesContientEnfant.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesEvalPlacement.java b/src/analyseWriter/list/listeDesNodesEvalPlacement.java similarity index 94% rename from src/list/listeDesNodesEvalPlacement.java rename to src/analyseWriter/list/listeDesNodesEvalPlacement.java index 3733325..18f0ef4 100644 --- a/src/list/listeDesNodesEvalPlacement.java +++ b/src/analyseWriter/list/listeDesNodesEvalPlacement.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesFormatageDirect.java b/src/analyseWriter/list/listeDesNodesFormatageDirect.java similarity index 85% rename from src/list/listeDesNodesFormatageDirect.java rename to src/analyseWriter/list/listeDesNodesFormatageDirect.java index d2bcb29..5316558 100644 --- a/src/list/listeDesNodesFormatageDirect.java +++ b/src/analyseWriter/list/listeDesNodesFormatageDirect.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesInfos.java b/src/analyseWriter/list/listeDesNodesInfos.java similarity index 88% rename from src/list/listeDesNodesInfos.java rename to src/analyseWriter/list/listeDesNodesInfos.java index 0958cab..339c93a 100644 --- a/src/list/listeDesNodesInfos.java +++ b/src/analyseWriter/list/listeDesNodesInfos.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesPourEvaluationEntetePage.java b/src/analyseWriter/list/listeDesNodesPourEvaluationEntetePage.java similarity index 83% rename from src/list/listeDesNodesPourEvaluationEntetePage.java rename to src/analyseWriter/list/listeDesNodesPourEvaluationEntetePage.java index c8ba945..83eec35 100644 --- a/src/list/listeDesNodesPourEvaluationEntetePage.java +++ b/src/analyseWriter/list/listeDesNodesPourEvaluationEntetePage.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesPourEvaluerPage.java b/src/analyseWriter/list/listeDesNodesPourEvaluerPage.java similarity index 85% rename from src/list/listeDesNodesPourEvaluerPage.java rename to src/analyseWriter/list/listeDesNodesPourEvaluerPage.java index a2f8153..37b3b8a 100644 --- a/src/list/listeDesNodesPourEvaluerPage.java +++ b/src/analyseWriter/list/listeDesNodesPourEvaluerPage.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesPourEvaluerPiedDePage.java b/src/analyseWriter/list/listeDesNodesPourEvaluerPiedDePage.java similarity index 85% rename from src/list/listeDesNodesPourEvaluerPiedDePage.java rename to src/analyseWriter/list/listeDesNodesPourEvaluerPiedDePage.java index 84d4c7b..051a53d 100644 --- a/src/list/listeDesNodesPourEvaluerPiedDePage.java +++ b/src/analyseWriter/list/listeDesNodesPourEvaluerPiedDePage.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesRechercheByContenu.java b/src/analyseWriter/list/listeDesNodesRechercheByContenu.java similarity index 95% rename from src/list/listeDesNodesRechercheByContenu.java rename to src/analyseWriter/list/listeDesNodesRechercheByContenu.java index 9545628..5eda941 100644 --- a/src/list/listeDesNodesRechercheByContenu.java +++ b/src/analyseWriter/list/listeDesNodesRechercheByContenu.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeDesNodesTabStop.java b/src/analyseWriter/list/listeDesNodesTabStop.java similarity index 91% rename from src/list/listeDesNodesTabStop.java rename to src/analyseWriter/list/listeDesNodesTabStop.java index 611284d..b6cfc18 100644 --- a/src/list/listeDesNodesTabStop.java +++ b/src/analyseWriter/list/listeDesNodesTabStop.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeEvalNameNode.java b/src/analyseWriter/list/listeEvalNameNode.java similarity index 91% rename from src/list/listeEvalNameNode.java rename to src/analyseWriter/list/listeEvalNameNode.java index f11c517..30f9664 100644 --- a/src/list/listeEvalNameNode.java +++ b/src/analyseWriter/list/listeEvalNameNode.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/list/listeNodeAnalyseWriter.java b/src/analyseWriter/list/listeNodeAnalyseWriter.java similarity index 95% rename from src/list/listeNodeAnalyseWriter.java rename to src/analyseWriter/list/listeNodeAnalyseWriter.java index fc27063..202e7ea 100644 --- a/src/list/listeNodeAnalyseWriter.java +++ b/src/analyseWriter/list/listeNodeAnalyseWriter.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; public class listeNodeAnalyseWriter { diff --git a/src/list/listeNodeFormatageDirectDeWriter.java b/src/analyseWriter/list/listeNodeFormatageDirectDeWriter.java similarity index 94% rename from src/list/listeNodeFormatageDirectDeWriter.java rename to src/analyseWriter/list/listeNodeFormatageDirectDeWriter.java index 0bbd824..dc198d7 100644 --- a/src/list/listeNodeFormatageDirectDeWriter.java +++ b/src/analyseWriter/list/listeNodeFormatageDirectDeWriter.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/list/listeNodesNonModifiableAttribut.java b/src/analyseWriter/list/listeNodesNonModifiableAttribut.java similarity index 92% rename from src/list/listeNodesNonModifiableAttribut.java rename to src/analyseWriter/list/listeNodesNonModifiableAttribut.java index 844a943..a29e76e 100644 --- a/src/list/listeNodesNonModifiableAttribut.java +++ b/src/analyseWriter/list/listeNodesNonModifiableAttribut.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; public class listeNodesNonModifiableAttribut { diff --git a/src/list/listeRechercheParAnchorPageNumber.java b/src/analyseWriter/list/listeRechercheParAnchorPageNumber.java similarity index 87% rename from src/list/listeRechercheParAnchorPageNumber.java rename to src/analyseWriter/list/listeRechercheParAnchorPageNumber.java index 3607696..2c44043 100644 --- a/src/list/listeRechercheParAnchorPageNumber.java +++ b/src/analyseWriter/list/listeRechercheParAnchorPageNumber.java @@ -1,4 +1,4 @@ -package list; +package analyseWriter.list; import cXML.node; diff --git a/src/com/analyseWriter/fenetres/package-info.java b/src/com/analyseWriter/fenetres/package-info.java deleted file mode 100644 index d296bd4..0000000 --- a/src/com/analyseWriter/fenetres/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.analyseWriter.fenetres; \ No newline at end of file diff --git a/src/resources/LicenceGNUGPL3.html b/src/resources/LicenceGNUGPL3.html new file mode 100644 index 0000000..59b5766 --- /dev/null +++ b/src/resources/LicenceGNUGPL3.html @@ -0,0 +1,684 @@ +

GNU GENERAL PUBLIC LICENSE

+

Version 3, 29 June 2007

+ +

Copyright © 2007 Free Software Foundation, Inc. + <https://fsf.org/>

+ Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed.

+ +

Preamble

+ +

The GNU General Public License is a free, copyleft license for +software and other kinds of works.

+ +

The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too.

+ +

When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things.

+ +

To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others.

+ +

For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights.

+ +

Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it.

+ +

For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions.

+ +

Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users.

+ +

Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free.

+ +

The precise terms and conditions for copying, distribution and +modification follow.

+ +

TERMS AND CONDITIONS

+ +
0. Definitions.
+ +

“This License” refers to version 3 of the GNU General Public License.

+ +

“Copyright” also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks.

+ +

“The Program” refers to any copyrightable work licensed under this +License. Each licensee is addressed as “you”. “Licensees” and +“recipients” may be individuals or organizations.

+ +

To “modify” a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a “modified version” of the +earlier work or a work “based on” the earlier work.

+ +

A “covered work” means either the unmodified Program or a work based +on the Program.

+ +

To “propagate” a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well.

+ +

To “convey” a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying.

+ +

An interactive user interface displays “Appropriate Legal Notices” +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion.

+ +
1. Source Code.
+ +

The “source code” for a work means the preferred form of the work +for making modifications to it. “Object code” means any non-source +form of a work.

+ +

A “Standard Interface” means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language.

+ +

The “System Libraries” of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +“Major Component”, in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it.

+ +

The “Corresponding Source” for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work.

+ +

The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source.

+ +

The Corresponding Source for a work in source code form is that +same work.

+ +
2. Basic Permissions.
+ +

All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law.

+ +

You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you.

+ +

Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary.

+ +
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+ +

No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures.

+ +

When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures.

+ +
4. Conveying Verbatim Copies.
+ +

You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program.

+ +

You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee.

+ +
5. Conveying Modified Source Versions.
+ +

You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions:

+ +
    +
  • a) The work must carry prominent notices stating that you modified + it, and giving a relevant date.
    • + +
  • b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + “keep intact all notices”.
    • + +
  • c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it.
    • + +
  • d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so.
    • +
+ +

A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +“aggregate” if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate.

+ +
6. Conveying Non-Source Forms.
+ +

You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways:

+ +
    +
  • a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange.
    • + +
  • b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge.
    • + +
  • c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b.
    • + +
  • d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements.
    • + +
  • e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d.
    • +
+ +

A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work.

+ +

A “User Product” is either (1) a “consumer product”, which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, “normally used” refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product.

+ +

“Installation Information” for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made.

+ +

If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM).

+ +

The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network.

+ +

Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying.

+ +
7. Additional Terms.
+ +

“Additional permissions” are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions.

+ +

When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission.

+ +

Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms:

+ +
    +
  • a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or
    • + +
  • b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or
    • + +
  • c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or
    • + +
  • d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or
    • + +
  • e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or
    • + +
  • f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors.
    • +
+ +

All other non-permissive additional terms are considered “further +restrictions” within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying.

+ +

If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms.

+ +

Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way.

+ +
8. Termination.
+ +

You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11).

+ +

However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation.

+ +

Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice.

+ +

Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10.

+ +
9. Acceptance Not Required for Having Copies.
+ +

You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so.

+ +
10. Automatic Licensing of Downstream Recipients.
+ +

Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License.

+ +

An “entity transaction” is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts.

+ +

You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it.

+ +
11. Patents.
+ +

A “contributor” is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's “contributor version”.

+ +

A contributor's “essential patent claims” are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, “control” includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License.

+ +

Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version.

+ +

In the following three paragraphs, a “patent license” is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To “grant” such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party.

+ +

If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. “Knowingly relying” means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid.

+ +

If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it.

+ +

A patent license is “discriminatory” if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007.

+ +

Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law.

+ +
12. No Surrender of Others' Freedom.
+ +

If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program.

+ +
13. Use with the GNU Affero General Public License.
+ +

Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such.

+ +
14. Revised Versions of this License.
+ +

The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns.

+ +

Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License “or any later version” applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation.

+ +

If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program.

+ +

Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version.

+ +
15. Disclaimer of Warranty.
+ +

THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

+ +
16. Limitation of Liability.
+ +

IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES.

+ +
17. Interpretation of Sections 15 and 16.
+ +

If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee.

+ +

END OF TERMS AND CONDITIONS

+ +

How to Apply These Terms to Your New Programs

+ +

If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms.

+ +

To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the “copyright” line and a pointer to where the full notice is found.

+ +
    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+ +

Also add information on how to contact you by electronic and paper mail.

+ +

If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode:

+ +
    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+ +

The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an “about box”.

+ +

You should also get your employer (if you work as a programmer) or school, +if any, to sign a “copyright disclaimer” for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<https://www.gnu.org/licenses/>.

+ +

The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<https://www.gnu.org/licenses/why-not-lgpl.html>.

+