MAJ (V4.3.1 : Amélioration de la lecture des points dans la fenêtre de
création du fichier d'analyse)
This commit is contained in:
parent
fc08de2008
commit
d0632ff7d7
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.
@ -71,23 +71,42 @@ public class calculNombrePointEvaluation {
|
||||
}
|
||||
|
||||
Enumeration<String> key = nod.getAttributs().keys();
|
||||
while(key.hasMoreElements()) {
|
||||
String k = key.nextElement();
|
||||
if(nod.getAttributs().get(k).contains("‽")||nod.getAttributs().get(k).contains("‼")) {
|
||||
Pattern pt = Pattern.compile("[0-9]{1,}$");
|
||||
Matcher match= pt.matcher(nod.getAttributs().get(k));
|
||||
if(match.find()) {
|
||||
String s= match.group();
|
||||
try {
|
||||
point = point + Integer.valueOf(s);
|
||||
} catch (Exception e) {
|
||||
JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut "+ k);
|
||||
}
|
||||
}
|
||||
if(!nod.getNomElt().equals("structurepage")) {
|
||||
while(key.hasMoreElements()) {
|
||||
String k = key.nextElement();
|
||||
if(nod.getAttributs().get(k).contains("‽")) {
|
||||
Pattern pt = Pattern.compile("[0-9]{1,}$");
|
||||
Matcher match= pt.matcher(nod.getAttributs().get(k));
|
||||
if(match.find()) {
|
||||
String s= match.group();
|
||||
try {
|
||||
point = point + Integer.valueOf(s);
|
||||
} catch (Exception e) {
|
||||
JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut "+ k);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}else {
|
||||
while(key.hasMoreElements()) {
|
||||
String k = key.nextElement();
|
||||
if(nod.getAttributs().get(k).contains("‽")||nod.getAttributs().get(k).contains("‼")) {
|
||||
Pattern pt = Pattern.compile("[0-9]{1,}$");
|
||||
Matcher match= pt.matcher(nod.getAttributs().get(k));
|
||||
if(match.find()) {
|
||||
String s= match.group();
|
||||
try {
|
||||
point = point + Integer.valueOf(s);
|
||||
} catch (Exception e) {
|
||||
JOptionPane.showInternalMessageDialog(null, "Erreur dans la valeur de l'attribut "+ k);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
for(int i = 0 ; i < nod.getNodes().size();i++) {
|
||||
if(nod.getNodes().get(i)!=null) {
|
||||
point = calculNombreDepoint(nod.getNodes().get(i), point);
|
||||
|
@ -115,6 +115,7 @@ public class afficheText extends JEditorPane {
|
||||
String K = key.nextElement();
|
||||
Lesattributsdunode.add(K);
|
||||
}
|
||||
|
||||
//permet le tri par ordre alphabétique des clés du dictionnaire
|
||||
Lesattributsdunode = Lesattributsdunode.stream().sorted().collect(Collectors.toList());
|
||||
|
||||
@ -210,12 +211,19 @@ public class afficheText extends JEditorPane {
|
||||
sb.append("<li class=\"p2\"><b><u>Les attributs de Writer</u></b></li>");
|
||||
for(int i=0; i < Lesattributsdunode.size();i++) {
|
||||
if(!listeAttributsAnalyseWriter.isAttributAnalyseWriter(Lesattributsdunode.get(i))) {
|
||||
sb.append("<li class=\"p2\"><b>" + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
|
||||
if(!nod.getAttributs().get(Lesattributsdunode.get(i)).contains("‼")&&!nod.getAttributs().get(Lesattributsdunode.get(i)).contains("‽")) {
|
||||
sb.append("<li class=\"p2\"><b>" + Lesattributsdunode.get(i) + " = \"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</b></li>");
|
||||
}else {
|
||||
sb.append("<li class=\"p5\"><b>" + Lesattributsdunode.get(i) + " = <span style=\"color:blue\">\"" + nod.getAttributs().get(Lesattributsdunode.get(i))+"\"</span></b></li>");
|
||||
}
|
||||
}
|
||||
}
|
||||
sb.append("</ul>");
|
||||
}
|
||||
|
||||
//*****************************************
|
||||
//** Lorsque evaluer et faux ou null ******
|
||||
//*****************************************
|
||||
if(nod.getAttributs().get("evaluer")!=null) if(!nod.getAttributs().get("evaluer").equalsIgnoreCase("true")) {
|
||||
sb.append("<br>");
|
||||
sb.append("<ul>");
|
||||
|
@ -23,6 +23,7 @@ public class baliseStyle {
|
||||
+ "li.p2{color:green;font-family:\"Arial\";font-size: 14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
|
||||
+ "li.p4{color:#FF8C00;font-family:\"Arial\";font-size: 14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
|
||||
+ "li.p3{color:red;font-family:\"Arial\";font-size: 14pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
|
||||
+ "li.p5{color:#55BB11;font-family:\"Arial\";font-size: 16pt;margin-bottom: 0cm; margin-top: 0cm; line-height: 0%; background: transparent; margin-left: 0cm; white-space: pre;}"
|
||||
+ "p.p4{margin-left: 0px; margin-bottom: 0cm; margin-top: 4px; line-height: 115%}"
|
||||
+ "p.p5 {color: navy;text-indent: 30px;}"
|
||||
+ ".center { display: block;margin-left: auto;margin-right: auto;width: 50%}"
|
||||
|
@ -23,9 +23,6 @@ import java.awt.event.ActionEvent;
|
||||
import net.miginfocom.swing.MigLayout;
|
||||
import java.awt.Toolkit;
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.DropMode;
|
||||
import javax.swing.SwingConstants;
|
||||
import javax.swing.JEditorPane;
|
||||
import javax.swing.JTextArea;
|
||||
|
||||
public final class proprieteFichierAnalyse extends JFrame {
|
||||
|
Loading…
Reference in New Issue
Block a user