Sammoa-commits

Download

sammoa-commits@list.forge.codelutin.com

September 2014

1 participants
1 discussions

r728 - in trunk: . sammoa-application sammoa-persistence sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence sammoa-ui-swing sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util
by athimel＠users.forge.codelutin.com 05 Sep '14

05 Sep '14

Author: athimel Date: 2014-09-05 17:51:30 +0200 (Fri, 05 Sep 2014) New Revision: 728 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/728 Log: Move up to 1.1-SNAPSHOT ; Use newly introduced ListenableBean in Topia Modified: trunk/pom.xml trunk/sammoa-application/pom.xml trunk/sammoa-persistence/pom.xml trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMeta.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistenceHelper.java trunk/sammoa-ui-swing/pom.xml trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/NestedPropertyChangeListener.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-15 08:39:43 UTC (rev 727) +++ trunk/pom.xml 2014-09-05 15:51:30 UTC (rev 728) @@ -10,7 +10,7 @@ <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.5-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <packaging>pom</packaging> @@ -94,7 +94,7 @@ <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <eugeneVersion>2.12-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.13</eugeneVersion> <topiaVersion>3.0-SNAPSHOT</topiaVersion> <hibernateVersion>4.3.5.Final</hibernateVersion> <h2Version>1.3.176</h2Version> Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-07-15 08:39:43 UTC (rev 727) +++ trunk/sammoa-application/pom.xml 2014-09-05 15:51:30 UTC (rev 728) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.5-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>sammoa-application</artifactId> @@ -53,25 +53,15 @@ </dependency> <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> + <groupId>com.bbn</groupId> + <artifactId>openmap</artifactId> </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-csv</artifactId> - </dependency> - - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> -  <dependency> @@ -107,10 +97,20 @@ </dependency> <dependency> - <groupId>com.bbn</groupId> - <artifactId>openmap</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-csv</artifactId> + </dependency> +  <dependency> <groupId>junit</groupId> @@ -140,10 +140,6 @@ <artifactId>h2</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> </dependencies> Modified: trunk/sammoa-persistence/pom.xml =================================================================== --- trunk/sammoa-persistence/pom.xml 2014-07-15 08:39:43 UTC (rev 727) +++ trunk/sammoa-persistence/pom.xml 2014-09-05 15:51:30 UTC (rev 728) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.5-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>sammoa-persistence</artifactId> Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java 2014-07-15 08:39:43 UTC (rev 727) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/AutoSaveListener.java 2014-09-05 15:51:30 UTC (rev 728) @@ -29,6 +29,7 @@ import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.event.ListenableBean; import org.nuiton.topia.persistence.event.TopiaEntityEvent; import org.nuiton.topia.persistence.event.TopiaEntityListener; import org.slf4j.Logger; @@ -77,12 +78,14 @@ @Override public void create(TopiaEntityEvent event) { - event.getEntity().addPropertyChangeListener(this); + ListenableBean entity = (ListenableBean)event.getEntity(); + entity.addPropertyChangeListener(this); } @Override public void load(TopiaEntityEvent event) { - event.getEntity().addPropertyChangeListener(this); + ListenableBean entity = (ListenableBean)event.getEntity(); + entity.addPropertyChangeListener(this); } @Override Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMeta.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMeta.java 2014-07-15 08:39:43 UTC (rev 727) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaDbMeta.java 2014-09-05 15:51:30 UTC (rev 728) @@ -25,7 +25,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.nuiton.topia.persistence.TopiaPersistenceHelper; +import org.nuiton.topia.persistence.TopiaEntityEnumProvider; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.DbMeta; import org.nuiton.topia.persistence.metadata.TableMeta; @@ -68,11 +68,11 @@ private final List<AssociationMeta<SammoaEntityEnum>> dataAssociations; - public static SammoaDbMeta newDbMeta(TopiaPersistenceHelper<SammoaEntityEnum> persistenceHelper) { + public static SammoaDbMeta newDbMeta(TopiaEntityEnumProvider<SammoaEntityEnum> persistenceHelper) { return new SammoaDbMeta(persistenceHelper); } - SammoaDbMeta(TopiaPersistenceHelper<SammoaEntityEnum> persistenceHelper) { + SammoaDbMeta(TopiaEntityEnumProvider<SammoaEntityEnum> persistenceHelper) { super(persistenceHelper, SammoaEntityEnum.values()); { Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistenceHelper.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistenceHelper.java 2014-07-15 08:39:43 UTC (rev 727) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistenceHelper.java 2014-09-05 15:51:30 UTC (rev 728) @@ -25,15 +25,15 @@ import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaPersistenceHelper; +import org.nuiton.topia.persistence.TopiaEntityEnumProvider; /** - * Implementation of {@link TopiaPersistenceHelper} for Sammoa. + * Implementation of {@link TopiaEntityEnumProvider} for Sammoa. * * @author tchemit <chemit(a)codelutin.com> * @since 0.6 */ -public class SammoaPersistenceHelper implements TopiaPersistenceHelper<SammoaEntityEnum> { +public class SammoaPersistenceHelper implements TopiaEntityEnumProvider<SammoaEntityEnum> { @Override public <E extends TopiaEntity> SammoaEntityEnum getEntityEnum(Class<E> type) { Modified: trunk/sammoa-ui-swing/pom.xml =================================================================== --- trunk/sammoa-ui-swing/pom.xml 2014-07-15 08:39:43 UTC (rev 727) +++ trunk/sammoa-ui-swing/pom.xml 2014-09-05 15:51:30 UTC (rev 728) @@ -5,7 +5,7 @@ <parent> <groupId>fr.ulr</groupId> <artifactId>sammoa</artifactId> - <version>1.0.5-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> </parent> <artifactId>sammoa-ui-swing</artifactId> Modified: trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/NestedPropertyChangeListener.java =================================================================== --- trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/NestedPropertyChangeListener.java 2014-07-15 08:39:43 UTC (rev 727) +++ trunk/sammoa-ui-swing/src/main/java/fr/ulr/sammoa/ui/swing/util/NestedPropertyChangeListener.java 2014-09-05 15:51:30 UTC (rev 728) @@ -27,6 +27,7 @@ import com.google.common.base.Splitter; import org.jdesktop.beans.AbstractBean; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.event.ListenableBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -122,8 +123,8 @@ protected void addNestedPropertyChangeListener(Object object, NestedPropertyChangeListener listener) { String property = listener.getProperty(); - if (object instanceof TopiaEntity) { - TopiaEntity entity = (TopiaEntity) object; + if (object instanceof ListenableBean) { + ListenableBean entity = (ListenableBean) object; if (property == null) { entity.addPropertyChangeListener(listener); } else { @@ -142,8 +143,8 @@ protected void removeNestedPropertyChangeListener(Object object, NestedPropertyChangeListener listener) { String property = listener.getProperty(); - if (object instanceof TopiaEntity) { - TopiaEntity entity = (TopiaEntity) object; + if (object instanceof ListenableBean) { + ListenableBean entity = (ListenableBean) object; if (property == null) { entity.removePropertyChangeListener(listener); } else {

1 0