Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[5492] trunk/soft/fudaa-crue
|
From: <chr...@us...> - 2009-11-23 19:21:30
|
Revision: 5492
http://fudaa.svn.sourceforge.net/fudaa/?rev=5492&view=rev
Author: chrisc83
Date: 2009-11-23 19:21:19 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfComparaison.java
trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java
trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/io/TestReaderConfig.java
trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/crue/comparaison/io/testComparaison.xml
trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java 2009-11-20 16:15:57 UTC (rev 5491)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/ExecuteComparaison.java 2009-11-23 19:21:19 UTC (rev 5492)
@@ -68,8 +68,17 @@
}
private ResultatTest res;
+ private String id;
private String msg;
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
/**
* @return the msg
*/
@@ -178,6 +187,7 @@
public ExecuteComparaisonResult launch(final ConfComparaison cmp, final Object a, final Object b) {
if (!cmp.isActive()) { return null; }
final ExecuteComparaisonResult res = new ExecuteComparaisonResult();
+ res.id = cmp.getId();
res.msg = cmp.getNom();
res.analyze = new CtuluAnalyze();
final List<ConfCompare> compare = cmp.getCompare();
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfComparaison.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfComparaison.java 2009-11-20 16:15:57 UTC (rev 5491)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/config/ConfComparaison.java 2009-11-23 19:21:19 UTC (rev 5492)
@@ -10,9 +10,18 @@
public class ConfComparaison {
private String nom;
+ private String id;
// private boolean active = true;
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
/**
* @return the active
*/
Modified: trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java 2009-11-20 16:15:57 UTC (rev 5491)
+++ trunk/soft/fudaa-crue/dodico/src/main/java/org/fudaa/dodico/crue/comparaison/io/ReaderConfig.java 2009-11-23 19:21:19 UTC (rev 5492)
@@ -3,6 +3,22 @@
import java.io.InputStream;
import java.net.URL;
+import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
+import org.fudaa.dodico.crue.comparaison.config.AbstractConfSelectionItem;
+import org.fudaa.dodico.crue.comparaison.config.ConfComparaison;
+import org.fudaa.dodico.crue.comparaison.config.ConfComparaisonConteneur;
+import org.fudaa.dodico.crue.comparaison.config.ConfCompareListe;
+import org.fudaa.dodico.crue.comparaison.config.ConfCompareObject;
+import org.fudaa.dodico.crue.comparaison.config.ConfCompareSpecific;
+import org.fudaa.dodico.crue.comparaison.config.ConfOption;
+import org.fudaa.dodico.crue.comparaison.config.ConfSelection;
+import org.fudaa.dodico.crue.comparaison.config.ConfSelectionItemMerge;
+import org.fudaa.dodico.crue.comparaison.config.ConfSelectionItemRequete;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.converters.Converter;
import com.thoughtworks.xstream.converters.MarshallingContext;
@@ -12,13 +28,6 @@
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.io.xml.DomDriver;
-import org.apache.commons.lang.StringUtils;
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.dodico.crue.comparaison.common.ComparaisonMessages;
-import org.fudaa.dodico.crue.comparaison.config.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class ReaderConfig {
private final static Logger LOGGER = LoggerFactory.getLogger(TestReaderConfig.class);
@@ -80,6 +89,7 @@
private void configureComparaison(final XStream xstream) {
xstream.alias("Comparaison", ConfComparaison.class);
+ xstream.aliasField("Id", ConfComparaison.class, "id");
xstream.aliasField("Nom", ConfComparaison.class, "nom");
// xstream.aliasAttribute(ConfComparaison.class, "active", "Active");
// xstream.registerLocalConverter(ConfComparaison.class, "Active", new AbstractSingleValueConverter() {
Modified: trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/io/TestReaderConfig.java
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/io/TestReaderConfig.java 2009-11-20 16:15:57 UTC (rev 5491)
+++ trunk/soft/fudaa-crue/dodico/src/test/java/org/fudaa/dodico/crue/comparaison/io/TestReaderConfig.java 2009-11-23 19:21:19 UTC (rev 5492)
@@ -5,10 +5,18 @@
import junit.framework.TestCase;
+import org.fudaa.dodico.crue.comparaison.config.ConfComparaison;
+import org.fudaa.dodico.crue.comparaison.config.ConfComparaisonConteneur;
+import org.fudaa.dodico.crue.comparaison.config.ConfCompare;
+import org.fudaa.dodico.crue.comparaison.config.ConfCompareObject;
+import org.fudaa.dodico.crue.comparaison.config.ConfOption;
+import org.fudaa.dodico.crue.comparaison.config.ConfSelection;
+import org.fudaa.dodico.crue.comparaison.config.ConfSelectionItem;
+import org.fudaa.dodico.crue.comparaison.config.ConfSelectionItemMerge;
+import org.fudaa.dodico.crue.comparaison.config.ConfSelectionItemRequete;
+
import com.thoughtworks.xstream.XStream;
-import org.fudaa.dodico.crue.comparaison.config.*;
-
/**
* @author deniger
* @creation 1 juil. 2009
@@ -26,6 +34,7 @@
assertNotNull(read);
assertEquals(1, read.getComparaisons().size());
final ConfComparaison comparaison = read.getComparaisons().get(0);
+ assertEquals("testId8", comparaison.getId());
assertEquals("testIt", comparaison.getNom());
assertEquals(1, comparaison.getCompare().size());
final List<ConfSelectionItem> items = comparaison.getSelection().getItems();
@@ -61,6 +70,7 @@
cont.setComparaisons(new ArrayList<ConfComparaison>());
final ConfComparaison c1 = new ConfComparaison();
cont.getComparaisons().add(c1);
+ c1.setId("id");
c1.setNom("test");
final ConfCompareObject compare = new ConfCompareObject();
Modified: trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/crue/comparaison/io/testComparaison.xml
===================================================================
--- trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/crue/comparaison/io/testComparaison.xml 2009-11-20 16:15:57 UTC (rev 5491)
+++ trunk/soft/fudaa-crue/dodico/src/test/resources/org/fudaa/dodico/crue/comparaison/io/testComparaison.xml 2009-11-23 19:21:19 UTC (rev 5492)
@@ -4,6 +4,7 @@
http://www.fudaa.fr/xsd/crue/comparaison-1.0.0.xsd">
<Comparaison>
+ <Id>testId8</Id>
<Nom>testIt</Nom>
<Selection>
<Merge Attribut="attToMerge" Description="Merge sur att ">
Modified: trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java
===================================================================
--- trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java 2009-11-20 16:15:57 UTC (rev 5491)
+++ trunk/soft/fudaa-crue/fudaa/src/main/java/org/fudaa/fudaa/crue/projet/ScenarioComparaisonUI.java 2009-11-23 19:21:19 UTC (rev 5492)
@@ -11,12 +11,6 @@
import javax.swing.ListSelectionModel;
import javax.swing.table.DefaultTableCellRenderer;
-import com.memoire.bu.BuBorderLayout;
-import com.memoire.bu.BuCheckBox;
-import com.memoire.bu.BuList;
-import com.memoire.bu.BuPanel;
-import com.memoire.bu.BuResource;
-
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
@@ -38,6 +32,12 @@
import org.jdesktop.swingx.treetable.DefaultMutableTreeTableNode;
import org.jdesktop.swingx.treetable.DefaultTreeTableModel;
+import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuCheckBox;
+import com.memoire.bu.BuList;
+import com.memoire.bu.BuPanel;
+import com.memoire.bu.BuResource;
+
/**
* Classe qui se charge de charger en memoire un scénario donné.
*
@@ -103,6 +103,7 @@
return false;
}
+ String id;
String msg;
Object a;
String valueA;
@@ -112,16 +113,17 @@
@Override
public Object getValueAt(int column) {
- if (column == 1) { return ok; }
- if (column == 0) { return msg; }
- if (column == 2) { return valueA; }
- if (column == 3) { return valueB; }
+ if (column == 0) { return id; }
+ if (column == 1) { return msg; }
+ if (column == 2) { return ok; }
+ if (column == 3) { return valueA; }
+ if (column == 4) { return valueB; }
return nbObjectTested;
}
@Override
public int getColumnCount() {
- return 5;
+ return 6;
}
}
@@ -143,6 +145,7 @@
List<CompareTreeTableNode> noError = new ArrayList<CompareTreeTableNode>();
for (ExecuteComparaisonResult cmpRes : launch) {
CompareTreeTableNode node = new CompareTreeTableNode();
+ node.id = cmpRes.getId();
node.msg = cmpRes.getMsg();
node.nbObjectTested = cmpRes.getNbObjectTested();
if (cmpRes.getAnalyze().containsErrors()) {
@@ -175,6 +178,7 @@
}
DefaultTreeTableModel modeleJX = new DefaultTreeTableModel(root);
List<String> colonnes = new ArrayList<String>();
+ colonnes.add("Id");
colonnes.add("Message");
colonnes.add("Egal");
colonnes.add("Valeur Scénario courant");
@@ -186,7 +190,7 @@
final Icon no = BuResource.BU.getToolIcon("crystal_non");
final JXTreeTable table = new JXTreeTable(modeleJX);
- table.getColumn(1).setCellRenderer(new DefaultTableCellRenderer() {
+ table.getColumn(2).setCellRenderer(new DefaultTableCellRenderer() {
@Override
protected void setValue(Object value) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
