diff --git a/.classpath b/.classpath
index 148593c..4b5675b 100644
--- a/.classpath
+++ b/.classpath
@@ -12,6 +12,6 @@
-
+
diff --git a/analyseWriter.exe b/analyseWriter.exe
index 1298101..1a8d3e7 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/analyseWriter.jar b/analyseWriter.jar
index 2f3354a..dd10594 100644
Binary files a/analyseWriter.jar and b/analyseWriter.jar differ
diff --git a/bin/.gitignore b/bin/.gitignore
index 8bbeada..4d71628 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,14 +1,53 @@
+/MEPTL/
+/calcul/
/evaluer/
/fenetres/
/list/
-/resources/
-/MEPTL/
-/odreparagraphe.png
-/odreparagraphemini.png
-/ordreparagraphe.svg
-/recherche.png
-/recherche.svg
-/recherchemini.png
+/textclean.svg
+/textcleanmini.png
+/titre.svg
+/titremini.png
+/totalpoint.png
+/totalpoint.svg
+/totalpointmini.png
+/totalpointnode.png
+/totalpointnode.svg
+/totalpointnodemini.png
+/touslesnodes.png
+/touslesnodes.svg
+/touslesnodesmini.png
+/toutext.png
+/toutext.svg
+/toutextmini.png
+/traduction.png
+/traduction.svg
+/traductionmini.png
+/treeClose.png
+/treeClose.svg
+/treeLeaf.png
+/treeLeaf.svg
+/treeOpen.png
+/treeOpen.svg
+/triche.png
+/triche.svg
+/trichemini.png
+/tutoriel.png
+/tutoriel.svg
+/tutorielmini.png
+/undo.png
+/upnode.png
+/upnode.svg
+/upnodemini.png
+/verifhistorique.png
+/verifhistoriquemax.png
+/verifhistoriquemini.png
/versevaluate.png
/versevaluate.svg
/versevaluatemini.png
+/voir.svg
+/voirmini.png
+/what.svg
+/whatmini.png
+/zip.png
+/zip.svg
+/zipmini.png
diff --git a/bin/MEPTL/ecritureSujet.class b/bin/MEPTL/ecritureSujet.class
index 2f74ad5..1ca0b70 100644
Binary files a/bin/MEPTL/ecritureSujet.class and b/bin/MEPTL/ecritureSujet.class differ
diff --git a/bin/fenetres/afficheText.class b/bin/fenetres/afficheText.class
index 74242e4..f1ff304 100644
Binary files a/bin/fenetres/afficheText.class and b/bin/fenetres/afficheText.class differ
diff --git a/bin/fenetres/create$1.class b/bin/fenetres/create$1.class
index 60a81d1..bfafe05 100644
Binary files a/bin/fenetres/create$1.class and b/bin/fenetres/create$1.class differ
diff --git a/bin/fenetres/create$10.class b/bin/fenetres/create$10.class
index ab6bbf4..01e6723 100644
Binary files a/bin/fenetres/create$10.class and b/bin/fenetres/create$10.class differ
diff --git a/bin/fenetres/create$11.class b/bin/fenetres/create$11.class
index f4fcaf5..897b9f8 100644
Binary files a/bin/fenetres/create$11.class and b/bin/fenetres/create$11.class differ
diff --git a/bin/fenetres/create$12.class b/bin/fenetres/create$12.class
index dda4069..c3f3bbb 100644
Binary files a/bin/fenetres/create$12.class and b/bin/fenetres/create$12.class differ
diff --git a/bin/fenetres/create$13.class b/bin/fenetres/create$13.class
index 5be4b34..f0ae4d5 100644
Binary files a/bin/fenetres/create$13.class and b/bin/fenetres/create$13.class differ
diff --git a/bin/fenetres/create$14.class b/bin/fenetres/create$14.class
index 569b657..6f12388 100644
Binary files a/bin/fenetres/create$14.class and b/bin/fenetres/create$14.class differ
diff --git a/bin/fenetres/create$2.class b/bin/fenetres/create$2.class
index fddca34..1d952e7 100644
Binary files a/bin/fenetres/create$2.class and b/bin/fenetres/create$2.class differ
diff --git a/bin/fenetres/create$3.class b/bin/fenetres/create$3.class
index a5563e4..47b3c20 100644
Binary files a/bin/fenetres/create$3.class and b/bin/fenetres/create$3.class differ
diff --git a/bin/fenetres/create$4.class b/bin/fenetres/create$4.class
index 7b135a3..b5acf09 100644
Binary files a/bin/fenetres/create$4.class and b/bin/fenetres/create$4.class differ
diff --git a/bin/fenetres/create$5.class b/bin/fenetres/create$5.class
index 0744b24..3183236 100644
Binary files a/bin/fenetres/create$5.class and b/bin/fenetres/create$5.class differ
diff --git a/bin/fenetres/create$6.class b/bin/fenetres/create$6.class
index d10709c..8f7e367 100644
Binary files a/bin/fenetres/create$6.class and b/bin/fenetres/create$6.class differ
diff --git a/bin/fenetres/create$7.class b/bin/fenetres/create$7.class
index b3bfc6d..a866361 100644
Binary files a/bin/fenetres/create$7.class and b/bin/fenetres/create$7.class differ
diff --git a/bin/fenetres/create$8.class b/bin/fenetres/create$8.class
index ce26429..24743a1 100644
Binary files a/bin/fenetres/create$8.class and b/bin/fenetres/create$8.class differ
diff --git a/bin/fenetres/create$9.class b/bin/fenetres/create$9.class
index a7f9d85..3b6109f 100644
Binary files a/bin/fenetres/create$9.class and b/bin/fenetres/create$9.class differ
diff --git a/bin/fenetres/create.class b/bin/fenetres/create.class
index 33f37e4..43a6fa6 100644
Binary files a/bin/fenetres/create.class and b/bin/fenetres/create.class differ
diff --git a/bin/fenetres/create_act/actEvalPiedPageActive.class b/bin/fenetres/create_act/actEvalPiedPageActive.class
index b36416b..89b2e3c 100644
Binary files a/bin/fenetres/create_act/actEvalPiedPageActive.class and b/bin/fenetres/create_act/actEvalPiedPageActive.class differ
diff --git a/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.class b/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.class
index 2af5d2d..3281bb0 100644
Binary files a/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.class and b/bin/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.class differ
diff --git a/bin/fenetres/create_act/actTousLesNodesEvaluer.class b/bin/fenetres/create_act/actTousLesNodesEvaluer.class
index fb72ee9..5539b3b 100644
Binary files a/bin/fenetres/create_act/actTousLesNodesEvaluer.class and b/bin/fenetres/create_act/actTousLesNodesEvaluer.class differ
diff --git a/bin/list/listeAttributsAnalyseWriter.class b/bin/list/listeAttributsAnalyseWriter.class
index cf30fdf..b34288d 100644
Binary files a/bin/list/listeAttributsAnalyseWriter.class and b/bin/list/listeAttributsAnalyseWriter.class differ
diff --git a/bin/odreparagraphe.png b/bin/odreparagraphe.png
new file mode 100644
index 0000000..555d876
Binary files /dev/null and b/bin/odreparagraphe.png differ
diff --git a/bin/odreparagraphemini.png b/bin/odreparagraphemini.png
new file mode 100644
index 0000000..c4a8735
Binary files /dev/null and b/bin/odreparagraphemini.png differ
diff --git a/bin/ordreparagraphe.svg b/bin/ordreparagraphe.svg
new file mode 100644
index 0000000..b0908e4
--- /dev/null
+++ b/bin/ordreparagraphe.svg
@@ -0,0 +1,102 @@
+
+
diff --git a/bin/recherche.png b/bin/recherche.png
new file mode 100644
index 0000000..d5aa212
Binary files /dev/null and b/bin/recherche.png differ
diff --git a/bin/recherche.svg b/bin/recherche.svg
new file mode 100644
index 0000000..6d9579f
--- /dev/null
+++ b/bin/recherche.svg
@@ -0,0 +1,129 @@
+
+
diff --git a/bin/recherchemini.png b/bin/recherchemini.png
new file mode 100644
index 0000000..70f467a
Binary files /dev/null and b/bin/recherchemini.png differ
diff --git a/bin/resources/GPLv3.png b/bin/resources/GPLv3.png
new file mode 100644
index 0000000..55287db
Binary files /dev/null and b/bin/resources/GPLv3.png differ
diff --git a/bin/resources/GPLv3mini.png b/bin/resources/GPLv3mini.png
new file mode 100644
index 0000000..bd974ed
Binary files /dev/null and b/bin/resources/GPLv3mini.png differ
diff --git a/bin/resources/documentationmax.png b/bin/resources/documentationmax.png
new file mode 100644
index 0000000..cf0dae9
Binary files /dev/null and b/bin/resources/documentationmax.png differ
diff --git a/bin/resources/ordreparagraphe.png b/bin/resources/ordreparagraphe.png
new file mode 100644
index 0000000..555d876
Binary files /dev/null and b/bin/resources/ordreparagraphe.png differ
diff --git a/bin/resources/ordreparagraphemini.png b/bin/resources/ordreparagraphemini.png
new file mode 100644
index 0000000..c4a8735
Binary files /dev/null and b/bin/resources/ordreparagraphemini.png differ
diff --git a/bin/resources/recherche.png b/bin/resources/recherche.png
new file mode 100644
index 0000000..d5aa212
Binary files /dev/null and b/bin/resources/recherche.png differ
diff --git a/bin/resources/recherchemini.png b/bin/resources/recherchemini.png
new file mode 100644
index 0000000..70f467a
Binary files /dev/null and b/bin/resources/recherchemini.png differ
diff --git a/bin/resources/versevaluate.png b/bin/resources/versevaluate.png
new file mode 100644
index 0000000..2158f06
Binary files /dev/null and b/bin/resources/versevaluate.png differ
diff --git a/bin/resources/versevaluatemini.png b/bin/resources/versevaluatemini.png
new file mode 100644
index 0000000..379c72c
Binary files /dev/null and b/bin/resources/versevaluatemini.png differ
diff --git a/src/MEPTL/ecritureSujet.java b/src/MEPTL/ecritureSujet.java
index e259e35..8b3cf04 100644
--- a/src/MEPTL/ecritureSujet.java
+++ b/src/MEPTL/ecritureSujet.java
@@ -7,6 +7,7 @@ import cXML.Run;
import cXML.node;
import list.listeDesNodesAnalyseStyle;
import list.listeDesNodesAvecEvalNameNode;
+import list.listeDesNodesEvalPlacement;
import list.listeDesNodesRechercheByContenu;
import list.listeRechercheParAnchorPageNumber;
@@ -305,9 +306,9 @@ public class ecritureSujet {
no.get(k).getAttributs().put("evaluer", "false");
if( listeDesNodesAvecEvalNameNode.isEvalNameNode(no.get(k))) no.get(k).getAttributs().put("evalNameNode", "0");
if(listeDesNodesSautEtTitre(no.get(k).getNomElt())) {no.get(k).getAttributs().put("saut", "false"); no.get(k).getAttributs().put("titre", "");}
- if(listeDesNodesRechercheByContenu.isRechercheByContenu(no.get(k))) {no.get(k).getAttributs().put("recherche_index", "false"); no.get(k).getAttributs().put("recherche_contenu_exact", "false");no.get(k).getAttributs().put("recherche_contenu_plus_proche_voisin", "false");}
+ if(listeDesNodesRechercheByContenu.isRechercheByContenu(no.get(k))) {no.get(k).getAttributs().put("recherche_index", "false"); no.get(k).getAttributs().put("recherche_contenu_exact", "false");no.get(k).getAttributs().put("recherche_contenu_plus_proche_voisin", "false");no.get(k).getAttributs().put("allContent", "strict0");}
+ if(listeDesNodesEvalPlacement.isPlacement(no.get(k)))no.get(k).getAttributs().put("evalPlacement", "false");
if(listeDesNodesAnalyseStyle.isAnalyseStyle(no.get(k))) no.get(k).getAttributs().put("analyseStyle", "false");
- if(listeDesNodesRechercheByContenu.isRechercheByContenu(no.get(k))) no.get(k).getAttributs().put("allContent", "strict0");
if(listeRechercheParAnchorPageNumber.isRechercheParAnchorPageNumber(no.get(k))) no.get(k).getAttributs().put("recherche_anchor-page-number", "false");
if(!no.get(k).getNodes().isEmpty()) {
diff --git a/src/fenetres/afficheText.java b/src/fenetres/afficheText.java
index fe424cd..01137ad 100644
--- a/src/fenetres/afficheText.java
+++ b/src/fenetres/afficheText.java
@@ -59,6 +59,7 @@ public class afficheText extends JEditorPane {
String imageEnteteActive= "
";
String imagePiedPageActive= "";
String imageOU= "";
+ String imageEvalPlacement= "";
StringBuilder sb = new StringBuilder();
@@ -204,6 +205,9 @@ public class afficheText extends JEditorPane {
if(Lesattributsdunode.get(i).equals("evalPiedPageActive") && !nod.getAttributs().get(Lesattributsdunode.get(i)).equals("0")) {
sb.append(""+imagePiedPageActive + " " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"");
}
+ if(Lesattributsdunode.get(i).equals("evalPlacement") && !nod.getAttributs().get(Lesattributsdunode.get(i)).equals("0")) {
+ sb.append(""+imageEvalPlacement+ " " + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"");
+ }
// sb.append("" + Lesattributsdunode.get(i) + "=\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"");
}
diff --git a/src/fenetres/create.java b/src/fenetres/create.java
index 2f9beff..426eed2 100644
--- a/src/fenetres/create.java
+++ b/src/fenetres/create.java
@@ -183,24 +183,27 @@ public final class create extends JFrame {
private void ListenerAction() {
/**
- * Selection d'un node dans le JTree.
+ * Selection d'un node dans le JTree.
*/
tree.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
if(tree.getSelectionPath()!=null) {
selectNode = (DefaultMutableTreeNode) tree.getSelectionPath().getLastPathComponent();
- node nod = (node) selectNode.getUserObject();
- new createPopupMenu(nod);
- textNodeSelect.refreshAffichage(nod); //affiche des informations sur le node
- refreshTree();
+ node nod = (node) selectNode.getUserObject(); //node sélectionné.
+ new createPopupMenu(nod); // création du popup menu.
+ textNodeSelect.refreshAffichage(nod); //affiche des informations sur le node.
+// refreshTree(); //repaint l'arbre.
+ if(tree.isCollapsed(tree.getSelectionPath())){
+ tree.expandPath(tree.getSelectionPath()); //Etend le node sélectionné.
+ }
}
}
});
/**
- * Fermeture de la fenêtre.
+ * Fermeture de la fenêtre.
*/
addWindowListener(new java.awt.event.WindowAdapter() {
@Override
@@ -215,14 +218,16 @@ public final class create extends JFrame {
}
/**
- *
+ * Reapint l'arbre.
*/
private void refreshTree() {
tree.repaint();
}
- /* Methode de construction de la barre de menu */
+ /**
+ * Methode de construction de la barre de menu.
+ * */
private JMenuBar createMenuBar() {
// La barre de menu à proprement parler
@@ -533,6 +538,9 @@ public final class create extends JFrame {
}
};
+ /**
+ * Ferme l'application.
+ */
public void closeWindows() {
if(JOptionPane.showConfirmDialog(null,"Voulez-vous quitter analyseWriter?", "Quitter", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
dispose();
diff --git a/src/fenetres/createPopupMenu.java b/src/fenetres/createPopupMenu.java
index 641d217..d9a9b21 100644
--- a/src/fenetres/createPopupMenu.java
+++ b/src/fenetres/createPopupMenu.java
@@ -30,18 +30,19 @@ import fenetres.create_act.actEvalNumeroAbsoluePageNon;
import fenetres.create_act.actEvalNumeroAbsoluePageOui;
import fenetres.create_act.actEvalNumeroPageNon;
import fenetres.create_act.actEvalNumeroPageOui;
-import fenetres.create_act.actEvalOrdreParagrapheNon;
-import fenetres.create_act.actEvalOrdreParagrapheOui;
import fenetres.create_act.actEvalPiedPageActive;
import fenetres.create_act.actEvalPiedPageActiveNon;
import fenetres.create_act.actEvalPiedPagePasActive;
import fenetres.create_act.actEvalPiedPagePasActiveNon;
+import fenetres.create_act.actEvalPlacementParagrapheNon;
+import fenetres.create_act.actEvalPlacementParagrapheOui;
import fenetres.create_act.actEvalTextUserDefinedNon;
import fenetres.create_act.actEvalTextUserDefinedOui;
import fenetres.create_act.actEvalueFalse;
import fenetres.create_act.actEvalueTrue;
import fenetres.create_act.actEvaluerStyleFalse;
import fenetres.create_act.actEvaluerStyleTrue;
+import fenetres.create_act.actEvaluerTousLesStylesParagraphesFalse;
import fenetres.create_act.actEvaluerTousLesStylesParagraphesTrue;
import fenetres.create_act.actExpandAll;
import fenetres.create_act.actExpandNode;
@@ -68,6 +69,7 @@ import list.listeDesNodesAllContent;
import list.listeDesNodesAnalyseStyle;
import list.listeDesNodesAvecEvalNameNode;
import list.listeDesNodesAvecOU;
+import list.listeDesNodesEvalPlacement;
import list.listeDesNodesPourEvaluationEntetePage;
import list.listeDesNodesPourEvaluerPage;
import list.listeDesNodesPourEvaluerPiedDePage;
@@ -465,6 +467,7 @@ if(nod!=null) {
JMenu mnEvaluerStylesParagraphes = new JMenu("Evaluer tous les styles (paragraphes ou titres).");
mnEvaluerStylesParagraphes.setIcon(new ImageIcon(create.class.getResource("/resources/evaluertouslesstylesparagraphesmini.png")));
mnEvaluerStylesParagraphes.add( new actEvaluerTousLesStylesParagraphesTrue());
+ mnEvaluerStylesParagraphes.add( new actEvaluerTousLesStylesParagraphesFalse());
return mnEvaluerStylesParagraphes;
}
@@ -483,15 +486,17 @@ if(nod!=null) {
/**
* Menu respecter l'ordre des paragraphes.
- * Vérification de l'ordre par le node précédent.
+ * Vérification le placement du node par rapport à la présence :
+ * 1-du node précédent.
+ * 2-du node suivant.
* @return
*/
- private JMenu mnOrdreParagraphe() {
- JMenu mnOrdreParagraphe = new JMenu("Ordre des paragraphes");
- mnOrdreParagraphe.setIcon(new ImageIcon(create.class.getResource("/resources/ordreparagraphemini.png")));
- mnOrdreParagraphe.add(new actEvalOrdreParagrapheOui());
- mnOrdreParagraphe.add(new actEvalOrdreParagrapheNon());
- return mnOrdreParagraphe;
+ private JMenu mnPlacementParagraphe() {
+ JMenu mnPlacementParagraphe = new JMenu("Placement des paragraphes");
+ mnPlacementParagraphe.setIcon(new ImageIcon(create.class.getResource("/resources/ordreparagraphemini.png")));
+ mnPlacementParagraphe.add(new actEvalPlacementParagrapheOui());
+ mnPlacementParagraphe.add(new actEvalPlacementParagrapheNon());
+ return mnPlacementParagraphe;
}
/**
@@ -547,9 +552,9 @@ if(nod!=null) {
JMenu mnGroupeMethodeEvaluer = new JMenu("Evaluer le node");
mnGroupeMethodeEvaluer.setIcon( new ImageIcon(create.class.getResource("/resources/evaluatemini.png")));
- if(listeDesNodesAnalyseStyle.isAnalyseStyle(nod)) {
+ if(listeDesNodesAllContent.isAllContent(nod) ) {
mnGroupeMethodeEvaluer.addSeparator();
- mnGroupeMethodeEvaluer.add(mnAnalyseStyle());
+ mnGroupeMethodeEvaluer.add(new actAllContent());
}
if(listeEvalNameNode.isNodeEvalNameNode(nod)) {
@@ -557,11 +562,16 @@ if(nod!=null) {
mnGroupeMethodeEvaluer.add(mnEvalNameNode());
}
- if(listeDesNodesAllContent.isAllContent(nod) ) {
+ if(listeDesNodesAnalyseStyle.isAnalyseStyle(nod)) {
mnGroupeMethodeEvaluer.addSeparator();
- mnGroupeMethodeEvaluer.add(new actAllContent());
+ mnGroupeMethodeEvaluer.add(mnAnalyseStyle());
}
+ if(listeDesNodesEvalPlacement.isPlacement(nod)) {
+ mnGroupeMethodeEvaluer.addSeparator();
+ mnGroupeMethodeEvaluer.add(mnPlacementParagraphe());
+ }
+
if(listeDesNodesPourEvaluerPage.isPage(nod)) {
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(mnEvalNamePage());
@@ -571,8 +581,6 @@ if(nod!=null) {
mnGroupeMethodeEvaluer.add(mnEvalNumeroAbsoluePage());
mnGroupeMethodeEvaluer.addSeparator();
mnGroupeMethodeEvaluer.add(mnEvaluerStylesParagraphes());
- mnGroupeMethodeEvaluer.addSeparator();
- mnGroupeMethodeEvaluer.add(mnOrdreParagraphe());
}
if(listeDesNodesPourEvaluationEntetePage.isEntete(nod)) {
diff --git a/src/fenetres/create_act/actEvalOrdreParagrapheNon.java b/src/fenetres/create_act/actEvalOrdreParagrapheNon.java
deleted file mode 100644
index 8183d96..0000000
--- a/src/fenetres/create_act/actEvalOrdreParagrapheNon.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package fenetres.create_act;
-
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-
-public class actEvalOrdreParagrapheNon extends AbstractAction{
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
- {
- putValue( Action.NAME, "Supprimer évaluer l'ordre des paragraphes" );
- putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de l'ordre des paragraphes" );
- }
- @Override
- public void actionPerformed(ActionEvent e) {
- // TODO Auto-generated method stub
-
- }
-
-}
diff --git a/src/fenetres/create_act/actEvalOrdreParagrapheOui.java b/src/fenetres/create_act/actEvalOrdreParagrapheOui.java
deleted file mode 100644
index 23260bc..0000000
--- a/src/fenetres/create_act/actEvalOrdreParagrapheOui.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package fenetres.create_act;
-
-import java.awt.event.ActionEvent;
-
-import javax.swing.AbstractAction;
-import javax.swing.Action;
-
-public class actEvalOrdreParagrapheOui extends AbstractAction{
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
- {
- putValue( Action.NAME, "Oui, combien de point?" );
- putValue( Action.SHORT_DESCRIPTION, "Evaluer l'ordre des paragraphes" );
- }
- @Override
- public void actionPerformed(ActionEvent e) {
-
-
- }
-
-}
diff --git a/src/fenetres/create_act/actEvalPiedPageActive.java b/src/fenetres/create_act/actEvalPiedPageActive.java
index 3e9b8dd..f41d3a5 100644
--- a/src/fenetres/create_act/actEvalPiedPageActive.java
+++ b/src/fenetres/create_act/actEvalPiedPageActive.java
@@ -27,11 +27,11 @@ public class actEvalPiedPageActive extends AbstractAction{
point = Integer.valueOf(nod.getAttributs().get("evalPiedPageActive"));
}
- String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+ String Nombre = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
- if(!a.isEmpty()) {
+ if(!Nombre.isEmpty()) {
try {
- point = Integer.valueOf(a);
+ point = Integer.valueOf(Nombre);
if(point<=0) {
nod.getAttributs().put("evalPiedPageActive", String.valueOf(0));
fenetres.create.getTextNodeSelect().setText(baliseStyle.balise());
diff --git a/src/fenetres/create_act/actEvalPlacementParagrapheNon.java b/src/fenetres/create_act/actEvalPlacementParagrapheNon.java
new file mode 100644
index 0000000..681945d
--- /dev/null
+++ b/src/fenetres/create_act/actEvalPlacementParagrapheNon.java
@@ -0,0 +1,41 @@
+package fenetres.create_act;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+
+import cXML.node;
+import list.listeDesNodesEvalPlacement;
+
+public class actEvalPlacementParagrapheNon extends AbstractAction{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ {
+ putValue( Action.NAME, "Supprimer évaluer le placement du paragraphes" );
+ putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation du placement du paragraphes" );
+ }
+ @Override
+ public void actionPerformed(ActionEvent e) {
+
+ node nod = (node) fenetres.create.getSelectNode().getUserObject();
+
+
+ if(nod.getNomElt().equals("page")) {
+ for(int i =0 ; i < nod.getNodes().size(); i++) {
+ if(listeDesNodesEvalPlacement.isPlacement(nod.getNodes().get(i))) {
+ nod.getNodes().get(i).getAttributs().put("evalPlacement", "0");
+ }
+ }
+ }else {
+ nod.getAttributs().put("evalPlacement", "0");
+ }
+
+ fenetres.create.getTextNodeSelect().refreshAffichage(nod);
+
+ }
+
+}
diff --git a/src/fenetres/create_act/actEvalPlacementParagrapheOui.java b/src/fenetres/create_act/actEvalPlacementParagrapheOui.java
new file mode 100644
index 0000000..fd7294d
--- /dev/null
+++ b/src/fenetres/create_act/actEvalPlacementParagrapheOui.java
@@ -0,0 +1,76 @@
+package fenetres.create_act;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JOptionPane;
+
+import cXML.node;
+import fenetres.baliseStyle;
+import list.listeDesNodesEvalPlacement;
+
+public class actEvalPlacementParagrapheOui extends AbstractAction{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ {
+ putValue( Action.NAME, "Oui, combien de point?" );
+ putValue( Action.SHORT_DESCRIPTION, "Evaluer le placement du paragraphe" );
+ }
+ @Override
+ public void actionPerformed(ActionEvent e) {
+
+ node nod = (node) fenetres.create.getSelectNode().getUserObject();
+ int point = 0;
+ if(nod.getAttributs().get("evalPlacement")!=null) {
+ point = Integer.valueOf(nod.getAttributs().get("evalPlacement"));
+ }
+
+ String a = JOptionPane.showInputDialog(null,"Quel est le nombre de point?",point);
+
+ if(!a.isEmpty()) {
+ try {
+ point = Integer.valueOf(a);
+ if(point<=0) {
+ fenetres.create.getTextNodeSelect().setText(baliseStyle.balise());
+ fenetres.create.getTextNodeSelect().setText("Erreur la valeur doit être un nombre entier POSITIF supérieur à zéro.
Cependant,la valeur a été modifiée.
evalPlacement=0.
");
+ if(nod.getNomElt().equals("page")) {
+ for(int i =0 ; i < nod.getNodes().size(); i++) {
+ if(listeDesNodesEvalPlacement.isPlacement(nod.getNodes().get(i))) {
+ nod.getNodes().get(i).getAttributs().put("evalPlacement", "0");
+ }
+ }
+ }else {
+ nod.getAttributs().put("evalPlacement", "0");
+ }
+ }else {
+ if(nod.getNomElt().equals("page")) {
+ for(int i =0 ; i < nod.getNodes().size(); i++) {
+ if(listeDesNodesEvalPlacement.isPlacement(nod.getNodes().get(i))) {
+ nod.getNodes().get(i).getAttributs().put("evalPlacement", String.valueOf(point));
+ }
+ }
+ }else {
+ nod.getAttributs().put("evalPlacement", String.valueOf(point));
+ }
+ }
+ } catch (Exception e2) {
+ fenetres.create.getTextNodeSelect().setText(baliseStyle.balise());
+ fenetres.create.getTextNodeSelect().setText("Erreur la valeur doit être un nombre entier.
L'attribut n'a pas été modifiée.
");
+ }
+ }
+
+
+
+
+
+
+
+ fenetres.create.getTextNodeSelect().refreshAffichage(nod);
+
+ }
+
+}
diff --git a/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.java b/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.java
new file mode 100644
index 0000000..d8494f2
--- /dev/null
+++ b/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesFalse.java
@@ -0,0 +1,69 @@
+package fenetres.create_act;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.JOptionPane;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
+
+import MEPTL.commandes;
+import cXML.node;
+
+public class actEvaluerTousLesStylesParagraphesFalse extends AbstractAction{
+ {
+ putValue( Action.NAME, "Supprime la méthode analyseStyle de tous les paragraphes ou les titres." );
+ putValue( Action.SHORT_DESCRIPTION, "Retire analyseStyle de tous les nodes text:p ou text:h" );
+ }
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ TreePath path = fenetres.create.getTree().getSelectionPath();
+ node nod = (node) fenetres.create.getSelectNode().getUserObject();
+
+
+ boolean retire =false;
+ if(JOptionPane.showConfirmDialog(null,"Voulez-vous aussi retirer de tous les styles du node \"style:paragraph\"\n"
+ + "la méthode \"EvaluerATraversAnalyseStyle=true\"?", "Avertissement", JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE)==JOptionPane.YES_OPTION) {
+ retire=true;
+ }
+
+
+ for(int i =0 ; i < nod.getNodes().size(); i++) {
+ if(nod.getNodes().get(i).getNomElt().equals("text:p")||nod.getNodes().get(i).getNomElt().equals("text:h")) {
+ nod.getNodes().get(i).getAttributs().put("analyseStyle", "false");
+
+ //***************************************************************************************************************
+ //** Place l'attribut EvaluerATraversAnalyseStyle=true au style qui doit être évaluer à travers d'analyseStyle **
+ //** S'il y a des attributs évaluer avec ‽ alors change par ‼ **
+ //***************************************************************************************************************
+
+ if(retire) {
+ node nodStyle = commandes.sujet.retourneFirstNodeByNameAndAttributValueExactStrict("style:style", "style:name", nod.getNodes().get(i).getAttributs().get("text:style-name"));
+ if(nodStyle!=null) {
+ nodStyle.getAttributs().put("EvaluerATraversAnalyseStyle", "false");
+ nodStyle.changeLesCodesEvaluateursVersCodeEvaluateurDirect();;
+ }
+ }
+
+ }
+ }
+
+ DefaultTreeModel model = (DefaultTreeModel) fenetres.create.getTree().getModel();
+ DefaultMutableTreeNode root = (DefaultMutableTreeNode) model.getRoot();
+ model.reload(root);
+
+ fenetres.create.getTree().setSelectionPath(path);
+ fenetres.create.getTree().expandPath(path);
+
+ fenetres.create.getTree().repaint();
+
+ }
+
+}
diff --git a/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.java b/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.java
index 7aab257..0c3faa6 100644
--- a/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.java
+++ b/src/fenetres/create_act/actEvaluerTousLesStylesParagraphesTrue.java
@@ -18,7 +18,7 @@ public class actEvaluerTousLesStylesParagraphesTrue extends AbstractAction{
*/
private static final long serialVersionUID = 1L;
{
- putValue( Action.NAME, "Evaluer tous les styles." );
+ putValue( Action.NAME, "Evaluer à travers analyseStyle tous les paragraphes ou les titres." );
putValue( Action.SHORT_DESCRIPTION, "Evaluer tous les style:name des paragraphes text:p ou text:h" );
}
@Override
diff --git a/src/fenetres/create_act/actTousLesNodesEvaluer.java b/src/fenetres/create_act/actTousLesNodesEvaluer.java
index cd952e0..60f972c 100644
--- a/src/fenetres/create_act/actTousLesNodesEvaluer.java
+++ b/src/fenetres/create_act/actTousLesNodesEvaluer.java
@@ -26,7 +26,7 @@ public class actTousLesNodesEvaluer extends AbstractAction{
try {
commandes.sujetSauvegarde = commandes.sujet.clone();
- commandes.sujet.supprimeTousLesNodesEvaluerFalseOuNull();
+ commandes.sujet.supprimeTousLesNodesEvaluerFalseOuNull2();
commandes.fichierAnalyseValide=false;
fenetres.create.getTextNodeSelect().setContentType("text/html");
diff --git a/src/list/listeAttributsAnalyseWriter.java b/src/list/listeAttributsAnalyseWriter.java
index dd00f70..6bbd422 100644
--- a/src/list/listeAttributsAnalyseWriter.java
+++ b/src/list/listeAttributsAnalyseWriter.java
@@ -47,6 +47,8 @@ public class listeAttributsAnalyseWriter {
if(attribut.equals("evalTextUserDefined")) return true;
if(attribut.equals("evalNumeroAbsoluePage")) return true;
if(attribut.equals("evalNumeroPage")) return true;
+ if(attribut.equals("evalPlacement")) return true;
+
//Les attribut placer dans le node fichier du fichier d'analyse
if(attribut.equals("analysis_filename")) return true;
diff --git a/src/list/listeDesNodesAllContent.java b/src/list/listeDesNodesAllContent.java
index ae46c8b..fa21acd 100644
--- a/src/list/listeDesNodesAllContent.java
+++ b/src/list/listeDesNodesAllContent.java
@@ -12,6 +12,8 @@ public class listeDesNodesAllContent {
public static boolean isAllContent(node nod) {
if(nod.retourneLesContenusEnfants("").length()<=0) return false;
if(nod.getNomElt().equals("OU")) return false;
+ if(nod.getNomElt().equals("text:conditional-text")) return false;
+ if(nod.getNomElt().contains("text:bookmark")) return false;
if(nod.getNomElt().equals("page")) return true;
if(nod.getNomElt().contains("text:")) return true;
diff --git a/src/list/listeDesNodesAnalyseStyle.java b/src/list/listeDesNodesAnalyseStyle.java
index 6fb7518..40b9d8d 100644
--- a/src/list/listeDesNodesAnalyseStyle.java
+++ b/src/list/listeDesNodesAnalyseStyle.java
@@ -10,8 +10,13 @@ public class listeDesNodesAnalyseStyle {
* @return
*/
public static Boolean isAnalyseStyle(node nod) {
+ if(nod.getAttributs().get("text:style-name")!=null) return true;
if(nod.getNomElt().contains("text:database-display")) return false;
+ if(nod.getNomElt().contains("text:bookmark")) return false;
+
if(nod.getNomElt().contains("text:")) return true;
+
+
return false;
}
}
diff --git a/src/list/listeDesNodesEvalPlacement.java b/src/list/listeDesNodesEvalPlacement.java
new file mode 100644
index 0000000..37796ce
--- /dev/null
+++ b/src/list/listeDesNodesEvalPlacement.java
@@ -0,0 +1,17 @@
+package list;
+
+import cXML.node;
+
+public class listeDesNodesEvalPlacement {
+
+ public static boolean isPlacement(node nod) {
+ if(nod.getNomElt().equals("page")) return true;
+ if(nod.getNomElt().equals("text:p")) return true;
+ if(nod.getNomElt().equals("text:h")) return true;
+ if(nod.getNomElt().equals("text:list")) return true;
+ if(nod.getNomElt().equals("text:title")) return true;
+
+ return false;
+ }
+
+}