V4.4.0 (Préparation nouvelle version)

This commit is contained in:
pablo rodriguez 2022-12-11 08:30:19 +01:00
parent 33b73290be
commit cee58adc93
56 changed files with 221 additions and 93 deletions

View File

@ -27,7 +27,7 @@
<runtimeBits>64/32</runtimeBits>
</jre>
<versionInfo>
<fileVersion>4.3.2.0</fileVersion>
<fileVersion>4.4.0.0</fileVersion>
<txtFileVersion>analyseWriter</txtFileVersion>
<fileDescription>évaluer les mise en forme des fichiers au format ODF.</fileDescription>
<copyright>GNU GLP 3.0</copyright>

Binary file not shown.

Binary file not shown.

2
bin/.gitignore vendored
View File

@ -1 +1,3 @@
/fenetres/
/resources/
/MEPTL/

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@ -0,0 +1,168 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
version="1.1"
id="svg2"
width="48"
height="48"
viewBox="0 0 48 48"
sodipodi:docname="versfichierAnalyseModifmax.svg"
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
inkscape:export-filename="versfichierAnalyse.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs6">
<filter
inkscape:collect="always"
style="color-interpolation-filters:sRGB"
id="filter1034"
x="-0.046947865"
y="-0.067818573"
width="1.0938957"
height="1.1356371">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.63110941"
id="feGaussianBlur1036" />
</filter>
<linearGradient
id="k"
gradientTransform="matrix(7.99974,0,0,7.9977797,-858.34866,-7808.5538)"
gradientUnits="userSpaceOnUse"
x1="122.75008"
x2="111.74973"
xlink:href="#b"
y1="991.62115"
y2="977.11713" />
<linearGradient
id="b">
<stop
offset="0"
stop-color="#0369a3"
id="stop7" />
<stop
offset="1"
stop-color="#1c99e0"
id="stop9" />
</linearGradient>
<linearGradient
id="j"
gradientUnits="userSpaceOnUse"
x1="108.00134"
x2="20.001341"
y1="122"
y2="6"
gradientTransform="translate(15.618749,0.21353103)">
<stop
offset="0"
stop-color="#e6e6e6"
id="stop35" />
<stop
offset="1"
stop-color="#fff"
id="stop37" />
</linearGradient>
</defs>
<sodipodi:namedview
id="namedview4"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="9.4262292"
inkscape:cx="20.315653"
inkscape:cy="21.005218"
inkscape:window-width="1920"
inkscape:window-height="1009"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="g8" />
<g
inkscape:groupmode="layer"
inkscape:label="Image"
id="g8">
<g
id="g923"
transform="matrix(0.32070656,0,0,0.32623355,-2.3331264,2.47938)">
<path
d="m 34.652398,1.9735766 c -0.25037,0 -0.50072,0.011156 -0.75,0.035156 -3.66708,0.6998 -4.56576,2.2662469 -4.5,5.9980468 V 123.97553 c 4e-4,4.1875 1.81149,5.99765 6,5.99805 h 91.998062 c 4.1885,-4e-4 5.99764,-1.81055 5.99804,-5.99805 V 52.157171 c 0.048,-2.1119 -0.78004,-4.230247 -2.25,-5.748047 L 88.988348,4.2587328 c -1.51819,-1.4691999 -3.63759,-2.2988999 -5.75,-2.25 h -47.83595 c -0.24919,-0.024 -0.49962,-0.035156 -0.75,-0.035156 z m 70.009782,0.013672 c -0.20997,0 -0.41948,0.016828 -0.62695,0.048828 -2.66247,0.8528 -3.55843,4.904547 -1.50586,6.810547 l 24.0957,24.2207034 c 2.22593,2.1217 6.6581,0.306209 6.77538,-2.775391 V 6.0712326 c -2.4e-4,-2.1136998 -1.91298,-4.034856 -4.01561,-4.035156 h -24.09376 c -0.20758,-0.032 -0.41894,-0.048828 -0.6289,-0.048828 z"
fill="url(#k)"
id="path41"
style="fill:url(#k)" />
<path
d="M 35.400458,7.9735766 V 123.97358 H 127.40048 V 51.973577 L 83.400478,7.9735766 Z"
fill="url(#j)"
id="path43"
style="fill:url(#j)" />
<text
xml:space="preserve"
style="font-size:35.6383px;line-height:1.25;font-family:'C.A. Gatintas';-inkscape-font-specification:'C.A. Gatintas';text-align:center;text-anchor:middle;stroke-width:3.09159"
x="77.788284"
y="121.28213"
id="text2174"
transform="scale(1.0649026,0.93905301)"><tspan
sodipodi:role="line"
id="tspan2172"
style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-family:arial;-inkscape-font-specification:'arial Heavy';stroke-width:3.09159"
x="77.788284"
y="121.28213">XML</tspan></text>
</g>
<path
id="path478"
style="font-variation-settings:normal;opacity:0.669154;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.40618;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter1034);stop-color:#000000;stop-opacity:1"
inkscape:transform-center-x="3.1112105"
inkscape:transform-center-y="-0.054301033"
d="m 30.486804,9.6620597 -8.79323,5.6534963 -8.793231,5.653496 8.869053,5.513523 8.866887,5.513523 -0.039,-6.016477 H 45.162994 V 15.676165 h -14.63503 z"
transform="matrix(1.0705178,0,0,1.1501296,-0.85321146,-4.7664936)"
sodipodi:nodetypes="cccccccccc" />
<g
id="g2515"
transform="matrix(0.84392953,0,0,0.84411467,1.5088515,2.632983)"
style="stroke-width:1.1848">
<path
id="path2385"
style="opacity:1;fill:#000000;stroke:#000000;stroke-width:0.592401;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
d="m 20.576172,-0.50390625 c -0.511807,0 -0.923828,0.41202143 -0.923828,0.92382813 V 1.5957031 c 0,0.060626 0.0065,0.1204277 0.01758,0.1777344 C 19.002409,1.9356134 18.36936,2.2160878 17.800781,2.6015625 17.75299,2.5052811 17.68673,2.4159788 17.603516,2.3378906 L 16.746094,1.5332031 c -0.373216,-0.3502234 -0.954464,-0.3322 -1.304688,0.041016 l -0.748047,0.796875 c -0.350222,0.3732152 -0.330247,0.954464 0.04297,1.3046874 l 0.857422,0.8046876 c 0.10546,0.098963 0.22656,0.168589 0.355469,0.2089843 C 15.661353,5.2362192 15.463504,5.8258136 15.363281,6.4355469 15.202398,6.3144166 15.001068,6.2442748 14.783203,6.25 l -1.175781,0.03125 c -0.511631,0.013445 -0.913836,0.4356355 -0.900391,0.9472656 l 0.0293,1.0917969 c 0.01344,0.5116301 0.435635,0.9138355 0.947266,0.9003906 l 1.175781,-0.03125 c 0.254816,-0.0067 0.482116,-0.1149979 0.644531,-0.2851562 0.156362,0.5575432 0.396045,1.0882705 0.710938,1.5742191 -0.106983,0.04933 -0.207668,0.120839 -0.292969,0.21289 l -0.798828,0.861328 c -0.347876,0.375406 -0.326579,0.958765 0.04883,1.306641 l 0.800781,0.742187 c 0.375406,0.347876 0.958765,0.324624 1.306641,-0.05078 l 0.798828,-0.861328 c 0.08801,-0.09497 0.152446,-0.204049 0.193359,-0.318359 0.476786,0.262347 0.75012,0.442012 1.28125,0.560547 -0.151461,0.174513 1.27e-4,0.419893 0.01367,0.669921 l 0.06445,1.173829 c 0.02768,0.511057 0.461598,0.900724 0.972657,0.873047 l 1.089843,-0.06055 c 0.511059,-0.02768 0.898773,-0.459646 0.871094,-0.970703 l -0.0625,-1.175782 c -0.01033,-0.190682 0.09458,-0.391783 -0.01172,-0.533203 0.511297,-0.117213 0.832276,-0.276496 1.292969,-0.527344 0.04468,0.151557 0.128353,0.293407 0.251953,0.410157 l 0.853516,0.808593 c 0.372066,0.351445 0.955197,0.333002 1.30664,-0.03906 l 0.75,-0.792969 c 0.351445,-0.372066 0.334958,-0.955197 -0.03711,-1.30664 l -0.855469,-0.806641 c -0.06596,-0.0623 -0.13812,-0.113104 -0.214843,-0.152344 0.283379,-0.434079 0.506758,-0.904489 0.664062,-1.3984374 0.116839,0.047858 0.244128,0.072581 0.378906,0.068359 l 1.175782,-0.037109 c 0.511555,-0.016024 0.910555,-0.4415692 0.894531,-0.953125 L 28.91797,7.0917969 C 28.901934,6.5802411 28.476399,6.1812416 27.964844,6.1972656 l -1.175782,0.037109 c -0.0373,0.00117 -0.07339,0.00438 -0.109374,0.00977 -0.119394,-0.6062006 -0.33571,-1.1891981 -0.640626,-1.7265625 0.09743,-0.049079 0.187289,-0.115774 0.265626,-0.2011719 L 27.099609,3.4492188 C 27.445582,3.072059 27.422081,2.4905034 27.044922,2.1445312 L 26.240234,1.40625 C 25.863075,1.0602778 25.279565,1.0857306 24.933594,1.4628906 L 24.138672,2.328125 c -0.03508,0.038238 -0.06433,0.079101 -0.0918,0.1210938 -0.460109,-0.2832413 -0.957843,-0.5002195 -1.478516,-0.6445313 0.01543,-0.067158 0.02344,-0.1370115 0.02344,-0.2089844 V 0.41992188 c 0,-0.5118067 -0.412022,-0.92382813 -0.923828,-0.92382813 z m 0.253906,4.82617185 a 3.25,3.25 0 0 1 3.25,3.25 3.25,3.25 0 0 1 -3.25,3.2500004 3.25,3.25 0 0 1 -3.25,-3.2500004 3.25,3.25 0 0 1 3.25,-3.25 z" />
<circle
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.592401;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="path2456"
cx="20.82917"
cy="7.5729475"
r="2.5" />
</g>
<g
id="g2521"
transform="matrix(1.0736028,0.3084118,-0.30836043,1.0738801,-10.615096,5.6358743)"
style="fill:#ff0000;stroke-width:0.895134">
<path
id="path2517"
style="opacity:1;fill:#000000;stroke:#000000;stroke-width:0.447567;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
d="m 20.576172,-0.50390625 c -0.511807,0 -0.923828,0.41202143 -0.923828,0.92382813 V 1.5957031 c 0,0.060626 0.0065,0.1204277 0.01758,0.1777344 C 19.002409,1.9356134 18.36936,2.2160878 17.800781,2.6015625 17.75299,2.5052811 17.68673,2.4159788 17.603516,2.3378906 L 16.746094,1.5332031 c -0.373216,-0.3502234 -0.954464,-0.3322 -1.304688,0.041016 l -0.748047,0.796875 c -0.350222,0.3732152 -0.330247,0.954464 0.04297,1.3046874 l 0.857422,0.8046876 c 0.10546,0.098963 0.22656,0.168589 0.355469,0.2089843 C 15.661353,5.2362192 15.463504,5.8258136 15.363281,6.4355469 15.202398,6.3144166 15.001068,6.2442748 14.783203,6.25 l -1.175781,0.03125 c -0.511631,0.013445 -0.913836,0.4356355 -0.900391,0.9472656 l 0.0293,1.0917969 c 0.01344,0.5116301 0.435635,0.9138355 0.947266,0.9003906 l 1.175781,-0.03125 c 0.254816,-0.0067 0.482116,-0.1149979 0.644531,-0.2851562 0.156362,0.5575432 0.396045,1.0882705 0.710938,1.5742191 -0.106983,0.04933 -0.207668,0.120839 -0.292969,0.21289 l -0.798828,0.861328 c -0.347876,0.375406 -0.326579,0.958765 0.04883,1.306641 l 0.800781,0.742187 c 0.375406,0.347876 0.958765,0.324624 1.306641,-0.05078 l 0.798828,-0.861328 c 0.08801,-0.09497 0.152446,-0.204049 0.193359,-0.318359 0.476786,0.262347 0.75012,0.442012 1.28125,0.560547 -0.151461,0.174513 1.27e-4,0.419893 0.01367,0.669921 l 0.06445,1.173829 c 0.02768,0.511057 0.461598,0.900724 0.972657,0.873047 l 1.089843,-0.06055 c 0.511059,-0.02768 0.898773,-0.459646 0.871094,-0.970703 l -0.0625,-1.175782 c -0.01033,-0.190682 0.09458,-0.391783 -0.01172,-0.533203 0.511297,-0.117213 0.832276,-0.276496 1.292969,-0.527344 0.04468,0.151557 0.128353,0.293407 0.251953,0.410157 l 0.853516,0.808593 c 0.372066,0.351445 0.955197,0.333002 1.30664,-0.03906 l 0.75,-0.792969 c 0.351445,-0.372066 0.334958,-0.955197 -0.03711,-1.30664 l -0.855469,-0.806641 c -0.06596,-0.0623 -0.13812,-0.113104 -0.214843,-0.152344 0.283379,-0.434079 0.506758,-0.904489 0.664062,-1.3984374 0.116839,0.047858 0.244128,0.072581 0.378906,0.068359 l 1.175782,-0.037109 c 0.511555,-0.016024 0.910555,-0.4415692 0.894531,-0.953125 L 28.91797,7.0917969 C 28.901934,6.5802411 28.476399,6.1812416 27.964844,6.1972656 l -1.175782,0.037109 c -0.0373,0.00117 -0.07339,0.00438 -0.109374,0.00977 -0.119394,-0.6062006 -0.33571,-1.1891981 -0.640626,-1.7265625 0.09743,-0.049079 0.187289,-0.115774 0.265626,-0.2011719 L 27.099609,3.4492188 C 27.445582,3.072059 27.422081,2.4905034 27.044922,2.1445312 L 26.240234,1.40625 C 25.863075,1.0602778 25.279565,1.0857306 24.933594,1.4628906 L 24.138672,2.328125 c -0.03508,0.038238 -0.06433,0.079101 -0.0918,0.1210938 -0.460109,-0.2832413 -0.957843,-0.5002195 -1.478516,-0.6445313 0.01543,-0.067158 0.02344,-0.1370115 0.02344,-0.2089844 V 0.41992188 c 0,-0.5118067 -0.412022,-0.92382813 -0.923828,-0.92382813 z m 0.253906,4.82617185 a 3.25,3.25 0 0 1 3.25,3.25 3.25,3.25 0 0 1 -3.25,3.2500004 3.25,3.25 0 0 1 -3.25,-3.2500004 3.25,3.25 0 0 1 3.25,-3.25 z" />
<circle
style="opacity:1;fill:none;stroke:#000000;stroke-width:0.447567;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000"
id="circle2519"
cx="20.82917"
cy="7.5729475"
r="2.5" />
</g>
<path
id="path266"
style="font-variation-settings:normal;opacity:1;fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
inkscape:transform-center-x="3.1112105"
inkscape:transform-center-y="-0.054300821"
d="m 30.932251,8.5308856 -9.413309,6.5022554 -9.41331,6.502253 9.494479,6.341266 9.49216,6.341266 -0.04175,-6.919728 h 15.592853 v -11.85031 h -15.66706 z"
sodipodi:nodetypes="cccccccccc" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -32,7 +32,7 @@ public class commandes {
public static node nodeCSV = null;
//**version
public static String version ="V4.3.2"; // La version actuelle
public static String version ="V4.4.0"; // La version actuelle
public static String branch = "Origin";
public static String Annee ="2022";

View File

@ -72,7 +72,11 @@ import fenetres.create_act.actUpNode;
/**
*
* @author pablo rodriguez
*
*/
public final class create extends JFrame {
private static final long serialVersionUID = 1L;
@ -81,25 +85,15 @@ public final class create extends JFrame {
private static DefaultMutableTreeNode selectNode;
private static afficheText textNodeSelect = new afficheText();
private JToolBar toolBarPrincipal;
// private toolBarRecherche bRecherche;
// private JCheckBoxMenuItem chckbxtoolBarRecherche;
private JMenuBar menuBar = new JMenuBar();
private static JButton buttonEvaluate;
private static JToggleButton tglbtnTousLesNodes;
private JPanel panelPrincipal;
// private JPanel panel;
private JPanel panelPrincipal;
private static create instance;
/**
* Create the application.
* Création de la fenêtre.</br>
*/
public create() {
try {
@ -110,11 +104,16 @@ public final class create extends JFrame {
setVisible(true);
}
/**
* Obtient l'instance encours.</br>
* @return l'instance de la fenêtre.</br>
*/
public static create getInstance() {
if (instance == null) {
instance = new create();
}
instance.setVisible(true);
lectureFichierDejaCharger();
return instance;
}
@ -174,11 +173,13 @@ public final class create extends JFrame {
this.setExtendedState(MAXIMIZED_BOTH);
ListenerAction();
}
/**
* Selection du node du tree et d'un node CXML
* Selection du node du tree et d'un node CXML.</br>
* Fermeture de la fenêtre.<br>
*/
private void ListenerAction() {
@ -196,6 +197,8 @@ public final class create extends JFrame {
// refreshTree(); //repaint l'arbre.
if(tree.isCollapsed(tree.getSelectionPath())){
tree.expandPath(tree.getSelectionPath()); //Etend le node sélectionné.
}else {
tree.collapsePath(tree.getSelectionPath());
}
}
}
@ -261,9 +264,6 @@ public final class create extends JFrame {
menuBar.add(mnuEdit);
// chckbxtoolBarRecherche = new JCheckBoxMenuItem("Barre outils recherche node");
// chckbxtoolBarRecherche.setSelected(true);
// mnAffiche.add(chckbxtoolBarRecherche);
// Définition du menu Node
JMenu mnNode = new JMenu("Modifier");
@ -320,7 +320,9 @@ public final class create extends JFrame {
return menuBar;
}
/* Methode de construction de la barre d'outils */
/**
* Methode de construction de la barre d'outils/</br>
*/
private void createToolBar() {
toolBarPrincipal = new JToolBar();
toolBarPrincipal.setFloatable(false);
@ -474,7 +476,7 @@ public final class create extends JFrame {
/**
*
* Annule une action.</br>
*/
private AbstractAction actUndo = new AbstractAction() {
@ -614,6 +616,22 @@ public final class create extends JFrame {
return parent;
}
/**
* Lecture du fichier déjà chargé.</br>
*/
private static void lectureFichierDejaCharger() {
if(commandes.fichierAnalyseValide) {
fenetres.create.constructionTree();
fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse();
fenetres.create.getTglbtnTousLesNodes().setSelected(false);
fenetres.create.getButtonEvaluate().setEnabled(true);
fenetres.create.getTextNodeSelect().afficheChargementFichierAnalyse();
}else {
fenetres.create.getTextNodeSelect().setContentType("text/plain");
}
}
public static JTree getTree() {
return tree;
@ -684,23 +702,6 @@ public final class create extends JFrame {
// void saySomething(String eventDescription, TreeExpansionEvent e) {
// System.out.println(eventDescription + "; " + "path = " + e.getPath());
// }
//
//
// // Required by TreeExpansionListener interface.
// public void treeExpanded(TreeExpansionEvent e) {
// saySomething("Tree-expanded event detected", e);
// }
//
// // Required by TreeExpansionListener interface.
// public void treeCollapsed(TreeExpansionEvent e) {
// saySomething("Tree-collapsed event detected", e);
// }
@ -710,53 +711,5 @@ public final class create extends JFrame {
//class MyTreeWillExpandListener implements TreeWillExpandListener {
//
//
// public void treeWillExpand(TreeExpansionEvent evt) throws ExpandVetoException {
// JTree tree = (JTree) evt.getSource();
//
// TreePath path = evt.getPath();
// boolean veto = false;
// if (veto) {
// throw new ExpandVetoException(evt);
// }
// }
//
// public void treeWillCollapse(TreeExpansionEvent evt) throws ExpandVetoException {
// JTree tree = (JTree) evt.getSource();
//
// TreePath path = evt.getPath();
// boolean veto = false;
// if (veto) {
// throw new ExpandVetoException(evt);
// }
// }
//}
//class MyTreeExpansionListener implements TreeExpansionListener {
//
// public ArrayList<TreePath> Chemin = new ArrayList<TreePath>();
//
// public ArrayList<TreePath> getChemin() {
// return Chemin;
// }
//
// public void setChemin(ArrayList<TreePath> chemin) {
// Chemin = chemin;
// }
//
// public void treeExpanded(TreeExpansionEvent evt) {
// TreePath path = evt.getPath();
// Chemin.add(path);
// System.out.println("treeExpanded");
// }
//
// public void treeCollapsed(TreeExpansionEvent evt) {
// TreePath path = evt.getPath();
// Chemin.remove(path);
// System.out.println("treeCollapsed");
//
// }
//}

View File

@ -44,6 +44,11 @@ import fenetres.create_act.actLicence;
import fenetres.create_act.actTutoriels;
import net.miginfocom.swing.MigLayout;
/**
*
* @author pablo rodriguez
*
*/
public class evaluate extends JFrame {
/**
@ -71,7 +76,7 @@ public class evaluate extends JFrame {
private JCheckBox chckbxVerif;
private JCheckBox chckbxNewLogo;
private JCheckBox chckbxNoDetail;
private afficheText txtpnmessages;
private static afficheText txtpnmessages;
private static evaluate instance;
@ -81,10 +86,6 @@ public class evaluate extends JFrame {
public void initialize() throws UnsupportedLookAndFeelException{
setSize(1200,800);
ImageIcon img = new ImageIcon(getClass().getResource("/evalwriter.png") );
this.setIconImage(img.getImage());
setTitle(commandes.Titre + " " + commandes.version + " " + commandes.branch);
@ -231,7 +232,6 @@ public class evaluate extends JFrame {
panelWest.add(chckbxVerif, "flowy,cell 1 7,growx,aligny top");
chckbxVerif.setSelected(commandes.verifHisto2);
lblChargementFichierCSV = new JLabel("Chargement de la liste des étudiants");
panelWest.add(lblChargementFichierCSV, "cell 1 8,alignx left,aligny center");
@ -346,6 +346,11 @@ public class evaluate extends JFrame {
instance = new evaluate();
}
instance.setVisible(true);
if(commandes.fichierAnalyseValide) {
txtpnmessages.afficheChargementFichierAnalyse();
}else {
txtpnmessages.setText(baliseStyle.balise() + "<hr class=\"city\"><h1>*** Veuillez charger un fichier d'analyse ***</h1><hr>");
}
return instance;
}
@ -448,7 +453,7 @@ public class evaluate extends JFrame {
public void actionPerformed(ActionEvent e) {
}
});
btnModifierFichierAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/fichierAnalyseModif.png")));
btnModifierFichierAnalyse.setIcon(new ImageIcon(evaluate.class.getResource("/resources/versfichierAnalyse.png")));
btnModifierFichierAnalyse.setHideActionText(true);
toolBar.add(btnModifierFichierAnalyse);

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB