diff --git a/analyseWriter.exe b/analyseWriter.exe
index d3a226a..5d1e831 100644
Binary files a/analyseWriter.exe and b/analyseWriter.exe differ
diff --git a/bin/atraversanalysestyle.png b/bin/atraversanalysestyle.png
index 6593a5a..6abe8bd 100644
Binary files a/bin/atraversanalysestyle.png and b/bin/atraversanalysestyle.png differ
diff --git a/bin/atraversanalysestyle.svg b/bin/atraversanalysestyle.svg
index edad5ea..782045d 100644
--- a/bin/atraversanalysestyle.svg
+++ b/bin/atraversanalysestyle.svg
@@ -1,10 +1,10 @@
+ inkscape:snap-intersection-paths="true"
+ inkscape:showpageshadow="2"
+ inkscape:deskcolor="#d1d1d1"
+ showguides="true">
+
+
+
@@ -85,7 +99,12 @@
+
@@ -102,15 +121,59 @@
x="17.992798"
y="162.66893">S
-
+
+
+
+
+
+
+
+
+
+
diff --git a/bin/atraversanalysestylemini.png b/bin/atraversanalysestylemini.png
index e4d8607..80b0e3d 100644
Binary files a/bin/atraversanalysestylemini.png and b/bin/atraversanalysestylemini.png differ
diff --git a/bin/resources/atraversanalysestyle.png b/bin/resources/atraversanalysestyle.png
index 6593a5a..6abe8bd 100644
Binary files a/bin/resources/atraversanalysestyle.png and b/bin/resources/atraversanalysestyle.png differ
diff --git a/bin/resources/atraversanalysestylemini.png b/bin/resources/atraversanalysestylemini.png
index e4d8607..80b0e3d 100644
Binary files a/bin/resources/atraversanalysestylemini.png and b/bin/resources/atraversanalysestylemini.png differ
diff --git a/icons/atraversanalysestyle.png b/icons/atraversanalysestyle.png
index 6593a5a..6abe8bd 100644
Binary files a/icons/atraversanalysestyle.png and b/icons/atraversanalysestyle.png differ
diff --git a/icons/atraversanalysestyle.svg b/icons/atraversanalysestyle.svg
index edad5ea..782045d 100644
--- a/icons/atraversanalysestyle.svg
+++ b/icons/atraversanalysestyle.svg
@@ -1,10 +1,10 @@
+ inkscape:snap-intersection-paths="true"
+ inkscape:showpageshadow="2"
+ inkscape:deskcolor="#d1d1d1"
+ showguides="true">
+
+
+
@@ -85,7 +99,12 @@
+
@@ -102,15 +121,59 @@
x="17.992798"
y="162.66893">S
-
+
+
+
+
+
+
+
+
+
+
diff --git a/icons/atraversanalysestylemini.png b/icons/atraversanalysestylemini.png
index e4d8607..80b0e3d 100644
Binary files a/icons/atraversanalysestylemini.png and b/icons/atraversanalysestylemini.png differ
diff --git a/src/action/actEvaluerATraversAnalyseStyleFalse.java b/src/action/actEvaluerATraversAnalyseStyleFalse.java
index dbf89a9..d05b080 100644
--- a/src/action/actEvaluerATraversAnalyseStyleFalse.java
+++ b/src/action/actEvaluerATraversAnalyseStyleFalse.java
@@ -16,7 +16,7 @@ public class actEvaluerATraversAnalyseStyleFalse extends AbstractAction{
{
putValue( Action.NAME, "N'évaluer pas le style dans la structure." );
putValue( Action.SHORT_DESCRIPTION, "N'évaluer pas le style:name de ce node dans la struture du fichier de l'étudiant" );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")));
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/atraversanalysestylefalsemini.png")));
}
/**
*
diff --git a/src/action/actEvaluerATraversAnalyseStyleTrue.java b/src/action/actEvaluerATraversAnalyseStyleTrue.java
index c9fac83..2454fd9 100644
--- a/src/action/actEvaluerATraversAnalyseStyleTrue.java
+++ b/src/action/actEvaluerATraversAnalyseStyleTrue.java
@@ -16,7 +16,7 @@ public class actEvaluerATraversAnalyseStyleTrue extends AbstractAction{
{
putValue( Action.NAME, "Evaluer le style dans la structure." );
putValue( Action.SHORT_DESCRIPTION, "Evaluer le style:name de ce node dans la struture du fichier de l'étudiant");
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/truemini.png")));
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/atraversanalysestyletruemini.png")));
}
/**
*
diff --git a/src/action/actEvaluerLegacyStyleParentFalse.java b/src/action/actEvaluerLegacyStyleParentFalse.java
index 3de4eaa..b47b7fd 100644
--- a/src/action/actEvaluerLegacyStyleParentFalse.java
+++ b/src/action/actEvaluerLegacyStyleParentFalse.java
@@ -13,7 +13,7 @@ public class actEvaluerLegacyStyleParentFalse extends AbstractAction{
{
putValue( Action.NAME, "Supprime l'évaluation de la présence ou absence du style Parent." );
putValue( Action.SHORT_DESCRIPTION, "Supprime l'évaluation de la présence ou absence du style Parent." );
- putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/heritagestylefalse.png")) );
+ putValue( Action.SMALL_ICON, new ImageIcon(create.class.getResource("/resources/falsemini.png")) );
}
private static final long serialVersionUID = 1L;
diff --git a/src/fenetres/create.java b/src/fenetres/create.java
index 46e9cd3..701a876 100644
--- a/src/fenetres/create.java
+++ b/src/fenetres/create.java
@@ -86,6 +86,8 @@ import action.actEvalTabDefautStyleLeaderOui;
import action.actEvalueFalse;
import action.actEvalueTrue;
import action.actEvaluer;
+import action.actEvaluerATraversAnalyseStyleFalse;
+import action.actEvaluerATraversAnalyseStyleTrue;
import action.actEvaluerNomDuStyleHeriteFalse;
import action.actEvaluerNomDuStyleHeriteTrue;
import action.actEvaluerStyleFalse;
@@ -186,6 +188,8 @@ public final class create extends JFrame {
private final JButton btnevalTABAlignementAGauchefalse = new JButton(new actEvalTabAlignementGaucheNon());
private final JButton btnevalTABStyleLeaderDefaulttrue = new JButton(new actEvalTabDefautStyleLeaderOui());
private final JButton btnevalTABStyleLeaderDefaultfalse = new JButton(new actEvalTabDefautStyleLeaderNon());
+ private final JButton btnEvaluerATraversAnalyseStyletrue = new JButton(new actEvaluerATraversAnalyseStyleTrue());
+ private final JButton btnEvaluerATraversAnalyseStylefalse = new JButton(new actEvaluerATraversAnalyseStyleFalse());
// private AbstractAction allContent = new actAllContent();
@@ -271,6 +275,10 @@ public final class create extends JFrame {
btnevalTABStyleLeaderDefaulttrue.setEnabled(false);
btnevalTABStyleLeaderDefaultfalse.setIcon(new ImageIcon(create.class.getResource("/resources/EvalTabDefautStyleLeaderfalse.png")));
btnevalTABStyleLeaderDefaultfalse.setEnabled(false);
+ btnEvaluerATraversAnalyseStyletrue.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestyletrue.png")));
+ btnEvaluerATraversAnalyseStyletrue.setEnabled(false);
+ btnEvaluerATraversAnalyseStylefalse.setIcon(new ImageIcon(create.class.getResource("/resources/atraversanalysestylefalse.png")));
+ btnEvaluerATraversAnalyseStylefalse.setEnabled(false);
setBackground(new Color(255, 255, 255));
try {
@@ -511,6 +519,12 @@ public final class create extends JFrame {
btnevalTABStyleLeaderDefaultfalse.setText("");
panelDroiteBoutons.add(btnevalTABStyleLeaderDefaultfalse, "cell 3 7");
+
+ btnEvaluerATraversAnalyseStyletrue.setText("");
+ panelDroiteBoutons.add(btnEvaluerATraversAnalyseStyletrue, "cell 4 7");
+
+ btnEvaluerATraversAnalyseStylefalse.setText("");
+ panelDroiteBoutons.add(btnEvaluerATraversAnalyseStylefalse, "cell 5 7");
JSplitPane splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, rightScrollPane, ScrollPaneTableBouton );
@@ -626,6 +640,9 @@ public final class create extends JFrame {
btnevalTABAlignementAGauchefalse.setEnabled(false);
btnevalTABStyleLeaderDefaulttrue.setEnabled(false);
btnevalTABStyleLeaderDefaultfalse.setEnabled(false);
+ btnEvaluerATraversAnalyseStyletrue.setEnabled(false);
+ btnEvaluerATraversAnalyseStylefalse.setEnabled(false);
+
if(listeDesNodesAllContent.isAllContent(nod)) {
btnAllContent.setEnabled(true);
@@ -692,6 +709,10 @@ public final class create extends JFrame {
btnevalTABStyleLeaderDefaulttrue.setEnabled(true);
btnevalTABStyleLeaderDefaultfalse.setEnabled(true);
}
+ if(nod.getNomElt().equals("style:style")) {
+ btnEvaluerATraversAnalyseStyletrue.setEnabled(true);
+ btnEvaluerATraversAnalyseStylefalse.setEnabled(true);
+ }
}
}
});
@@ -1012,7 +1033,7 @@ public final class create extends JFrame {
System.out.println( "Cut" );
}
};
- private final JLabel lblNewLabel_1 = new JLabel("Les méthodes d'évaluations d'un node");
+ private final JLabel lblNewLabel_1 = new JLabel("Les méthodes d'évaluation d'un node");
/**
diff --git a/src/resources/atraversanalysestyle.png b/src/resources/atraversanalysestyle.png
index 6593a5a..6abe8bd 100644
Binary files a/src/resources/atraversanalysestyle.png and b/src/resources/atraversanalysestyle.png differ
diff --git a/src/resources/atraversanalysestylefalse.png b/src/resources/atraversanalysestylefalse.png
new file mode 100644
index 0000000..2ac6c5a
Binary files /dev/null and b/src/resources/atraversanalysestylefalse.png differ
diff --git a/src/resources/atraversanalysestylefalsemini.png b/src/resources/atraversanalysestylefalsemini.png
new file mode 100644
index 0000000..b7ffb6e
Binary files /dev/null and b/src/resources/atraversanalysestylefalsemini.png differ
diff --git a/src/resources/atraversanalysestylemini.png b/src/resources/atraversanalysestylemini.png
index e4d8607..80b0e3d 100644
Binary files a/src/resources/atraversanalysestylemini.png and b/src/resources/atraversanalysestylemini.png differ
diff --git a/src/resources/atraversanalysestyletrue.png b/src/resources/atraversanalysestyletrue.png
new file mode 100644
index 0000000..c0e52b3
Binary files /dev/null and b/src/resources/atraversanalysestyletrue.png differ
diff --git a/src/resources/atraversanalysestyletruemini.png b/src/resources/atraversanalysestyletruemini.png
new file mode 100644
index 0000000..3099742
Binary files /dev/null and b/src/resources/atraversanalysestyletruemini.png differ