Author: tchemit Date: 2008-07-01 13:23:50 +0000 (Tue, 01 Jul 2008) New Revision: 1489 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java Log: utilisation lutinui Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-06-30 20:51:14 UTC (rev 1488) +++ trunk/simexplorer-is/pom.xml 2008-07-01 13:23:50 UTC (rev 1489) @@ -410,7 +410,13 @@ <version>0.4</version> <scope>compile</scope> </dependency> - <!-- librairie des widgets lutin --> + <dependency> + <groupId>org.codelutin.ui</groupId> + <artifactId>lutinui</artifactId> + <version>0.1-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <!-- librairie des widgets lutin --> <dependency> <groupId>lutinlib</groupId> <artifactId>lutinwidget</artifactId> Modified: trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-06-30 20:51:14 UTC (rev 1488) +++ trunk/simexplorer-is/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-07-01 13:23:50 UTC (rev 1489) @@ -33,6 +33,8 @@ /** The Constant EMPTY_VERSION. */ private static final String EMPTY_VERSION = ""; + public static final Version ONE_POINT_ZERO = Version.valueOf("1.0"); + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 1; Modified: trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-06-30 20:51:14 UTC (rev 1488) +++ trunk/simexplorer-is/simexplorer-is-storage/src/test/fr/cemagref/simexplorer/is/storage/MetaDataGenerator.java 2008-07-01 13:23:50 UTC (rev 1489) @@ -17,8 +17,6 @@ package fr.cemagref.simexplorer.is.storage; import java.util.Date; -import java.util.HashMap; -import java.util.Map; import java.util.UUID; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -86,7 +84,7 @@ * @return the meta data */ public MetaData generateMetaDataEntity() { - return generateMetaDataEntity(UUID.randomUUID().toString(), Version.valueOf("1.0")); + return generateMetaDataEntity(UUID.randomUUID().toString(), Version.ONE_POINT_ZERO); } /** Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-06-30 20:51:14 UTC (rev 1488) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExportElementAction.java 2008-07-01 13:23:50 UTC (rev 1489) @@ -22,7 +22,7 @@ import javax.swing.Action; -import jaxx.runtime.UIHelper; +import org.codelutin.ui.UIHelper; import jaxx.runtime.builder.TabModel; import fr.cemagref.simexplorer.is.entities.EntityHelper; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-06-30 20:51:14 UTC (rev 1488) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ChangeLocaleAction.java 2008-07-01 13:23:50 UTC (rev 1489) @@ -61,7 +61,7 @@ //putValue(Action.NAME, _(locale.getLibelle())); //TODO Make it works again :) putValue(Action.NAME, _(locale.getDisplayLanguage())); - putValue(Action.SMALL_ICON, jaxx.runtime.UIHelper.createImageIcon(getIcon())); + putValue(Action.SMALL_ICON, org.codelutin.ui.UIHelper.createImageIcon(getIcon())); } @Override Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2008-06-30 20:51:14 UTC (rev 1488) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTableModel.java 2008-07-01 13:23:50 UTC (rev 1489) @@ -43,7 +43,7 @@ MetaData[] data; - PropertyDescriptor[] descriptors; + transient PropertyDescriptor[] descriptors; private static final long serialVersionUID = -105647814466295077L; private SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss.SSS"); Modified: trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-06-30 20:51:14 UTC (rev 1488) +++ trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-07-01 13:23:50 UTC (rev 1489) @@ -176,6 +176,11 @@ <groupId>lutinlib</groupId> <artifactId>jaxx</artifactId> </dependency> + <!-- librairie lutinui --> + <dependency> + <groupId>org.codelutin.ui</groupId> + <artifactId>lutinui</artifactId> + </dependency> <!-- librairie commandline --> <dependency> <groupId>lutinlib</groupId>