MAJ V4.4.1 (correction bug dans le cXML node() pour le node frère après
et avant. correction affichage dans les input box)
This commit is contained in:
parent
dc1e8c3104
commit
cb54c67689
@ -12,6 +12,6 @@
|
||||
<classpathentry kind="lib" path="C:/Users/pabr6/git/analyseWriter/MEPTL/miglayout15-swing.jar"/>
|
||||
<classpathentry kind="lib" path="jgoodies-forms-1.8.0.jar" sourcepath="jgoodies-forms-1.8.0-sources.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/Exportation documentation analyseWriter/plugins/documentation.analyseWriter_1.0.0.202212032022.jar"/>
|
||||
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar" sourcepath="/cXML"/>
|
||||
<classpathentry kind="lib" path="C:/Users/pabr6/eclipse-workspace/cXML.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
Binary file not shown.
Binary file not shown.
69
bin/.gitignore
vendored
69
bin/.gitignore
vendored
@ -1,3 +1,72 @@
|
||||
/MEPTL/
|
||||
/calcul/
|
||||
/evaluer/
|
||||
/fenetres/
|
||||
/list/
|
||||
/structurepage.svg
|
||||
/stylepage.png
|
||||
/stylepage.svg
|
||||
/styleparagraphe.png
|
||||
/styleparagraphe.svg
|
||||
/supprime.svg
|
||||
/supprimemini.png
|
||||
/textclean.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
|
||||
/true.png
|
||||
/true.svg
|
||||
/truemini.png
|
||||
/tutoriel.png
|
||||
/tutoriel.svg
|
||||
/tutorielmini.png
|
||||
/undo.png
|
||||
/upnode.png
|
||||
/upnode.svg
|
||||
/upnodemini.png
|
||||
/verifhistorique.png
|
||||
/verifhistoriquemax.png
|
||||
/verifhistoriquemini.png
|
||||
/verifhistoriquestudent.png
|
||||
/verifhistoriquestudent.svg
|
||||
/verifhistoriquestudentmini.png
|
||||
/versevaluate.png
|
||||
/versevaluate.svg
|
||||
/versevaluatemini.png
|
||||
/versfichierAnalyse.png
|
||||
/versfichierAnalyseModifmax.svg
|
||||
/voir.svg
|
||||
/voirmini.png
|
||||
/what.svg
|
||||
/whatmini.png
|
||||
/zip.png
|
||||
/zip.svg
|
||||
/zipmini.png
|
||||
/zipstudent.png
|
||||
/zipstudent.svg
|
||||
/zipstudentmini.png
|
||||
|
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.
@ -292,7 +292,7 @@ public class feedbacks {
|
||||
//***************************************
|
||||
fichier.append(HTML.H2("Synthèse"));
|
||||
fichier.append(HTML.TableEnteteTableurSynthese());
|
||||
fichier = SyntheseTable(nodana,fichier);
|
||||
fichier = SyntheseTable(nodana.retourneFirstEnfantsByName("evaluation"),fichier);
|
||||
|
||||
if(!commandes.noDetail) {
|
||||
|
||||
|
@ -6,7 +6,9 @@ import java.awt.event.KeyEvent;
|
||||
import javax.swing.AbstractAction;
|
||||
import javax.swing.Action;
|
||||
import javax.swing.ImageIcon;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.KeyStroke;
|
||||
import javax.swing.tree.DefaultMutableTreeNode;
|
||||
import javax.swing.tree.DefaultTreeModel;
|
||||
@ -32,10 +34,19 @@ public class actDeleteNode extends AbstractAction{
|
||||
|
||||
|
||||
if(fenetres.create.getTree().getSelectionPath()!=null) {
|
||||
int a = JOptionPane.showConfirmDialog(null,"Voulez-vous supprimer le node " + fenetres.create.getSelectNode().toString() + "?", "Sélectionner un choix", JOptionPane.YES_NO_OPTION);
|
||||
|
||||
if(a == JOptionPane.YES_NO_OPTION) {
|
||||
node nod = (node) fenetres.create.getSelectNode().getUserObject();
|
||||
|
||||
JPanel myPanel = new JPanel();
|
||||
JLabel message1 = new JLabel("Voulez-vous supprimer ce node ?");
|
||||
JLabel message2 = new JLabel(fenetres.create.getSelectNode().toString());
|
||||
myPanel.add(message1);
|
||||
myPanel.add(message2);
|
||||
// a spacer
|
||||
|
||||
int result = JOptionPane.showConfirmDialog(null, myPanel, "Suppression d'un node", JOptionPane.OK_CANCEL_OPTION);
|
||||
|
||||
if (result == JOptionPane.OK_OPTION) {
|
||||
node nod = (node) 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") )) {
|
||||
|
||||
@ -54,14 +65,43 @@ public class actDeleteNode extends AbstractAction{
|
||||
fenetres.create.getTree().setSelectionPath(path);
|
||||
fenetres.create.getTree().expandPath(path);
|
||||
|
||||
// fenetres.create.constructionTree();
|
||||
|
||||
}else {
|
||||
JOptionPane.showMessageDialog(null,"Vous ne devez pas supprimer ce node !", "Oh non!!!", JOptionPane.INFORMATION_MESSAGE);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// int a = JOptionPane.showConfirmDialog(null,"Voulez-vous supprimer le node " + fenetres.create.getSelectNode().toString() + "?", "Sélectionner un choix", JOptionPane.YES_NO_OPTION);
|
||||
//
|
||||
// if(a == JOptionPane.YES_NO_OPTION) {
|
||||
// node nod = (node) 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 = fenetres.create.getTree().getSelectionPath().getParentPath();
|
||||
// DefaultMutableTreeNode nodMu = fenetres.create.getSelectNode();
|
||||
// DefaultMutableTreeNode SelectParentNode = (DefaultMutableTreeNode) nodMu.getParent();
|
||||
//
|
||||
// SelectParentNode.remove(nodMu);
|
||||
//
|
||||
// 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);
|
||||
//
|
||||
//
|
||||
// }else {
|
||||
// JOptionPane.showMessageDialog(null,"Vous ne devez pas supprimer ce node !", "Oh non!!!", JOptionPane.INFORMATION_MESSAGE);
|
||||
//
|
||||
// }
|
||||
//
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -18,6 +18,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
|
||||
import javax.swing.tree.DefaultTreeModel;
|
||||
import javax.swing.tree.TreePath;
|
||||
|
||||
import MEPTL.commandes;
|
||||
import cXML.node;
|
||||
|
||||
|
||||
@ -99,6 +100,10 @@ public class actPaste extends AbstractAction{
|
||||
node nodChild = nodePaste.getNodes().get(i);
|
||||
nodChild = MiseAJoutInfoChild(nodChild);
|
||||
}
|
||||
String nameNode = nodePaste.getNomElt();
|
||||
if(nameNode.equals("text:p")||nameNode.equals("text:h")||nameNode.equals("text:list-item")) {
|
||||
actNewFichierAnalyse.placeIsDoublon(commandes.sujet.retourneFirstEnfantsByName("structurepage"));
|
||||
}
|
||||
}
|
||||
return nodePaste;
|
||||
}
|
||||
|
@ -4,7 +4,11 @@ import java.awt.event.ActionEvent;
|
||||
|
||||
import javax.swing.AbstractAction;
|
||||
import javax.swing.Action;
|
||||
import javax.swing.Box;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JTextField;
|
||||
|
||||
import cXML.node;
|
||||
|
||||
@ -26,9 +30,20 @@ public class actTitre1 extends AbstractAction{
|
||||
titre = nod.getAttributs().get("titre1");
|
||||
}
|
||||
|
||||
String a = JOptionPane.showInputDialog(null,"Quel est le titre?",titre);
|
||||
nod.titre1(a);
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
JTextField xField = new JTextField(30);
|
||||
xField.setText(titre);
|
||||
JPanel myPanel = new JPanel();
|
||||
myPanel.add(new JLabel("Titre :"));
|
||||
myPanel.add(Box.createHorizontalStrut(2)); // a spacer
|
||||
myPanel.add(xField);
|
||||
|
||||
|
||||
int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 1 ", JOptionPane.OK_CANCEL_OPTION);
|
||||
if (result == JOptionPane.OK_OPTION) {
|
||||
nod.titre(xField.getText());
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -4,7 +4,11 @@ import java.awt.event.ActionEvent;
|
||||
|
||||
import javax.swing.AbstractAction;
|
||||
import javax.swing.Action;
|
||||
import javax.swing.Box;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JTextField;
|
||||
|
||||
import cXML.node;
|
||||
|
||||
@ -26,9 +30,25 @@ public class actTitre2 extends AbstractAction{
|
||||
titre = nod.getAttributs().get("titre2");
|
||||
}
|
||||
|
||||
String a = JOptionPane.showInputDialog(null,"Quel est le titre?",titre);
|
||||
nod.titre2(a);
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
|
||||
JTextField xField = new JTextField(30);
|
||||
xField.setText(titre);
|
||||
JPanel myPanel = new JPanel();
|
||||
myPanel.add(new JLabel("Titre :"));
|
||||
myPanel.add(Box.createHorizontalStrut(2)); // a spacer
|
||||
myPanel.add(xField);
|
||||
|
||||
|
||||
int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 2 ", JOptionPane.OK_CANCEL_OPTION);
|
||||
if (result == JOptionPane.OK_OPTION) {
|
||||
nod.titre(xField.getText());
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
}
|
||||
//
|
||||
//
|
||||
// String a = JOptionPane.showInputDialog(null,"Quel est le titre?",titre);
|
||||
// nod.titre2(a);
|
||||
// fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -4,7 +4,11 @@ import java.awt.event.ActionEvent;
|
||||
|
||||
import javax.swing.AbstractAction;
|
||||
import javax.swing.Action;
|
||||
import javax.swing.Box;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JTextField;
|
||||
|
||||
import cXML.node;
|
||||
|
||||
@ -26,9 +30,24 @@ public class actTitre3 extends AbstractAction{
|
||||
titre = nod.getAttributs().get("titre3");
|
||||
}
|
||||
|
||||
String a = JOptionPane.showInputDialog(null,"Quel est le titre?",titre);
|
||||
nod.titre3(a);
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
|
||||
JTextField xField = new JTextField(30);
|
||||
xField.setText(titre);
|
||||
JPanel myPanel = new JPanel();
|
||||
myPanel.add(new JLabel("Titre :"));
|
||||
myPanel.add(Box.createHorizontalStrut(2)); // a spacer
|
||||
myPanel.add(xField);
|
||||
|
||||
|
||||
int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre 3 ", JOptionPane.OK_CANCEL_OPTION);
|
||||
if (result == JOptionPane.OK_OPTION) {
|
||||
nod.titre(xField.getText());
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
}
|
||||
|
||||
// String a = JOptionPane.showInputDialog(null,"Quel est le titre?",titre);
|
||||
// nod.titre3(a);
|
||||
// fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -4,7 +4,11 @@ import java.awt.event.ActionEvent;
|
||||
|
||||
import javax.swing.AbstractAction;
|
||||
import javax.swing.Action;
|
||||
import javax.swing.Box;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JOptionPane;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JTextField;
|
||||
|
||||
import cXML.node;
|
||||
|
||||
@ -26,9 +30,20 @@ public class actTitrePrincipal extends AbstractAction{
|
||||
titre = nod.getAttributs().get("titre");
|
||||
}
|
||||
|
||||
String a = JOptionPane.showInputDialog(null,"Quel est le titre?",titre);
|
||||
nod.titre(a);
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
JTextField xField = new JTextField(30);
|
||||
xField.setText(titre);
|
||||
JPanel myPanel = new JPanel();
|
||||
myPanel.add(new JLabel("Titre :"));
|
||||
myPanel.add(Box.createHorizontalStrut(2)); // a spacer
|
||||
myPanel.add(xField);
|
||||
|
||||
|
||||
int result = JOptionPane.showConfirmDialog(null, myPanel, "Saisissez votre titre principal", JOptionPane.OK_CANCEL_OPTION);
|
||||
if (result == JOptionPane.OK_OPTION) {
|
||||
nod.titre(xField.getText());
|
||||
fenetres.create.getTextNodeSelect().refreshAffichage(nod);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user