Author: tchemit Date: 2012-12-19 11:49:03 +0100 (Wed, 19 Dec 2012) New Revision: 90 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/90 Log: fix build + model for pmfm + add msaccessimporter lib Modified: trunk/pom.xml trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-19 10:16:51 UTC (rev 89) +++ trunk/pom.xml 2012-12-19 10:49:03 UTC (rev 90) @@ -98,6 +98,8 @@ <slf4jVersion>1.7.2</slf4jVersion> <adagioVersion>3.3.1-SNAPSHOT</adagioVersion> + + <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <i18n.bundles>fr_FR</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -247,6 +249,23 @@ <classifier>allegro</classifier> </dependency> + <dependency> + <groupId>fr.ird</groupId> + <artifactId>msaccess-importer</artifactId> + <version>${msaccessImporterVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>com.healthmarketscience.jackcess</groupId> + <artifactId>jackcess</artifactId> + </exclusion> + <exclusion> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </exclusion> + </exclusions> + </dependency> + <!-- base h2 --> <dependency> <groupId>com.h2database</groupId> Modified: trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware =================================================================== --- trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware 2012-12-19 10:16:51 UTC (rev 89) +++ trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware 2012-12-19 10:49:03 UTC (rev 90) @@ -10,10 +10,12 @@ fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol fr.ifremer.tutti.persistence.entities.referential.BeaufortScale +fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue fr.ifremer.tutti.persistence.entities.referential.Country fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation fr.ifremer.tutti.persistence.entities.referential.Gear fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory +fr.ifremer.tutti.persistence.entities.referential.MeasurementCaracteristic fr.ifremer.tutti.persistence.entities.referential.Person fr.ifremer.tutti.persistence.entities.referential.SeaState fr.ifremer.tutti.persistence.entities.referential.Sex Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2012-12-19 10:16:51 UTC (rev 89) +++ trunk/tutti-ui-swing/pom.xml 2012-12-19 10:49:03 UTC (rev 90) @@ -198,6 +198,11 @@ </dependency> <dependency> + <groupId>fr.ird</groupId> + <artifactId>msaccess-importer</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2012-12-19 10:16:51 UTC (rev 89) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2012-12-19 10:49:03 UTC (rev 90) @@ -100,7 +100,8 @@ <JLabel id='stationNumberLabel'/> </cell> <cell weightx='0.3'> - <NumberEditor id='stationNumberField' constructorParams='this'/> + <JTextField id='stationNumberField' + onKeyReleased='handler.setText(event, "stationNumber")'/> </cell> <cell> <JLabel id='fishingOperationNumberLabel'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2012-12-19 10:16:51 UTC (rev 89) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2012-12-19 10:49:03 UTC (rev 90) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.persistence.entities.referential.SeaState; import fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; +import fr.ird.type.SexagecimalPosition; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -131,7 +132,7 @@ protected Cruise cruise; - protected Integer stationNumber; + protected String stationNumber; protected Integer fishingOperationNumber; @@ -141,6 +142,16 @@ protected FishingOperationLocation subStrata; + protected SexagecimalPosition gearShootingStartLatitudeAsSexagecimal; + + protected SexagecimalPosition gearShootingStartLongitudeAsSexagecimal; + + protected SexagecimalPosition gearShootingEndLatitudeAsSexagecimal; + + protected SexagecimalPosition gearShootingEndLongitudeAsSexagecimal; + + protected boolean useSexagecimalFormat; + protected Float gearShootingStartLatitude; protected Float gearShootingStartLongitude; @@ -242,11 +253,11 @@ this.cruise = cruise; } - public Integer getStationNumber() { + public String getStationNumber() { return stationNumber; } - public void setStationNumber(Integer stationNumber) { + public void setStationNumber(String stationNumber) { Object oldValue = getStationNumber(); this.stationNumber = stationNumber; firePropertyChange(PROPERTY_STATION_NUMBER, oldValue, stationNumber);