[Tutti-commits] 01/01: optimize imports

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 12e07743c34d4656d7d6d97dacc891641500c3f1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 6 12:42:03 2015 +0100 optimize imports --- .../swing/action/AbstractReplaceTemporaryUIAction.java | 2 +- .../tutti/ui/swing/action/AbstractTuttiAction.java | 8 ++++---- .../ui/swing/action/AddCaracteristicMappingAction.java | 5 ----- .../swing/action/CancelEditFishingOperationAction.java | 1 - .../tutti/ui/swing/action/ConnectIchtyometerAction.java | 2 +- .../ui/swing/action/EditCruiseInValidationUIAction.java | 2 +- .../ui/swing/action/EditFishingOperationAction.java | 2 +- .../action/EditFishingOperationInValidationUIAction.java | 6 +++--- .../action/ExportFishingOperationForSumatraAction.java | 1 - .../ui/swing/action/ExportMultiPostActionSupport.java | 16 ++++++++-------- .../ui/swing/action/ExportMultiPostBenthosAction.java | 2 +- .../tutti/ui/swing/action/ImportBigfinAction.java | 8 ++++---- .../fr/ifremer/tutti/ui/swing/action/ImportDbAction.java | 2 +- .../ui/swing/action/ImportProtocolBenthosAction.java | 4 ++-- .../ui/swing/action/ImportProtocolSpeciesAction.java | 4 ++-- .../tutti/ui/swing/action/ImportTemporaryGearAction.java | 1 - .../ui/swing/action/ImportTemporaryPersonAction.java | 1 - .../ui/swing/action/LoadProtocolImportColumnsAction.java | 3 --- .../fr/ifremer/tutti/ui/swing/action/OpenDbAction.java | 4 ++-- .../ifremer/tutti/ui/swing/action/ReimportDbAction.java | 2 +- .../ifremer/tutti/ui/swing/action/ReinstallDbAction.java | 2 +- .../swing/action/RemoveCaracteristicMappingAction.java | 3 +-- .../tutti/ui/swing/action/RenameBenthosBatchAction.java | 3 --- .../tutti/ui/swing/action/RenameSpeciesBatchAction.java | 3 --- .../ui/swing/action/SaveCruiseToReadyToSynchAction.java | 2 +- .../ifremer/tutti/ui/swing/action/SaveProgramAction.java | 1 - .../tutti/ui/swing/action/SaveProtocolAction.java | 6 +----- .../tutti/ui/swing/action/SelectOtherSpeciesAction.java | 1 - .../tutti/ui/swing/action/SendCruiseReportAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/StartAction.java | 2 +- 30 files changed, 38 insertions(+), 63 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java index 428a288..a8e03c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractReplaceTemporaryUIAction.java @@ -119,7 +119,7 @@ public abstract class AbstractReplaceTemporaryUIAction<E extends TuttiReferentia if (delete) { - ManageTemporaryReferentialUI mainUi= getUI().getContextValue(ManageTemporaryReferentialUI.class, "owner"); + ManageTemporaryReferentialUI mainUi = getUI().getContextValue(ManageTemporaryReferentialUI.class, "owner"); updateNumberOfTemporaryEntities(mainUi); sendMessage(t("tutti.replaceTemporaryAndDelete.done", getEntityLabel(), decorate(source), decorate(target))); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java index a21205e..3f5264c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractTuttiAction.java @@ -22,18 +22,18 @@ package fr.ifremer.tutti.ui.swing.action; * #L% */ -import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; -import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; +import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; +import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import org.apache.commons.lang3.StringUtils; import org.jdesktop.beans.AbstractBean; +import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; import org.nuiton.util.StringUtil; import javax.swing.JOptionPane; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddCaracteristicMappingAction.java index b05d872..2ab5887 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AddCaracteristicMappingAction.java @@ -24,19 +24,14 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolCaracteristicsRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolCaracteristicsTableModel; -import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; -import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesTableModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import java.util.Collection; - import static org.nuiton.i18n.I18n.t; /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java index a59860d..2c135e8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.action; /* diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java index 76314cb..9eefb2c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ConnectIchtyometerAction.java @@ -22,7 +22,6 @@ package fr.ifremer.tutti.ui.swing.action; * #L% */ -import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; import fr.ifremer.tutti.ichtyometer.LocalDeviceNotFoundException; import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; @@ -30,6 +29,7 @@ import fr.ifremer.tutti.ichtyometer.RemoteDeviceNotFoundException; import fr.ifremer.tutti.ichtyometer.RemoteDeviceServiceNotFoundException; import fr.ifremer.tutti.ichtyometer.feed.FeedReader; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import org.nuiton.jaxx.application.ApplicationBusinessException; import javax.swing.JOptionPane; import java.util.Set; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseInValidationUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseInValidationUIAction.java index 1915bcd..47e5e99 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseInValidationUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditCruiseInValidationUIAction.java @@ -27,10 +27,10 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; import fr.ifremer.tutti.ui.swing.content.cruise.EditCruiseUI; import fr.ifremer.tutti.ui.swing.content.cruise.EditCruiseUIModel; +import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUI; import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUIHandler; import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; import org.nuiton.validator.NuitonValidatorResult; import java.beans.PropertyChangeEvent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java index 791e052..50a9e99 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java @@ -798,7 +798,7 @@ public class EditFishingOperationAction extends AbstractTuttiAction<FishingOpera } ui.getHandler().installTotalRejectWeightListener(); - + catchesUIModel.setLoadingData(false); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationInValidationUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationInValidationUIAction.java index 26cd6f0..5b50724 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationInValidationUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationInValidationUIAction.java @@ -27,12 +27,12 @@ import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.ValidateCruiseOperationsService; -import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUI; -import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUIHandler; -import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUIModel; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; +import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUI; +import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUIHandler; +import fr.ifremer.tutti.ui.swing.content.validation.ValidateCruiseUIModel; import org.nuiton.validator.NuitonValidatorResult; import java.beans.PropertyChangeEvent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java index db426a1..8732f2f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportFishingOperationForSumatraAction.java @@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import java.io.File; -import java.util.Date; import static org.nuiton.i18n.I18n.t; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostActionSupport.java index 7840173..576b809 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostActionSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostActionSupport.java @@ -106,14 +106,14 @@ public abstract class ExportMultiPostActionSupport<M extends AbstractBean, UI ex t("tutti.askToSaveCatch.message"), t("tutti.askToSaveCatchBeforeExport.help")); - int saveResponse =JOptionPane.showOptionDialog(getHandler().getTopestUI(), - htmlMessage, - t("tutti.askToSaveCatch.title"), - JOptionPane.OK_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE, - null, - new String[]{t("tutti.option.saveCatch"), t("tutti.option.notSaveCatch"), t("tutti.option.cancelExport")}, - t("tutti.option.saveCatch")); + int saveResponse = JOptionPane.showOptionDialog(getHandler().getTopestUI(), + htmlMessage, + t("tutti.askToSaveCatch.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + new String[]{t("tutti.option.saveCatch"), t("tutti.option.notSaveCatch"), t("tutti.option.cancelExport")}, + t("tutti.option.saveCatch")); switch (saveResponse) { case 0: diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostBenthosAction.java index c0bdacd..41f9b2d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostBenthosAction.java @@ -71,7 +71,7 @@ public class ExportMultiPostBenthosAction extends ExportMultiPostActionSupport<B protected void doExport(MultiPostExportService multiPostImportExportService, File file, FishingOperation fishingOperation) { multiPostImportExportService.exportBenthos(file, fishingOperation); - + } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBigfinAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBigfinAction.java index ed35109..eb232a5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBigfinAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBigfinAction.java @@ -127,8 +127,8 @@ public class ImportBigfinAction extends AbstractTuttiAction<SpeciesBatchUIModel, displayWarningMessage( t("tutti.editSpeciesBatch.action.importBigfin.errors.fishingOperation.title"), "<html><body>" + - t("tutti.editSpeciesBatch.action.importBigfin.errors.fishingOperation", sb.toString()) + - "</body></html>" + t("tutti.editSpeciesBatch.action.importBigfin.errors.fishingOperation", sb.toString()) + + "</body></html>" ); } @@ -141,8 +141,8 @@ public class ImportBigfinAction extends AbstractTuttiAction<SpeciesBatchUIModel, displayWarningMessage( t("tutti.editSpeciesBatch.action.importBigfin.fatal.fishingOperation.title"), "<html><body>" + - t("tutti.editSpeciesBatch.action.importBigfin.fatal.fishingOperation", sb.toString()) + - "</body></html>" + t("tutti.editSpeciesBatch.action.importBigfin.fatal.fishingOperation", sb.toString()) + + "</body></html>" ); sendMessage(t("tutti.editSpeciesBatch.action.importBigfin.fatal.data")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java index 66d3b97..83d61ef 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportDbAction.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.ui.swing.action; */ import com.google.common.base.Preconditions; -import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.service.PersistenceService; @@ -31,6 +30,7 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.util.version.Version; import javax.swing.JOptionPane; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java index b120e79..24c8d89 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolBenthosAction.java @@ -154,8 +154,8 @@ public class ImportProtocolBenthosAction extends AbstractTuttiAction<EditProtoco displayWarningMessage( t("tutti.editProtocol.action.importProtocolBenthos.speciesInSpecies.title"), "<html><body>" + - t("tutti.editProtocol.action.importProtocolBenthos.speciesInSpecies", sb.toString()) + - "</body></html>" + t("tutti.editProtocol.action.importProtocolBenthos.speciesInSpecies", sb.toString()) + + "</body></html>" ); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java index 4a4a7f5..aa7e34e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportProtocolSpeciesAction.java @@ -154,8 +154,8 @@ public class ImportProtocolSpeciesAction extends AbstractTuttiAction<EditProtoco displayWarningMessage( t("tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos.title"), "<html><body>" + - t("tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos", sb.toString()) + - "</body></html>" + t("tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos", sb.toString()) + + "</body></html>" ); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java index 5a6422e..8a18de3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryGearAction.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.referential.ReferentialImportResult; -import fr.ifremer.tutti.service.referential.ReferentialImportService; import fr.ifremer.tutti.service.referential.ReferentialTemporaryGearService; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java index 1f0196f..2768ecc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportTemporaryPersonAction.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.ui.swing.action; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.referential.ReferentialImportResult; -import fr.ifremer.tutti.service.referential.ReferentialImportService; import fr.ifremer.tutti.service.referential.ReferentialTemporaryPersonService; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUI; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java index f1c9942..0cabd53 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/LoadProtocolImportColumnsAction.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ui.swing.action; * #L% */ -import com.csvreader.CsvReader; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; @@ -33,8 +32,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.csv.ext.CsvReaders; import java.io.File; -import java.io.FileInputStream; -import java.nio.charset.Charset; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java index c455861..12fa530 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenDbAction.java @@ -22,8 +22,6 @@ package fr.ifremer.tutti.ui.swing.action; * #L% */ -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; @@ -33,6 +31,8 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationBusinessException; +import org.nuiton.jaxx.application.swing.action.ApplicationUIAction; import org.nuiton.updater.ApplicationInfo; import org.nuiton.updater.ApplicationUpdater; import org.nuiton.util.version.Version; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java index 5ed97ed..f286037 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReimportDbAction.java @@ -23,10 +23,10 @@ package fr.ifremer.tutti.ui.swing.action; */ import com.google.common.base.Preconditions; -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; +import org.nuiton.jaxx.application.ApplicationIOUtil; import java.io.File; import java.util.Date; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java index 1864ad4..244e23d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ReinstallDbAction.java @@ -23,11 +23,11 @@ package fr.ifremer.tutti.ui.swing.action; */ import com.google.common.base.Preconditions; -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; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import org.nuiton.jaxx.application.ApplicationIOUtil; import java.io.File; import java.util.Date; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java index c98081e..709a242 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java @@ -33,9 +33,8 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import jaxx.runtime.SwingUtil; -import org.apache.commons.collections4.ComparatorUtils; -import javax.swing.*; +import javax.swing.JTable; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java index 0071c23..e595d26 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameBenthosBatchAction.java @@ -32,12 +32,9 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchT import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import jaxx.runtime.SwingUtil; import org.jdesktop.swingx.JXTable; -import java.awt.Dimension; import java.io.Serializable; import java.util.Collection; import java.util.List; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java index 62b9412..43095a9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RenameSpeciesBatchAction.java @@ -32,12 +32,9 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchT import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; -import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import jaxx.runtime.SwingUtil; import org.jdesktop.swingx.JXTable; -import java.awt.Dimension; import java.io.Serializable; import java.util.Collection; import java.util.List; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java index 5a481b2..52469be 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java @@ -66,7 +66,7 @@ public class SaveCruiseToReadyToSynchAction extends AbstractTuttiAction<Validate PersistenceService persistenceService = getContext().getPersistenceService(); int fishingOperationCount = persistenceService.getFishingOperationCount(getModel().getCruise().getId()); createProgressionModelIfRequired(fishingOperationCount + 1); - + return doAction; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java index 8d54b94..672d3e4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProgramAction.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.action; /* diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java index c0a14f6..9a5fe6d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveProtocolAction.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.action; /* @@ -23,8 +22,6 @@ package fr.ifremer.tutti.ui.swing.action; * #L% */ -import com.google.common.base.Function; -import com.google.common.collect.Collections2; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; @@ -42,7 +39,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.StringUtil; import java.util.ArrayList; import java.util.Collection; @@ -91,7 +87,7 @@ public class SaveProtocolAction extends AbstractTuttiAction<EditProtocolUIModel, List<OperationFieldMappingRow> operationFieldMappingRows = new ArrayList<OperationFieldMappingRow>(); for (EditProtocolOperationFieldsRowModel row : protocolOperationFieldMappingRows) { if (StringUtils.isNotBlank(row.getField()) && StringUtils.isNotBlank(row.getImportColumn()) - && row.isValid()) { + && row.isValid()) { operationFieldMappingRows.add(row.toEntity()); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java index 52e34a7..9e6b4b3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SelectOtherSpeciesAction.java @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.action; /* diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java index 5b3111c..ff00f8e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SendCruiseReportAction.java @@ -23,13 +23,13 @@ package fr.ifremer.tutti.ui.swing.action; */ import com.google.common.base.Preconditions; -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; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationTechnicalException; import javax.swing.JOptionPane; import java.io.File; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java index 89df03f..6929daa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/StartAction.java @@ -22,11 +22,11 @@ package fr.ifremer.tutti.ui.swing.action; * #L% */ -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; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.ApplicationIOUtil; import java.io.File; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.