Author: tchemit Date: 2014-01-31 11:56:26 +0100 (Fri, 31 Jan 2014) New Revision: 1564 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1564 Log: fixes #4285: Use jaxx-application instead of ifremer-shared Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/pom.xml trunk/tutti-service/src/license/THIRD-PARTY.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java trunk/tutti-ui-swing/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 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/EditFishingOperationUIHandler.java 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/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/pom.xml 2014-01-31 10:56:26 UTC (rev 1564) @@ -131,12 +131,11 @@ <signatureVersion>1.0</signatureVersion> <!-- libraries version --> - <ifremerApplicationVersion>1.0.1</ifremerApplicationVersion> <nuitonI18nVersion>2.5.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0-alpha-1</nuitonValidatorVersion> <eugenePluginVersion>2.7.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.7</jaxxVersion> + <jaxxVersion>2.8-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> <adagioVersion>3.4.1</adagioVersion> @@ -194,18 +193,6 @@ <dependencyManagement> <dependencies> - <!-- Ifremer shared --> - <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> - <version>${ifremerApplicationVersion}</version> - </dependency> - <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application-swing</artifactId> - <version>${ifremerApplicationVersion}</version> - </dependency> - <!-- Adagio --> <dependency> <groupId>fr.ifremer.adagio</groupId> @@ -317,6 +304,16 @@ <artifactId>jaxx-config</artifactId> <version>${jaxxVersion}</version> </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-swing</artifactId> + <version>${jaxxVersion}</version> + </dependency> <!-- SwingX --> <dependency> @@ -496,9 +493,9 @@ <version>${hibernateVersion}</version> </dependency> <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> - <version>${ifremerApplicationVersion}</version> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> + <version>${jaxxVersion}</version> </dependency> </dependencies> </plugin> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/pom.xml 2014-01-31 10:56:26 UTC (rev 1564) @@ -37,10 +37,10 @@ <dependencies> - <!-- Ifremer shared --> + <!-- JAXX --> <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> </dependency> <!-- Adagio --> Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroDatabaseMetadata.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTableMetadata.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,7 +29,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import org.hibernate.mapping.ForeignKey; import org.hibernate.tool.hbm2ddl.ColumnMetadata; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,11 +28,11 @@ import com.google.common.base.Predicate; import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationConfiguration; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.type.CoordinateEditorType; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import fr.ifremer.tutti.type.CoordinateEditorType; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import org.apache.commons.io.IOUtils; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.type.CoordinateEditorType; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.CoordinateEditorType; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import org.hibernate.dialect.HSQLDialect; import org.hsqldb.jdbcDriver; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/InvalidBatchModelException.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; /** * Exception when batch model is not compatible with Tutti. Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/ProgressionModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.type.ApplicationProgressionModel; +import org.nuiton.jaxx.application.type.ApplicationProgressionModel; import org.nuiton.updater.DownloadMonitor; /** @@ -36,84 +36,7 @@ public class ProgressionModel extends ApplicationProgressionModel implements DownloadMonitor { private static final long serialVersionUID = 1L; -// -// public static final String PROPERTY_TOTAL = "total"; -// -// public static final String PROPERTY_CURRENT = "current"; -// -// public static final String PROPERTY_RATE = "rate"; -// -// public static final String PROPERTY_MESSAGE = "message"; -// -// protected int total; -// -// protected int current; -// -// protected float rate; -// -// protected String message; -// public int getTotal() { -// return total; -// } -// -// public void setTotal(int total) { -// Object oldValue = getTotal(); -// this.total = total; -// firePropertyChange(PROPERTY_TOTAL, oldValue, total); -// setCurrent(0); -// } -// -// public void adaptTotal(int total) { -// long current = getCurrent(); -// setTotal(total); -// increments((int) current); -// Object oldValue = getTotal(); -// this.total = total; -// firePropertyChange(PROPERTY_TOTAL, oldValue, total); -// setCurrent(current); -// } -// -// public long getCurrent() { -// return current; -// } -// -// public void setCurrent(int current) { -// Object oldValue = getCurrent(); -// this.current = current; -// firePropertyChange(PROPERTY_CURRENT, oldValue, current); -// } -// -// public void increments(int nb) { -// setCurrent(current + nb); -// setRate(getCurrent() / getTotal()); -// } -// -// public float getRate() { -// return rate; -// } -// -// public void setRate(float rate) { -// Object oldValue = getRate(); -// this.rate = rate; -// firePropertyChange(PROPERTY_RATE, oldValue, rate); -// } -// -// public String getMessage() { -// return message; -// } -// -// public void increments(String message) { -// increments(1); -// setMessage(message); -// } -// -// public void setMessage(String message) { -// Object oldValue = getMessage(); -// this.message = message; -// firePropertyChange(PROPERTY_MESSAGE, oldValue, message); -// } - @Override public void setSize(long size) { setTotal((int) size); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,8 +28,8 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import fr.ifremer.adagio.core.dao.technical.VersionNotFoundException; import fr.ifremer.adagio.core.service.technical.CacheService; import fr.ifremer.adagio.core.service.technical.sanity.DatabaseSanityService; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -32,7 +32,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationDataUtil; +import org.nuiton.jaxx.application.ApplicationDataUtil; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; @@ -45,11 +45,15 @@ import org.hibernate.cfg.Environment; import java.io.File; +import java.math.BigDecimal; +import java.math.MathContext; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -235,20 +239,6 @@ } } -// public static void closeSilently(Connection connection) { -// try { -// if (connection != null && !connection.isClosed()) { -// -// connection.close(); -// -// } -// } catch (SQLException e) { -// if (log.isErrorEnabled()) { -// log.error("Could not close connection, but do not care", e); -// } -// } -// } - public static Connection createConnection(Properties connectionProperties) throws SQLException { return createConnection( connectionProperties.getProperty(Environment.URL), @@ -422,4 +412,105 @@ return result; } + private static final double EARTH_RADIUS = 6378288.0; + + private static final MathContext MATH_CONTEXT_4_DIGIT = new MathContext(4); + + private static DecimalFormatSymbols symbols; + + private static DecimalFormat decimalFormat; + + public static int computeDistanceInMeters(Float startLatitude, + Float startLongitude, + Float endLatitude, + Float endLongitude) { + + double sLat = startLatitude * Math.PI / 180.0; + double sLong = startLongitude * Math.PI / 180.0; + double eLat = endLatitude * Math.PI / 180.0; + double eLong = endLongitude * Math.PI / 180.0; + + Double d = EARTH_RADIUS * + (Math.PI / 2 - Math.asin(Math.sin(eLat) * Math.sin(sLat) + + Math.cos(eLong - sLong) * Math.cos(eLat) * Math.cos(sLat))); + return d.intValue(); + } + + public static String getDistanceInMilles(Float distance) { + String distanceText; + if (distance != null) { + Float distanceInMilles = distance / 1852; + distanceText = String.format("%.3f", distanceInMilles); + + } else { + distanceText = ""; + } + return distanceText; + } + + public static float getRoundedLengthStep(float lengthStep, boolean aroundUp) { + int intValue = (int) ((lengthStep + (aroundUp ? 0.001f : 0f)) * 10); + float result = intValue / 10f; + return result; + } + + public static DecimalFormatSymbols getDecimalFormatSymbols() { + if (symbols == null) { + symbols = new DecimalFormatSymbols(); + symbols.setDecimalSeparator('.'); + symbols.setGroupingSeparator(' '); + } + return symbols; + } + + public static DecimalFormat getDecimalFormat(int minDecimal, int maxDecimal) { + if (decimalFormat == null) { + decimalFormat = new DecimalFormat(); + decimalFormat.setDecimalFormatSymbols(getDecimalFormatSymbols()); + decimalFormat.setGroupingUsed(false); + } + decimalFormat.setMinimumFractionDigits(minDecimal); + decimalFormat.setMaximumFractionDigits(maxDecimal); + return decimalFormat; + } + + public static String getWeightStringValue(Float weight) { + String textValue; + if (weight != null) { + DecimalFormat weightDecimalFormat = getDecimalFormat(1, 3); + textValue = weightDecimalFormat.format(weight); + + } else { + textValue = ""; + } + return textValue; + } + + public static <N extends Number> N getValueOrComputedValue(N value, N computedValue) { + return value == null ? computedValue : value; + } + + public static <N extends Number> Boolean getValueOrComputedValueComputed(N value, N computedValue) { + Boolean result; + if (value == null) { + + result = computedValue == null ? null : true; + } else { + result = false; + } + return result; + } + + /** + * Round the given value to max 4 digits. + * + * @param value the float to round. + * @return the rounded value + * @since 1.0.1 + */ + public static float roundKiloGram(float value) { + BigDecimal sumB = new BigDecimal(value); + float result = sumB.abs(MATH_CONTEXT_4_DIGIT).floatValue(); + return result; + } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.v1.SpeciesProtocol1; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,7 +30,7 @@ import fr.ifremer.adagio.core.dao.data.measure.file.MeasurementFileDao; import fr.ifremer.adagio.core.dao.referential.ObjectTypeImpl; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -58,7 +58,7 @@ import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueDao; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.dao.GearPhysicalFeaturesDaoTutti; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,24 @@ +package fr.ifremer.tutti.type; + +/** + * Coordinate formats. + * <p/> + * Created on 11/24/13. + * + * @author Tony Chemit <chemit@codelutin.com> + * @since 3.2 + */ +public enum CoordinateEditorType { + /** + * Degre-Minute-second. + */ + DMS, + /** + * Degre decimal. + */ + DD, + /** + * Degre minute decimal + */ + DMD +} Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/CoordinateEditorType.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java (rev 0) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,94 @@ +package fr.ifremer.tutti.type; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; + +/** + * Different types of weight unit. + * <p/> + * Created on 09/22/13. + * + * @author Tony Chemit <chemit@codelutin.com> + * @since 3.2 + */ +public enum WeightUnit { + + G(n_("application.common.unit.g"), n_("application.common.unit.short.g"), 1, "\\d{0,6}(\\.\\d{0,1})?") { + @Override + public Float fromEntity(Float weight) { + return weight == null ? null : weight * 1000; + } + + @Override + public Float toEntity(Float weight) { + return weight == null ? null : weight / 1000.0f; + } + }, + KG(n_("application.common.unit.kg"), n_("application.common.unit.short.kg"), 4, "\\d{0,6}(\\.\\d{0,4})?") { + @Override + public Float fromEntity(Float weight) { + return weight; + } + + @Override + public Float toEntity(Float weight) { + return weight; + } + }; + + private final String i18nShortKey; + + private final String i18nKey; + + private final int numberDigits; + + private final String numberEditorPattern; + + WeightUnit(String i18nKey, String i18nShortKey, int numberDigits, String numberEditorPattern) { + this.i18nKey = i18nKey; + this.i18nShortKey = i18nShortKey; + this.numberDigits = numberDigits; + this.numberEditorPattern = numberEditorPattern; + } + + public String getLabel() { + return _(i18nKey); + } + + public String getShortLabel() { + return _(i18nShortKey); + } + + public int getNumberDigits() { + return numberDigits; + } + + public String getNumberEditorPattern() { + return numberEditorPattern; + } + + /** + * Transform the given {@code weight} coming from db to ui. + * + * @param weight weigth to transform + * @return the ui representation of the given {@code weight}. + */ + public abstract Float fromEntity(Float weight); + + /** + * Transform the given {@code weight} coming from ui to db. + * + * @param weight weigth to transform + * @return the db representation of the given {@code weight}. + */ + public abstract Float toEntity(Float weight); + + public String decorateLabel(String label) { + return String.format("%s (%s)", label, getShortLabel()); + } + + public String decorateTip(String tip) { + String unit = _("application.common.unit"); + return String.format("%s (%s %s)", tip, unit, getLabel()); + } +} \ No newline at end of file Property changes on: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2014-01-31 10:56:26 UTC (rev 1564) @@ -1,3 +1,8 @@ +application.common.unit=Unit +application.common.unit.g=Gram +application.common.unit.kg=Kilogram +application.common.unit.short.g=g +application.common.unit.short.kg=kg tutti.config= tutti.config.option.basedir.description= tutti.config.option.cruiseId.description= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2014-01-31 10:56:26 UTC (rev 1564) @@ -1,3 +1,8 @@ +application.common.unit=Unité +application.common.unit.g=Gramme +application.common.unit.kg=Kilogramme +application.common.unit.short.g=g +application.common.unit.short.kg=kg tutti.config= tutti.config.option.basedir.description=Répertoire principale tutti.config.option.cruiseId.description=Identifiant de la dernière campagne utilisée Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/pom.xml 2014-01-31 10:56:26 UTC (rev 1564) @@ -48,10 +48,10 @@ <version>${project.version}</version> </dependency> - <!-- Ifremer shared --> + <!-- JAXX --> <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> </dependency> <!-- Nuiton --> Modified: trunk/tutti-service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-service/src/license/THIRD-PARTY.properties 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/license/THIRD-PARTY.properties 2014-01-31 10:56:26 UTC (rev 1564) @@ -20,6 +20,7 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - Mozilla Public License # - New BSD License # - Public Domain @@ -30,7 +31,7 @@ # Please fill the missing licenses for dependencies : # # -#Wed Jan 15 09:00:37 CET 2014 +#Fri Jan 31 11:50:47 CET 2014 antlr--antlr--2.7.6=BSD License batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 batik--batik-bridge--1.6=The Apache Software License, Version 2.0 @@ -47,5 +48,4 @@ batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.11.0.GA=The Apache Software License, Version 2.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.apache.commons.io.FileUtils; import org.nuiton.util.ZipUtil; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,8 +29,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.InvalidBatchModelException; import fr.ifremer.tutti.persistence.TuttiPersistence; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,7 +29,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.opensymphony.xwork2.util.ValueStack; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.RessourceClassLoader; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/TuttiWeightComputingException.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; /** * @author kmorin <kmorin@codelutin.com> Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.InvalidBatchModelException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,7 +30,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,8 +29,8 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.TuttiEntity; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/generic/TuttiExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,9 +29,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -32,7 +32,7 @@ import com.google.common.collect.Multimap; import com.google.common.collect.TreeMultimap; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocols; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,8 +30,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -32,8 +32,8 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportExportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,7 +30,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Gears; import fr.ifremer.tutti.persistence.entities.referential.Person; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.AbstractTuttiService; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.TuttiConfigurationOption; import fr.ifremer.tutti.persistence.RessourceClassLoader; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportService2Test.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportExportServiceTest.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.FishingOperations; Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/pom.xml 2014-01-31 10:56:26 UTC (rev 1564) @@ -111,16 +111,6 @@ <version>${project.version}</version> </dependency> - <!-- Ifremer shared --> - <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application</artifactId> - </dependency> - <dependency> - <groupId>fr.ifremer.shared</groupId> - <artifactId>application-swing</artifactId> - </dependency> - <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> @@ -194,6 +184,14 @@ <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-api</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-application-swing</artifactId> + </dependency> <!-- SwingX --> <dependency> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,10 +24,10 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.swing.AbstractApplicationUIHandler; -import fr.ifremer.shared.application.swing.action.AbstractApplicationAction; -import fr.ifremer.shared.application.swing.action.ApplicationActionFactory; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; +import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; +import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; import fr.ifremer.tutti.ui.swing.action.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import org.apache.commons.lang3.reflect.ConstructorUtils; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; import fr.ifremer.tutti.LabelAware; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiDbUpdaterCallBack.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import fr.ifremer.adagio.core.service.technical.synchro.ReferentialSynchroResult; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.swing.action.ApplicationActionException; -import fr.ifremer.shared.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiReportUpdaterCallBack.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,8 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,16 +27,16 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.ApplicationConfiguration; -import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; -import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; -import fr.ifremer.shared.application.swing.ApplicationUIContext; -import fr.ifremer.shared.application.swing.action.ApplicationActionEngine; -import fr.ifremer.shared.application.swing.action.ApplicationActionFactory; -import fr.ifremer.shared.application.swing.action.ApplicationActionUI; -import fr.ifremer.shared.application.swing.util.ApplicationErrorHelper; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationConfiguration; +import org.nuiton.jaxx.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.swing.ApplicationUIContext; +import org.nuiton.jaxx.application.swing.action.ApplicationActionEngine; +import org.nuiton.jaxx.application.swing.action.ApplicationActionFactory; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.ichtyometer.feed.FeedReader; import fr.ifremer.tutti.persistence.RessourceClassLoader; @@ -807,6 +807,7 @@ return actionUI; } + @Override public ApplicationActionUI getExistingActionUI() { while (actionUI == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.swing.action.AbstractApplicationAction; +import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.TuttiDataContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; import fr.ifremer.tutti.ichtyometer.LocalDeviceNotFoundException; import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportCruiseAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.export.generic.TuttiExportService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportProgramAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.service.PersistenceService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.swing.action.ApplicationUIAction; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.TuttiPersistence; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.TuttiUIContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.export.pdf.CatchesPdfExportService; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.apache.commons.logging.Log; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,8 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.swing.action.ApplicationActionUI; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.ichtyometer.feed.FeedReader; import fr.ifremer.tutti.persistence.entities.data.Cruise; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Cruise; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -22,8 +22,8 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Gear; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/ValidateCruiseUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.action.ApplicationActionUIModel; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUIModel; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.ui.swing.action.EditCruiseFishingOperationAction; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -33,7 +33,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - fr.ifremer.shared.application.swing.util.ActionListCellRenderer + org.nuiton.jaxx.application.swing.util.ActionListCellRenderer jaxx.runtime.swing.editor.bean.BeanFilterableComboBox 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 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -37,7 +37,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment - fr.ifremer.shared.application.type.CoordinateEditorType + fr.ifremer.tutti.type.CoordinateEditorType jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.tab.TabHandler; -import fr.ifremer.shared.application.type.CoordinateEditorType; +import org.nuiton.jaxx.application.swing.tab.TabHandler; +import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; 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 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,8 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.tab.TabContentModel; -import fr.ifremer.shared.application.type.CoordinateEditorType; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; +import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,9 +28,9 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jdesktop.swingx.JXTable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -48,7 +48,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI - fr.ifremer.shared.application.swing.computable.ComputableDataEditor + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor org.jdesktop.swingx.JXTitledPanel Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.tab.TabHandler; +import org.nuiton.jaxx.application.swing.tab.TabHandler; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,8 +28,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; @@ -38,7 +38,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.apache.commons.collections.CollectionUtils; import org.nuiton.util.beans.Binder; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.data.SampleCategory; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import java.io.Serializable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.ui.swing.TuttiUIContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiDecorator; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatchs; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,10 +24,10 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchRowModel; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -36,6 +34,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -59,6 +58,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.apache.commons.collections.CollectionUtils; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -23,7 +23,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,13 +27,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryColumnIdentifier; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.table.TableColumnModelExt; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - fr.ifremer.shared.application.swing.computable.ComputableDataEditor + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor org.jdesktop.swingx.JXTable Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,8 @@ */ import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,8 +26,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequencys; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,9 +25,9 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import java.beans.PropertyChangeEvent; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Sets; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.SelectedCategoryAble; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.ui.swing.content.operation.catches.SelectedCategoryAble; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import java.util.List; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatchs; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapColumnRowModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -22,9 +22,9 @@ * #L% */ -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.apache.commons.collections.CollectionUtils; import java.util.List; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,8 +25,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationDataUtil; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -32,7 +32,7 @@ import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatchs; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -30,7 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - fr.ifremer.shared.application.swing.computable.ComputableDataEditor + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor org.jdesktop.swingx.JXTable Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,9 +26,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,8 +28,8 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; -import fr.ifremer.shared.application.swing.computable.ComputableData; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import org.apache.commons.collections.CollectionUtils; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.ApplicationDataUtil; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -38,11 +37,11 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchs; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryAble; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.swing.computable.ComputableData; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,13 +27,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryColumnIdentifier; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.table.TableColumnModelExt; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - fr.ifremer.shared.application.swing.computable.ComputableDataEditor + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor org.jdesktop.swingx.JXTable Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.computable.ComputableData; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,13 +26,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.computable.ComputableData; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequencys; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,9 +25,9 @@ */ import com.google.common.collect.Maps; -import fr.ifremer.shared.application.type.WeightUnit; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.type.WeightUnit; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import java.beans.PropertyChangeEvent; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,9 +27,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.swing.util.Cancelable; -import fr.ifremer.shared.application.type.WeightUnit; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.util.Cancelable; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderEvent; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderListener; import fr.ifremer.tutti.ichtyometer.feed.FeedReaderRecord; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Sets; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.SelectedCategoryAble; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import fr.ifremer.tutti.ui.swing.content.operation.catches.SelectedCategoryAble; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import java.util.List; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import fr.ifremer.shared.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import java.io.Serializable; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import jaxx.runtime.validator.swing.SwingValidator; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,10 +25,10 @@ */ import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import java.util.List; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -29,7 +29,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; /** * @author tchemit <chemit@codelutin.com> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.shared.application.swing.util.CloseableUI; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.report.ReportService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiBeanUIModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.listener.PropagatePropertyChangeListener; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.util.CollectionUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiTabContainerUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,10 +25,10 @@ * #L% */ -import fr.ifremer.shared.application.swing.tab.DelegateTabContainerHandler; -import fr.ifremer.shared.application.swing.tab.TabContainerHandler; -import fr.ifremer.shared.application.swing.tab.TabContentModel; -import fr.ifremer.shared.application.swing.tab.TabHandler; +import org.nuiton.jaxx.application.swing.tab.DelegateTabContainerHandler; +import org.nuiton.jaxx.application.swing.tab.TabContainerHandler; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; +import org.nuiton.jaxx.application.swing.tab.TabHandler; import fr.ifremer.tutti.ui.swing.TuttiUIContext; /** Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,9 +26,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.AbstractApplicationUIHandler; -import fr.ifremer.shared.application.swing.action.ApplicationActionUI; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import fr.ifremer.tutti.type.WeightUnit; +import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.jdesktop.swingx.table.TableColumnExt; +import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; +import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.LabelAware; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; @@ -51,17 +55,26 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.bean.simple.SimpleBeanValidator; +import javax.swing.JTable; import javax.swing.JTextField; +import javax.swing.border.LineBorder; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumnModel; +import java.awt.Color; import java.awt.Component; import java.awt.Font; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Set; +import static org.nuiton.i18n.I18n._; + /** * Contract of any UI handler. * @@ -387,4 +400,49 @@ return title.toString(); } + protected <R> TableColumnExt addFloatColumnToModel(TableColumnModel model, + ColumnIdentifier<R> identifier, + WeightUnit weightUnit, + JTable table) { + + Preconditions.checkNotNull(weightUnit); + NumberCellEditor<Float> editor = + JAXXWidgetUtil.newNumberTableCellEditor(Float.class, false); + editor.getNumberEditor().setSelectAllTextOnError(true); + editor.getNumberEditor().getTextField().setBorder(new LineBorder(Color.GRAY, 2)); + editor.getNumberEditor().setNumberPattern(weightUnit.getNumberEditorPattern()); + + TableCellRenderer renderer = + newNumberCellRenderer(table.getDefaultRenderer(Number.class)); + + return addColumnToModel(model, editor, renderer, identifier, weightUnit); + } + + protected <R> TableColumnExt addColumnToModel(TableColumnModel model, + TableCellEditor editor, + TableCellRenderer renderer, + ColumnIdentifier<R> identifier, + WeightUnit weightUnit) { + + TableColumnExt col = new TableColumnExt(model.getColumnCount()); + col.setCellEditor(editor); + col.setCellRenderer(renderer); + String label = _(identifier.getHeaderI18nKey()); + if (weightUnit != null) { + label = weightUnit.decorateLabel(label); + } + col.setHeaderValue(label); + String tip = _(identifier.getHeaderTipI18nKey()); + if (weightUnit != null) { + tip = weightUnit.decorateTip(tip); + } + col.setToolTipText(tip); + + col.setIdentifier(identifier); + model.addColumn(col); + // by default no column is sortable, must specify it + col.setSortable(false); + return col; + } + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiExceptionHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,9 +24,9 @@ * #L% */ -import fr.ifremer.shared.application.swing.action.ApplicationActionException; -import fr.ifremer.shared.application.swing.util.ApplicationErrorHelper; -import fr.ifremer.shared.application.swing.util.ApplicationExceptionHandler; +import org.nuiton.jaxx.application.swing.action.ApplicationActionException; +import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; +import org.nuiton.jaxx.application.swing.util.ApplicationExceptionHandler; import fr.ifremer.tutti.ui.swing.action.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; import org.apache.commons.logging.Log; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,11 @@ * #L% */ -import fr.ifremer.shared.application.swing.ApplicationUI; +import org.nuiton.jaxx.application.swing.ApplicationUI; +import javax.swing.UIManager; +import java.awt.Font; + /** * Contract to place on each generated jaxx ui. * @@ -34,6 +37,10 @@ */ public interface TuttiUI<M, H extends AbstractTuttiUIHandler<M, ?>> extends ApplicationUI<M, H> { + Font TEXTFIELD_NORMAL_FONT = UIManager.getDefaults().getFont("TextField.font"); + + Font TEXTFIELD_COMPUTED_FONT = UIManager.getDefaults().getFont("TextField.font").deriveFont(Font.ITALIC); + H getHandler(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,8 +24,8 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationBusinessException; -import fr.ifremer.shared.application.swing.util.ApplicationUIUtil; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import jaxx.runtime.JAXXObject; import jaxx.runtime.JAXXUtil; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellEditor.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -28,7 +28,7 @@ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationTechnicalException; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Attachments; import fr.ifremer.tutti.ui.swing.TuttiUIContext; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/SaveAttachmentAction.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.ApplicationIOUtil; +import org.nuiton.jaxx.application.ApplicationIOUtil; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -22,8 +22,8 @@ * #L% */ -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n_; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,7 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.shared.application.swing.util.Cancelable; +import org.nuiton.jaxx.application.swing.util.Cancelable; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellEditor.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.persistence.entities.CommentAware; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,127 @@ +package fr.ifremer.tutti.ui.swing.util.computable; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swing... $ + * %% + * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.jaxx.application.listener.PropagatePropertyChangeListener; + + +/** + * A number data plus a possible computed value. + * + * @author kmorin <kmorin@codelutin.com> + * @since 1.0 + */ +public class ComputableData<N extends Number> extends AbstractSerializableBean { + + public static final String PROPERTY_DATA = "data"; + + public static final String PROPERTY_COMPUTED_DATA = "computedData"; + + private static final long serialVersionUID = 1L; + + protected N data; + + protected N computedData; + + public ComputableData() { + data = null; + computedData = null; + } + + public ComputableData(N data, N computedData) { + this.data = data; + this.computedData = computedData; + } + + public N getData() { + return data; + } + + public void setData(N data) { + Object oldValue = getData(); + this.data = data; + firePropertyChange(PROPERTY_DATA, oldValue, data); + } + + public N getComputedData() { + return computedData; + } + + public void setComputedData(N computedData) { + Object oldValue = getComputedData(); + this.computedData = computedData; + firePropertyChange(PROPERTY_COMPUTED_DATA, oldValue, computedData); + } + + @Override + public String toString() { + String result = null; + if (data != null) { + result = data.toString(); + } else if (computedData != null) { + result = computedData.toString(); + } + return result; + } + + /** + * Add a listener to propagate the modification of the + * {@link #PROPERTY_DATA} property to a given {@code propertyName}. + * + * @param propertyName name of the property to fire on given bean + * @param otherBean bean that will fires + * @since 1.2 + */ + public void addPropagateListener(String propertyName, + PropagatePropertyChangeListener.PropagatePropertyChange otherBean) { + + PropagatePropertyChangeListener.listenAndPropagate(this, + otherBean, + PROPERTY_DATA, + propertyName); + +// PropagatePropertyChangeListener listener = new PropagatePropertyChangeListener(propertyName, otherBean); +// addPropertyChangeListener(PROPERTY_DATA, listener); + } + +// private static class PropagateProperyChangeListener implements PropertyChangeListener { +// +// private String propertyName; +// +// private AbstractTuttiBeanUIModel otherBean; +// +// public PropagatePropertyChangeLstener(String propertyName, +// AbstractTuttiBeanUIModel otherBean) { +// this.propertyName = propertyName; +// this.otherBean = otherBean; +// } +// +// @Override +// public void propertyChange(PropertyChangeEvent evt) { +// otherBean.firePropertyChanged(propertyName, evt.getOldValue(), evt.getNewValue()); +// } +// } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableData.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,53 @@ +<!-- + #%L + Tutti :: UI + $Id: ComputableDataEditor.jaxx 1387 2013-11-25 16:03:00Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swing... $ + %% + Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> +<jaxx.runtime.swing.editor.NumberEditor genericType='E extends Number'> + + <import> + java.awt.Color + </import> + + <String id='property' javaBean='ComputableData.PROPERTY_DATA'/> + + <ComputableData id='bean' genericType='E' javaBean='null'/> + + <Color id='computedDataColor' javaBean='null'/> + + <!-- ui handler --> + <ComputableDataEditorHandler id='handler' constructorParams='this'/> + + <Integer id='decimalNumber' javaBean='null'/> + + <script><![CDATA[ + + public void setBean(ComputableData<E> bean) { + super.setBean(bean); + } + + public void setProperty(String property) { + // cannot change the property + } +]]> + </script> + +</jaxx.runtime.swing.editor.NumberEditor> \ No newline at end of file Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,138 @@ + +package fr.ifremer.tutti.ui.swing.util.computable; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swing... $ + * %% + * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.swing.editor.NumberEditorHandler; + +import javax.swing.JTextField; +import java.awt.Color; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.text.DecimalFormat; + +/** + * @author kmorin <kmorin@codelutin.com> + * @since 1.0 + */ +public class ComputableDataEditorHandler extends NumberEditorHandler { + + protected Integer decimalNumber; + + public ComputableDataEditorHandler(ComputableDataEditor ui) { + super(ui); + } + + @Override + public void init() { + final PropertyChangeListener l = new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + setComputedTextIfNullModel(); + } + }; + + ComputableData bean = (ComputableData) editor.getBean(); + if (bean != null) { + bean.addPropertyChangeListener(l); + } + editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_BEAN, new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + + ComputableData bean = (ComputableData) evt.getOldValue(); + if (bean != null) { + bean.removePropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); + } + + bean = (ComputableData) evt.getNewValue(); + if (bean != null) { + bean.addPropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); + } + } + }); + + editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_MODEL, l); + + editor.getTextField().addFocusListener(new FocusListener() { + + public void focusGained(FocusEvent e) { + JTextField tf = editor.getTextField(); + tf.setFont(TuttiUI.TEXTFIELD_NORMAL_FONT); + tf.setForeground(Color.BLACK); + if (editor.getModel() == null) { + tf.setText(""); + } + } + + public void focusLost(FocusEvent e) { + setComputedTextIfNullModel(); + } + }); + + editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_DECIMAL_NUMBER, + new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + decimalNumber = (Integer) evt.getNewValue(); + } + }); + + decimalNumber = ((ComputableDataEditor) editor).getDecimalNumber(); + + super.init(); + + } + + protected void setComputedTextIfNullModel() { + ComputableData bean = (ComputableData) editor.getBean(); + JTextField tf = editor.getTextField(); + if (bean != null && editor.getModel() == null) { + tf.setFont(TuttiUI.TEXTFIELD_COMPUTED_FONT); + tf.setForeground(((ComputableDataEditor) editor).getComputedDataColor()); + + String modelText; + Number computedData = bean.getComputedData(); + if (editor.isUseFloat() + && decimalNumber != null && computedData != null) { + DecimalFormat decimalFormat = TuttiEntities.getDecimalFormat(1, decimalNumber); + modelText = decimalFormat.format(computedData); + } else { + modelText = JAXXUtil.getStringValue(computedData); + } + tf.setText(modelText); + + } else { + tf.setFont(TuttiUI.TEXTFIELD_NORMAL_FONT); + tf.setForeground(Color.BLACK); + } + } + +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -0,0 +1,259 @@ +package fr.ifremer.tutti.ui.swing.util.computable; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/tutti/application/trunk/application-swing... $ + * %% + * Copyright (C) 2012 - 2013 Ifremer, CodeLutin, Tony CHEMIT + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.type.WeightUnit; +import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import jaxx.runtime.JAXXUtil; + +import javax.swing.AbstractCellEditor; +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.border.LineBorder; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.Color; +import java.awt.Component; +import java.awt.Font; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.text.DecimalFormat; + +/** + * Editor for TuttiComputedOrNotData + * + * @author kmorin <kmorin@codelutin.com> + * @since 1.0 + */ +public class ComputableDataTableCell extends DefaultTableCellRenderer { + private static final long serialVersionUID = 1L; + + public static TableCellRenderer newRender(TableCellRenderer renderer, + WeightUnit weightUnit, + Color computedDataColor) { + + return new TuttiComputedOrNotDataTableCellRenderer(renderer, + true, + weightUnit.getNumberDigits(), + computedDataColor); + } + + public static TableCellEditor newEditor(Class type, + WeightUnit weightUnit, + Color computedDataColor) { + + return new TuttiComputedOrNotDataTableCellEditor(type, + false, + true, + weightUnit.getNumberDigits(), + weightUnit.getNumberEditorPattern(), + computedDataColor); + } + + public static class TuttiComputedOrNotDataTableCellEditor + extends AbstractCellEditor + implements TableCellEditor, FocusListener, AncestorListener { + + private static final long serialVersionUID = 1L; + + protected final ComputableDataEditor numberEditor; + + protected ComputableData data; + + /** constructor */ + public TuttiComputedOrNotDataTableCellEditor(Class type, + boolean useSign, + boolean useFloat, + Integer decimalNumber, + String numberPattern, + Color computedDataColor) { + + numberEditor = new ComputableDataEditor(); + numberEditor.setComputedDataColor(computedDataColor); + numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); + numberEditor.getTextField().addFocusListener(this); + numberEditor.getTextField().addAncestorListener(this); + numberEditor.getTextField().setBorder(new LineBorder(Color.GRAY, 2)); + numberEditor.setSelectAllTextOnError(true); + + numberEditor.setNumberPattern(numberPattern); + numberEditor.setModelType(type); + numberEditor.setUseSign(useSign); + numberEditor.setUseFloat(useFloat); + numberEditor.setDecimalNumber(decimalNumber); + numberEditor.init(); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, int row, int column) { + + data = (ComputableData) value; + numberEditor.setModel(data.getData()); + + // Check nullity and set the text that will be selected with the current value + if (data.getData() != null) { + numberEditor.setModelText(String.valueOf(data.getData())); + } + return numberEditor; + } + + public ComputableDataEditor getNumberEditor() { + return numberEditor; + } + + @Override + public ComputableData getCellEditorValue() { + return data; + } + + @Override + public void focusGained(FocusEvent e) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); + } + }); + } + + @Override + public void focusLost(FocusEvent e) { + } + + @Override + public void ancestorAdded(AncestorEvent event) { + SwingUtilities.invokeLater(new Runnable() { + public void run() { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); + } + }); + } + + @Override + public void ancestorRemoved(AncestorEvent event) { + } + + @Override + public void ancestorMoved(AncestorEvent event) { + } + + @Override + public boolean stopCellEditing() { + boolean result = super.stopCellEditing(); + // Reset previous data to avoid keeping it on other cell edition + if (result) { + data.setData(numberEditor.getModel()); + + numberEditor.setBean(null); + + data = null; + } + return result; + } + } + + public static class TuttiComputedOrNotDataTableCellRenderer + implements TableCellRenderer { + + protected final TableCellRenderer delegate; + + protected Integer decimalNumber; + + protected Color computedDataColor; + + protected boolean useFloat; + + public TuttiComputedOrNotDataTableCellRenderer( + TableCellRenderer delegate, + boolean useFloat, + Integer decimalNumber, + Color computedDataColor) { + + this.delegate = delegate; + this.useFloat = useFloat; + this.decimalNumber = decimalNumber; + this.computedDataColor = computedDataColor; + } + + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + + ComputableData data = (ComputableData) value; + Number dataValue = data.getData(); + Font font; + Color foreground; + String text; + if (dataValue == null) { + dataValue = data.getComputedData(); + font = TuttiUI.TEXTFIELD_COMPUTED_FONT; + foreground = computedDataColor; + + if (useFloat && decimalNumber != null && dataValue != null) { + DecimalFormat decimalFormat = TuttiEntities.getDecimalFormat(1, decimalNumber); + text = JAXXUtil.getStringValue(decimalFormat.format(dataValue)); + } else { + text = JAXXUtil.getStringValue(dataValue); + } + + } else { + font = TuttiUI.TEXTFIELD_NORMAL_FONT; + foreground = Color.BLACK; + text = JAXXUtil.getStringValue(dataValue); + } + + Component component = delegate.getTableCellRendererComponent(table, + text, + isSelected, + hasFocus, + row, + column); + + if (isSelected) { + font = font.deriveFont(Font.BOLD); + } + component.setFont(font); + component.setForeground(foreground); + if (component instanceof JLabel) { + JLabel jLabel = (JLabel) component; + jLabel.setHorizontalAlignment(RIGHT); + } + + return component; + } + + } +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightDialog.jaxx 2014-01-31 10:56:26 UTC (rev 1564) @@ -23,7 +23,7 @@ --> <JDialog id='dialog' layout='{new BorderLayout()}'> <import> - fr.ifremer.shared.application.type.WeightUnit; + fr.ifremer.tutti.type.WeightUnit; java.awt.Component; java.awt.event.WindowAdapter; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -26,12 +26,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import fr.ifremer.shared.application.swing.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; -import fr.ifremer.shared.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.shared.application.swing.table.MoveToNextEditableCellAction; -import fr.ifremer.shared.application.swing.table.MoveToNextEditableRowAction; -import fr.ifremer.shared.application.swing.table.MoveToPreviousEditableCellAction; -import fr.ifremer.shared.application.swing.table.MoveToPreviousEditableRowAction; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.MoveToNextEditableCellAction; +import org.nuiton.jaxx.application.swing.table.MoveToNextEditableRowAction; +import org.nuiton.jaxx.application.swing.table.MoveToPreviousEditableCellAction; +import org.nuiton.jaxx.application.swing.table.MoveToPreviousEditableRowAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryComponent.SampleCategoryEditor; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.shared.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; Modified: trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java =================================================================== --- trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java 2014-01-31 08:13:14 UTC (rev 1563) +++ trunk/tutti-ui-swing/src/test/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModelTest.java 2014-01-31 10:56:26 UTC (rev 1564) @@ -24,7 +24,7 @@ * #L% */ -import fr.ifremer.shared.application.type.WeightUnit; +import fr.ifremer.tutti.type.WeightUnit; import org.junit.Assert; import org.junit.Test;