[Tutti-commits] 01/01: utilisation jaxx 3.0

This is an automated email from the git hooks/post-receive script. New commit to branch feature/migration_jaxx_3 in repository tutti. See http://git.codelutin.com/tutti.git commit 8e74e9e9d5ea53d052ed15de9eef511de2aff58e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 13 12:27:12 2015 +0200 utilisation jaxx 3.0 --- pom.xml | 14 +++++++++++-- tutti-ui-swing/pom.xml | 14 ++++++++++--- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 2 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java | 15 +++++--------- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 18 ++++++++--------- .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 4 ++-- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 4 ++-- .../tutti/ui/swing/content/MainUIHandler.java | 11 ++++++----- .../actions/AbstractChangeScreenAction.java | 6 +++--- .../ui/swing/content/actions/ShowAboutAction.java | 6 +++--- .../category/EditSampleCategoryModelUI.jaxx | 2 +- .../category/EditSampleCategoryModelUIHandler.java | 4 ++-- .../actions/AddSampleCategoryRowAction.java | 6 +++--- .../swing/content/config/TuttiConfigUIHandler.java | 18 ++++++++--------- .../ui/swing/content/cruise/EditCruiseUI.jaxx | 11 ++++++----- .../swing/content/cruise/EditCruiseUIHandler.java | 13 ++++++------ .../content/cruise/GearCaracteristicsEditorUI.jaxx | 2 +- .../cruise/GearCaracteristicsEditorUIHandler.java | 4 ++-- .../actions/GearCaracteristicAddRowAction.java | 2 +- .../actions/GearCaracteristicRemoveRowAction.java | 2 +- .../ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../genericformat/GenericFormatExportUI.jaxx | 6 +++--- .../GenericFormatExportUIHandler.java | 2 +- .../genericformat/GenericFormatImportUI.jaxx | 8 ++++---- .../GenericFormatImportUIHandler.java | 2 +- .../actions/GenericFormatImportAction.java | 6 +++--- .../actions/GenericFormatValidateAction.java | 8 ++++---- .../ui/swing/content/home/SelectCruiseUI.jaxx | 4 ++-- .../swing/content/home/SelectCruiseUIHandler.java | 4 ++-- .../content/home/actions/CloneProtocolAction.java | 2 +- .../content/home/actions/EditProtocolAction.java | 2 +- .../content/home/actions/ImportProtocolAction.java | 8 ++++---- .../content/operation/EditFishingOperationUI.jaxx | 14 ++++++------- .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 4 ++-- .../content/operation/FishingOperationsUI.jaxx | 2 +- .../operation/FishingOperationsUIHandler.java | 2 +- .../operation/catches/EditCatchesSvgHandler.java | 6 +++--- .../content/operation/catches/EditCatchesUI.jaxx | 4 ++-- .../operation/catches/EditCatchesUIHandler.java | 4 ++-- .../operation/catches/SampleCategoryComponent.java | 2 +- .../catches/SpeciesAbleBatchRowHelper.java | 6 +++--- .../catches/accidental/AccidentalBatchUI.jaxx | 2 +- .../accidental/AccidentalBatchUIHandler.java | 2 +- .../accidental/create/CreateAccidentalBatchUI.jaxx | 4 ++-- .../create/CreateAccidentalBatchUIHandler.java | 2 +- .../operation/catches/benthos/BenthosBatchUI.jaxx | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 8 ++++---- .../ChangeBenthosBatchSampleCategoryAction.java | 11 ++++++----- .../benthos/actions/CreateBenthosMelagAction.java | 6 +++--- .../OpenAddBenthosBatchSampleCategoryUIAction.java | 6 +++--- .../OpenEditBenthosBatchFrequencyUIAction.java | 5 ++--- .../actions/OpenSplitBenthosBatchUIAction.java | 4 ++-- .../benthos/actions/RemoveBenthosBatchAction.java | 4 ++-- .../actions/RemoveBenthosSubBatchAction.java | 4 ++-- .../benthos/actions/RenameBenthosBatchAction.java | 6 +++--- .../benthos/create/CreateBenthosBatchUI.jaxx | 6 +++--- .../create/CreateBenthosBatchUIHandler.java | 2 +- .../frequency/BenthosFrequencyCellComponent.java | 6 +++--- .../BenthosFrequencyLogCellComponent.java | 4 ++-- .../benthos/frequency/BenthosFrequencyUI.jaxx | 8 ++++---- .../frequency/BenthosFrequencyUIHandler.java | 4 ++-- ...thosFrequencyLengthStepCaracteristicAction.java | 6 +++--- .../actions/CancelEditBenthosFrequencyAction.java | 7 ++++--- .../DeleteBenthosFrequencyLogRowAction.java | 4 ++-- .../GenerateBenthosFrequencyLengthStepsAction.java | 9 +++++---- .../actions/ResetBenthosFrequencyAction.java | 7 ++++--- .../SaveAndCloseBenthosFrequencyAction.java | 7 ++++--- .../SaveAndContinueBenthosFrequencyAction.java | 7 ++++--- .../frequency/actions/SaveSupportAction.java | 2 +- .../catches/benthos/split/SplitBenthosBatchUI.jaxx | 6 +++--- .../benthos/split/SplitBenthosBatchUIHandler.java | 2 +- .../IndividualObservationBatchUI.jaxx | 2 +- .../IndividualObservationBatchUIHandler.java | 2 +- .../create/CreateIndividualObservationBatchUI.jaxx | 4 ++-- .../CreateIndividualObservationBatchUIHandler.java | 10 +++++----- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 2 +- .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../create/CreateMarineLitterBatchUI.jaxx | 4 ++-- .../create/CreateMarineLitterBatchUIHandler.java | 2 +- .../catches/species/ImportPupitriPopupUI.jaxx | 2 +- .../species/ImportPupitriPopupUIHandler.java | 6 +++--- .../operation/catches/species/SpeciesBatchUI.jaxx | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 9 ++++----- .../ChangeSpeciesBatchSampleCategoryAction.java | 13 ++++++------ .../species/actions/CreateSpeciesMelagAction.java | 8 ++++---- .../OpenAddSpeciesBatchSampleCategoryUIAction.java | 6 +++--- .../OpenEditSpeciesBatchFrequencyUIAction.java | 5 ++--- .../actions/OpenSplitSpeciesBatchUIAction.java | 4 ++-- .../species/actions/RemoveSpeciesBatchAction.java | 6 +++--- .../actions/RemoveSpeciesSubBatchAction.java | 6 +++--- .../species/actions/RenameSpeciesBatchAction.java | 8 ++++---- .../species/create/CreateSpeciesBatchUI.jaxx | 6 +++--- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../frequency/SpeciesFrequencyCellComponent.java | 6 +++--- .../SpeciesFrequencyLogCellComponent.java | 4 ++-- .../species/frequency/SpeciesFrequencyUI.jaxx | 8 ++++---- .../frequency/SpeciesFrequencyUIHandler.java | 4 ++-- ...ciesFrequencyLengthStepCaracteristicAction.java | 6 +++--- .../actions/CancelEditSpeciesFrequencyAction.java | 7 ++++--- .../DeleteSpeciesFrequencyLogRowAction.java | 4 ++-- .../GenerateSpeciesFrequencyLengthStepsAction.java | 9 +++++---- .../actions/ResetSpeciesFrequencyAction.java | 7 ++++--- .../SaveAndCloseSpeciesFrequencyAction.java | 7 ++++--- .../SaveAndContinueSpeciesFrequencyAction.java | 7 ++++--- .../frequency/actions/SaveSupportAction.java | 2 +- .../catches/species/split/SplitSpeciesBatchUI.jaxx | 6 +++--- .../species/split/SplitSpeciesBatchUIHandler.java | 2 +- .../fishing/AbstractCaracteristicTabUIHandler.java | 4 ++-- .../operation/fishing/GearUseFeatureTabUI.jaxx | 2 +- .../fishing/GearUseFeatureTabUIHandler.java | 9 +-------- .../operation/fishing/VesselUseFeatureTabUI.jaxx | 2 +- .../fishing/VesselUseFeatureTabUIHandler.java | 9 +-------- .../ui/swing/content/program/EditProgramUI.jaxx | 6 +++--- .../content/program/EditProgramUIHandler.java | 6 +++--- .../ui/swing/content/protocol/EditProtocolUI.jaxx | 8 ++++---- .../content/protocol/EditProtocolUIHandler.java | 23 +++++++++++----------- .../protocol/actions/AddBenthosProtocolAction.java | 8 ++++---- .../actions/AddCaracteristicMappingAction.java | 8 ++++---- .../protocol/actions/AddSpeciesProtocolAction.java | 8 ++++---- .../actions/RemoveBenthosProtocolAction.java | 6 +++--- .../actions/RemoveCaracteristicMappingAction.java | 6 +++--- .../actions/RemoveSpeciesProtocolAction.java | 6 +++--- .../referential/ManageTemporaryReferentialUI.css | 2 +- .../ManageTemporaryReferentialUIHandler.java | 2 +- .../AbstractOpenReplaceTemporaryUIAction.java | 11 ++++++----- .../actions/OpenReplaceTemporaryGearUIAction.java | 2 +- .../OpenReplaceTemporaryPersonUIAction.java | 2 +- .../OpenReplaceTemporarySpeciesUIAction.java | 2 +- .../OpenReplaceTemporaryVesselUIAction.java | 2 +- .../replace/AbstractReplaceTemporaryUI.jaxx | 4 ++-- .../replace/ReplaceTemporaryGearUI.jaxx | 2 +- .../replace/ReplaceTemporaryGearUIHandler.java | 2 +- .../replace/ReplaceTemporaryPersonUI.jaxx | 2 +- .../replace/ReplaceTemporaryPersonUIHandler.java | 2 +- .../replace/ReplaceTemporarySpeciesUI.jaxx | 2 +- .../replace/ReplaceTemporarySpeciesUIHandler.java | 2 +- .../replace/ReplaceTemporaryVesselUI.jaxx | 2 +- .../replace/ReplaceTemporaryVesselUIHandler.java | 2 +- .../tutti/ui/swing/content/report/ReportUI.jaxx | 6 +++--- .../ui/swing/content/report/ReportUIHandler.java | 2 +- .../swing/content/validation/ValidateCruiseUI.jaxx | 2 ++ .../validation/ValidateCruiseUIHandler.java | 12 +++++------ .../content/validation/tree/CruiseTreeNode.java | 4 ++-- .../content/validation/tree/MessageTreeNode.java | 2 +- .../content/validation/tree/OperationTreeNode.java | 4 ++-- .../ui/swing/util/AbstractTuttiUIHandler.java | 6 +++--- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 10 +++++----- .../ui/swing/util/actions/SimpleActionSupport.java | 2 +- .../util/attachment/AttachmentCellRenderer.java | 4 ++-- .../swing/util/attachment/AttachmentEditorUI.jaxx | 2 +- .../util/attachment/AttachmentEditorUIHandler.java | 6 +++--- .../ui/swing/util/attachment/AttachmentItem.jaxx | 4 ++-- .../util/attachment/AttachmentItemHandler.java | 2 +- .../ui/swing/util/attachment/ButtonAttachment.java | 4 ++-- .../attachment/actions/HideAttachmentUIAction.java | 4 ++-- .../tutti/ui/swing/util/auth/LoginUIHandler.java | 6 +++--- .../CaracteristicMapCellComponent.java | 4 ++-- .../caracteristics/CaracteristicMapEditorUI.jaxx | 2 +- .../CaracteristicMapEditorUIHandler.java | 4 ++-- .../caracteristics/CaracteristicValueEditor.java | 12 +++++------ .../caracteristics/CaracteristicValueRenderer.java | 2 +- .../actions/CaracteristicEditorAddRowAction.java | 2 +- .../CaracteristicEditorRemoveRowAction.java | 2 +- .../swing/util/catches/EnterWeightUIHandler.java | 10 +++++----- .../tutti/ui/swing/util/comment/ButtonComment.java | 4 ++-- .../ui/swing/util/comment/CommentCellRenderer.java | 4 ++-- .../swing/util/comment/CommentEditorUIHandler.java | 10 +++++----- .../computable/ComputableDataEditorHandler.java | 4 ++-- .../util/computable/ComputableDataTableCell.java | 8 ++++---- .../swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- .../util/species/EnterMelagWeightUIHandler.java | 10 +++++----- .../ui/swing/util/species/SelectSpeciesUI.jaxx | 2 +- .../swing/util/species/SelectSpeciesUIHandler.java | 2 +- .../util/table/AbstractTuttiTableUIHandler.java | 6 +++--- 177 files changed, 473 insertions(+), 458 deletions(-) diff --git a/pom.xml b/pom.xml index b8bb9df..bb0ca22 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <eugenePluginVersion>2.14</eugenePluginVersion> - <jaxxVersion>2.23.1</jaxxVersion> + <jaxxVersion>3.0-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.9</slf4jVersion> <adagioSharedVersion>3.8.3</adagioSharedVersion> @@ -340,6 +340,16 @@ <!-- JAXX --> <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime-api</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-swing-extra</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> </dependency> @@ -355,7 +365,7 @@ </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> + <artifactId>jaxx-widgets-config</artifactId> <version>${jaxxVersion}</version> </dependency> <dependency> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 22e47cd..47a79b8 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -41,7 +41,7 @@ <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> <jaxx.defaultErrorUIFQN> - jaxx.runtime.validator.swing.ui.ImageValidationUI + org.nuiton.jaxx.validator.swing.ui.ImageValidationUI </jaxx.defaultErrorUIFQN> <!--<jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>--> <jaxx.generateHelp>true</jaxx.generateHelp> @@ -197,11 +197,15 @@ <!-- JAXX --> <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> + <artifactId>jaxx-runtime-api</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-swing-extra</artifactId> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-config</artifactId> + <artifactId>jaxx-runtime</artifactId> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -213,6 +217,10 @@ </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-config</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> </dependency> <dependency> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java index cabf77b..acb2344 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java @@ -29,7 +29,7 @@ import fr.ifremer.tutti.ui.swing.update.actions.UpdateReportAction; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiExceptionHandler; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java index bc3d16a..a1c5a85 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing; import fr.ifremer.tutti.ui.swing.content.actions.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.api.JAXXObject; import org.apache.commons.lang3.reflect.ConstructorUtils; import org.nuiton.jaxx.application.ApplicationTechnicalException; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java index d05e485..bc01453 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java @@ -23,21 +23,16 @@ package fr.ifremer.tutti.ui.swing; */ import com.google.common.base.Preconditions; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.awt.visitor.BuildTreeVisitor; -import jaxx.runtime.awt.visitor.ComponentTreeNode; -import jaxx.runtime.awt.visitor.GetCompopentAtPointVisitor; -import jaxx.runtime.swing.help.JAXXHelpBroker; -import jaxx.runtime.swing.help.JAXXHelpUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.JAXXObject; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.help.JAXXHelpBroker; +import org.nuiton.jaxx.runtime.api.swing.help.JAXXHelpUI; import javax.swing.AbstractButton; import java.awt.Component; -import java.awt.Point; import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; /** * Help broker. @@ -91,7 +86,7 @@ public class TuttiHelpBroker extends JAXXHelpBroker { if (comp == null) { comp = TuttiUIContext.getApplicationContext().getMainUI(); } - JAXXHelpUI parentContainer = SwingUtil.getParent(comp, JAXXHelpUI.class); + JAXXHelpUI parentContainer = JAXXRuntime.getParent(comp, JAXXHelpUI.class); String result; if (parentContainer != null && this != parentContainer.getBroker()) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index 3d18c40..c096170 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -61,15 +61,15 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.UIMessageNotifier; import fr.ifremer.tutti.ui.swing.util.auth.AuthenticationInfo; import fr.ifremer.tutti.ui.swing.util.auth.LoginUI; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.swing.editor.bean.BeanDoubleList; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.swing.help.JAXXHelpBroker; -import jaxx.runtime.swing.help.JAXXHelpUIHandler; -import jaxx.runtime.swing.session.BeanDoubleListState; -import jaxx.runtime.swing.session.BeanFilterableComboBoxState; -import jaxx.runtime.swing.session.State; -import jaxx.runtime.swing.session.SwingSession; +import org.nuiton.jaxx.runtime.api.context.JAXXContext; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.api.swing.help.JAXXHelpBroker; +import org.nuiton.jaxx.runtime.api.swing.help.JAXXHelpUIHandler; +import org.nuiton.jaxx.runtime.swing.session.BeanDoubleListState; +import org.nuiton.jaxx.runtime.swing.session.BeanFilterableComboBoxState; +import org.nuiton.jaxx.swing.extra.session.State; +import org.nuiton.jaxx.swing.extra.session.SwingSession; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css index c57300b..4f65f27 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css @@ -33,7 +33,7 @@ JMenu { #mainFrame { title: "tutti.main.title.applicationName"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; - iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; + iconImage:{Icons.createImageIcon("allegro_32.png").getImage()}; } #menuFile { @@ -309,7 +309,7 @@ JMenu { #ichtyometerStatus { actionIcon: "bluetooth-up"; - disabledIcon: {jaxx.runtime.SwingUtil.createActionIcon("bluetooth-down")}; + disabledIcon: {org.nuiton.jaxx.runtime.api.swing.Icons.createActionIcon("bluetooth-down")}; enabled: {model.isIchtyometerConnected()}; toolTipText: {handler.getIchtyometerStatusTip(model.isIchtyometerConnected())}; _help: {"tutti.main.status.ichtyometer.help"}; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx index 275ecd6..a74127a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.jaxx @@ -30,8 +30,8 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.BlockingLayerUI - jaxx.runtime.validator.swing.SwingValidatorMessageWidget + org.nuiton.jaxx.swing.extra.layer.BlockingLayerUI + org.nuiton.jaxx.validator.swing.SwingValidatorMessageWidget org.jdesktop.swingx.JXTitledPanel diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java index be514ff..6988946 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java @@ -51,13 +51,14 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import jaxx.runtime.JAXXBinding; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import org.nuiton.jaxx.application.swing.util.CloseableUI; +import org.nuiton.jaxx.runtime.api.internal.binding.JAXXBinding; +import org.nuiton.jaxx.runtime.api.internal.binding.JAXXBindings; +import org.nuiton.jaxx.runtime.api.swing.JLayers; import javax.swing.Icon; import javax.swing.JButton; @@ -185,7 +186,7 @@ public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI initUI(ui); // installation layer de blocage en mode busy - SwingUtil.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI()); + JLayers.setLayerUI(ui.getBody(), ui.getBusyBlockLayerUI()); //FIXME-TC See why this binding is not setted ? ui.applyDataBinding(MainUI.BINDING_MENU_CHANGE_LOCALE_FR_ENABLED); @@ -237,7 +238,7 @@ public class MainUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, MainUI JAXXBinding[] bindings = ui.getDataBindings(); for (JAXXBinding binding : bindings) { - SwingUtil.removeDataBinding(ui, binding.getId()); + JAXXBindings.removeDataBinding(ui, binding.getId()); } ui.setVisible(false); ui.dispose(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java index 2b63618..2e76f34 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/AbstractChangeScreenAction.java @@ -26,8 +26,8 @@ import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.api.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.api.context.JAXXContexts; import static org.nuiton.i18n.I18n.t; @@ -49,7 +49,7 @@ public abstract class AbstractChangeScreenAction extends AbstractMainUITuttiActi * @since 1.1 */ protected static final JAXXContextEntryDef<TuttiScreen> PREVIOUS_SCREEN = - SwingUtil.newContextEntryDef("previousScreen", TuttiScreen.class); + JAXXContexts.newContextEntryDef("previousScreen", TuttiScreen.class); /** * Screen where to go. diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowAboutAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowAboutAction.java index f20ae7d..3a4f946 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowAboutAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowAboutAction.java @@ -27,16 +27,16 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import fr.ifremer.tutti.ui.swing.update.actions.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.content.db.actions.UpdateDbAction; +import fr.ifremer.tutti.ui.swing.update.actions.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.update.actions.UpdateReportAction; import fr.ifremer.tutti.ui.swing.updater.UpdateModule; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import jaxx.runtime.swing.AboutPanel; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.swing.AboutPanel; import org.nuiton.updater.ApplicationInfo; import org.nuiton.updater.ApplicationUpdater; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx index 5a2de42..244837f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.jaxx @@ -31,7 +31,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java index e0fd9ff..8e448a4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java @@ -29,7 +29,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModels; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -93,7 +93,7 @@ public class EditSampleCategoryModelUIHandler extends AbstractTuttiTableUIHandle // // int rowIndex = getTable().getRowCount() - 1; // -// SwingUtil.editCell(getTable(), rowIndex, 1); +// JTables.editCell(getTable(), rowIndex, 1); // } // }); // } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java index 4251478..f554c86 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java @@ -30,8 +30,8 @@ import fr.ifremer.tutti.ui.swing.content.category.EditSampleCategoryModelTableMo import fr.ifremer.tutti.ui.swing.content.category.EditSampleCategoryModelUI; import fr.ifremer.tutti.ui.swing.content.category.EditSampleCategoryModelUIModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.SwingUtilities; @@ -78,7 +78,7 @@ public class AddSampleCategoryRowAction extends SimpleActionSupport<EditSampleCa int rowIndex = ui.getTable().getRowCount() - 1; - SwingUtil.editCell(ui.getTable(), rowIndex, 1); + JTables.editCell(ui.getTable(), rowIndex, 1); } }); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index 54eae81..ac7787a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -31,14 +31,14 @@ import fr.ifremer.tutti.ui.swing.content.config.actions.ReloadTuttiAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.editor.TuttiLocationTableCell; import fr.ifremer.tutti.ui.swing.util.editor.VesselTableCell; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.config.ConfigUI; -import jaxx.runtime.swing.config.ConfigUIHelper; -import jaxx.runtime.swing.config.model.MainCallBackFinalizer; -import jaxx.runtime.swing.editor.EnumEditor; -import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.swing.Icons; +import org.nuiton.jaxx.swing.extra.editor.EnumEditor; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.widgets.config.ConfigUI; +import org.nuiton.jaxx.widgets.config.ConfigUIHelper; +import org.nuiton.jaxx.widgets.config.model.MainCallBackFinalizer; import javax.swing.DefaultCellEditor; import javax.swing.DefaultListCellRenderer; @@ -86,7 +86,7 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, helper.registerCallBack( CALLBACK_UI, n("tutti.config.action.reload.ui"), - SwingUtil.createActionIcon("reload-ui"), + Icons.createActionIcon("reload-ui"), new Runnable() { @Override @@ -96,7 +96,7 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, } ).registerCallBack( CALLBACK_APPLICATION, n("tutti.config.action.reload.application"), - SwingUtil.createActionIcon("reload-application"), + Icons.createActionIcon("reload-application"), new Runnable() { @Override @@ -106,7 +106,7 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, } ).registerCallBack( CALLBACK_SHORTCUT, n("tutti.config.action.reload.actions"), - SwingUtil.createActionIcon("reload-shortcut"), + Icons.createActionIcon("reload-shortcut"), new Runnable() { @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx index 422437a..f4f8dd3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx @@ -35,10 +35,11 @@ fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment org.nuiton.jaxx.widgets.number.NumberEditor - jaxx.runtime.swing.editor.SimpleTimeEditor - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.bean.BeanDoubleList - jaxx.runtime.swing.CardLayout2Ext + org.nuiton.jaxx.runtime.swing.editor.SimpleTimeEditor + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList + + org.nuiton.jaxx.swing.extra.layout.CardLayout2Ext org.jdesktop.swingx.JXDatePicker org.jdesktop.swingx.JXTitledPanel @@ -60,7 +61,7 @@ initializer='getContextValue(EditCruiseUIModel.class)'/> <BeanValidator id='validator' bean='model' context='validate' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='program' component='programComboBox'/> <field name='surveyPart' component='surveyPartField'/> <field name='name' component='nameField'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java index 547154f..b76d2be 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java @@ -36,13 +36,14 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.context.JAXXContextEntryDef; -import jaxx.runtime.swing.editor.bean.BeanDoubleListModel; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleListModel; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.util.CloseableUI; +import org.nuiton.jaxx.runtime.api.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.api.context.JAXXContexts; +import org.nuiton.jaxx.runtime.api.internal.binding.JAXXBindings; import javax.swing.JComponent; import javax.swing.JList; @@ -405,7 +406,7 @@ public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIMode registerValidators(validator); //FIXME Binding does not work - JAXXUtil.applyDataBinding(ui, EditCruiseUI.BINDING_RESET_BUTTON_ENABLED); + JAXXBindings.applyDataBinding(ui, EditCruiseUI.BINDING_RESET_BUTTON_ENABLED); } @Override @@ -461,7 +462,7 @@ public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIMode // } public static final JAXXContextEntryDef<GearWithOriginalRankOrder> GEAR_EDIT_CONTEXT = - JAXXUtil.newContextEntryDef("editGear", GearWithOriginalRankOrder.class); + JAXXContexts.newContextEntryDef("editGear", GearWithOriginalRankOrder.class); protected void updateGearActionsAndShowPoup(GearWithOriginalRankOrder gear, JComponent source, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx index bf2391c..944af9d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.jaxx @@ -27,7 +27,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable javax.swing.ListSelectionModel java.awt.Color diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java index 023c517..69c8581 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java @@ -32,8 +32,8 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueRenderer; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicAddRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicAddRowAction.java index 0dc487d..49180f1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicAddRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicAddRowAction.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorTableMod import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorUI; import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorUIModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; /** * Created on 3/7/15. diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicRemoveRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicRemoveRowAction.java index 59e77dc..9561b79 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicRemoveRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/GearCaracteristicRemoveRowAction.java @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorTableMod import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorUI; import fr.ifremer.tutti.ui.swing.content.cruise.GearCaracteristicsEditorUIModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; /** * Created on 3/7/15. diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java index ea1e567..5a433a4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java @@ -27,7 +27,7 @@ import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.update.Updates; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx index 30702f5..7df4dbe 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx @@ -32,12 +32,12 @@ fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel fr.ifremer.tutti.ui.swing.content.genericformat.tree.ExportDataSelectTreeCellRenderer - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox javax.swing.tree.DefaultTreeModel static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -53,7 +53,7 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.genericFormatimport.help"'/> - <BeanValidator id='validator' bean='model' context='edit' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + <BeanValidator id='validator' bean='model' context='edit' uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='program' component='programComboBox'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java index e0c594a..02a2c3f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java @@ -31,7 +31,7 @@ import fr.ifremer.tutti.persistence.model.ProgramDataModel; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.ProgramSelectTreeNode; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.util.CloseableUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx index b282482..c29954d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx @@ -33,12 +33,12 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.FileEditor + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.FileEditor javax.swing.tree.DefaultTreeModel static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -54,7 +54,7 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.genericFormatimport.help"'/> - <BeanValidator id='validator' bean='model' context='edit' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + <BeanValidator id='validator' bean='model' context='edit' uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='program' component='programComboBox'/> <field name='importFile' component='importFile'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java index b5c3545..31d47b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java @@ -32,7 +32,7 @@ import fr.ifremer.tutti.service.genericformat.GenericFormatValidateFileResult; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.DataSelectTreeModel; import fr.ifremer.tutti.ui.swing.content.genericformat.tree.ProgramSelectTreeNode; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.util.CloseableUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatImportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatImportAction.java index f7b8e45..bced68d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatImportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatImportAction.java @@ -33,10 +33,10 @@ import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUIHandler; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUIModel; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.Icon; import javax.swing.JLabel; @@ -218,13 +218,13 @@ public class GenericFormatImportAction extends LongActionSupport<GenericFormatIm String tip; if (result.isValid()) { - icon = SwingUtil.createActionIcon("accept"); + icon = Icons.createActionIcon("accept"); text = t("tutti.genericFormat.import.success"); tip = t("tutti.genericFormat.import.success.tip"); } else { - icon = SwingUtil.createActionIcon("cancel"); + icon = Icons.createActionIcon("cancel"); text = t("tutti.genericFormat.import.error"); tip = t("tutti.genericFormat.import.error.tip"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatValidateAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatValidateAction.java index 3639ba7..5525f3e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatValidateAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatValidateAction.java @@ -28,13 +28,13 @@ import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.service.genericformat.GenericFormatImportConfiguration; import fr.ifremer.tutti.service.genericformat.GenericFormatImportService; import fr.ifremer.tutti.service.genericformat.GenericFormatValidateFileResult; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUI; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUIHandler; import fr.ifremer.tutti.ui.swing.content.genericformat.GenericFormatImportUIModel; -import jaxx.runtime.SwingUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.Icon; import javax.swing.JLabel; @@ -130,13 +130,13 @@ public class GenericFormatValidateAction extends LongActionSupport<GenericFormat String tip; if (result.isValid()) { - icon = SwingUtil.createActionIcon("accept"); + icon = Icons.createActionIcon("accept"); text = t("tutti.genericFormat.validate.success"); tip = t("tutti.genericFormat.validate.success.tip"); } else { - icon = SwingUtil.createActionIcon("cancel"); + icon = Icons.createActionIcon("cancel"); text = t("tutti.genericFormat.validate.error"); tip = t("tutti.genericFormat.validate.error.tip"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx index d621ad6..872a59e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx @@ -32,7 +32,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox java.util.Arrays static org.nuiton.i18n.I18n.t @@ -52,7 +52,7 @@ initializer='getContextValue(SelectCruiseUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='program' component='programCombobox'/> <field name='cruise' component='cruiseCombobox'/> <field name='protocol' component='protocolCombobox'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java index 0ea449d..e70a38f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java @@ -28,8 +28,8 @@ import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CloneProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CloneProtocolAction.java index 353015c..fd68e83 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CloneProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CloneProtocolAction.java @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.content.actions.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.api.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProtocolAction.java index d99ddf1..46fb5ea 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProtocolAction.java @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.TuttiScreen; import fr.ifremer.tutti.ui.swing.content.actions.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.api.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ImportProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ImportProtocolAction.java index 3a165a5..437d505 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ImportProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ImportProtocolAction.java @@ -31,13 +31,13 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; import fr.ifremer.tutti.ui.swing.TuttiScreen; -import fr.ifremer.tutti.ui.swing.content.actions.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; +import fr.ifremer.tutti.ui.swing.content.actions.AbstractChangeScreenAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.context.JAXXContextEntryDef; +import org.nuiton.jaxx.runtime.api.context.JAXXContexts; import javax.swing.JOptionPane; import javax.swing.UIManager; @@ -61,7 +61,7 @@ public class ImportProtocolAction extends AbstractChangeScreenAction { LogFactory.getLog(ImportProtocolAction.class); public static final JAXXContextEntryDef<TuttiProtocol> IMPORT_PROTOCOL_ENTRY = - JAXXUtil.newContextEntryDef("importProtocol", TuttiProtocol.class); + JAXXContexts.newContextEntryDef("importProtocol", TuttiProtocol.class); protected TuttiProtocol protocol; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx index 558f08e..c712704 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx @@ -37,13 +37,13 @@ fr.ifremer.tutti.type.CoordinateEditorType - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.bean.BeanDoubleList + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList org.nuiton.jaxx.widgets.number.NumberEditor - jaxx.runtime.swing.editor.SimpleTimeEditor - jaxx.runtime.swing.editor.gis.DmsCoordinateEditor - jaxx.runtime.swing.editor.gis.DmdCoordinateEditor - jaxx.runtime.swing.CardLayout2Ext + org.nuiton.jaxx.runtime.swing.editor.SimpleTimeEditor + org.nuiton.jaxx.runtime.swing.editor.gis.DmsCoordinateEditor + org.nuiton.jaxx.runtime.swing.editor.gis.DmdCoordinateEditor + org.nuiton.jaxx.swing.extra.layout.CardLayout2Ext org.jdesktop.swingx.JXDatePicker org.jdesktop.swingx.JXTitledPanel @@ -62,7 +62,7 @@ public EditFishingOperationUI(FishingOperationsUI parentUI) { initializer='getContextValue(EditFishingOperationUIModel.class)'/> <BeanValidator id='validator' context='validate' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='stationNumber' component='stationNumberField'/> <field name='fishingOperationNumber' component='fishingOperationNumberField'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java index 9960ed2..88f88c9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java @@ -47,7 +47,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.caracteristics.GearCaracteristicListCellRenderer; import fr.ifremer.tutti.util.DateTimes; import fr.ifremer.tutti.util.Distances; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java index b44df3a..221ba4b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java @@ -38,8 +38,8 @@ import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.util.Distances; -import jaxx.runtime.swing.editor.gis.DmdCoordinate; -import jaxx.runtime.swing.editor.gis.DmsCoordinate; +import org.nuiton.jaxx.runtime.swing.editor.gis.DmdCoordinate; +import org.nuiton.jaxx.runtime.swing.editor.gis.DmsCoordinate; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.application.swing.tab.TabContentModel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx index 372668e..30b073d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.jaxx @@ -32,7 +32,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox java.awt.GridLayout java.awt.Dimension diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java index eee3ec6..c4b64df 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java @@ -33,7 +33,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.actions.EditFishingOp import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.util.CloseableUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java index c99e5c4..ac01ee6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java @@ -39,7 +39,6 @@ import fr.ifremer.tutti.ui.swing.util.catches.EnterWeightUI; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import fr.ifremer.tutti.util.Numbers; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.JAXXUtil; import org.apache.batik.bridge.UpdateManager; import org.apache.batik.dom.svg.SAXSVGDocumentFactory; import org.apache.batik.dom.svg.SVGOMRectElement; @@ -53,6 +52,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; import org.nuiton.util.Resource; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -535,7 +535,7 @@ public class EditCatchesSvgHandler { } value = null; } - valueElement.setTextContent(JAXXUtil.getStringValue(value)); + valueElement.setTextContent(JAXXRuntime.getStringValue(value)); } }); @@ -547,7 +547,7 @@ public class EditCatchesSvgHandler { @Override public void run() { Element labelElement = svgDocument.getElementById(property + "Value"); - labelElement.setTextContent(JAXXUtil.getStringValue(value)); + labelElement.setTextContent(JAXXRuntime.getStringValue(value)); } }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx index b46615b..dd8c366 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx @@ -50,7 +50,7 @@ org.jdesktop.swingx.JXTitledPanel - jaxx.runtime.swing.CardLayout2Ext + org.nuiton.jaxx.swing.extra.layout.CardLayout2Ext static org.nuiton.i18n.I18n.t ]]></import> @@ -66,7 +66,7 @@ public EditCatchesUI(FishingOperationsUI parentUI) { initializer='getContextValue(EditCatchesUIModel.class)'/> <BeanValidator id='validator' context='validate' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <!--FIXME Must find a way to validate, if no field, then no validation... --> <!--FIXME Must find a way to show validation results on svg canvas... --> <!--<field name='catchTotalWeight' component='catchTotalWeightField'/>--> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index a675d4d..518bf14 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -34,8 +34,8 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.swing.CardLayout2Ext; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.swing.extra.layout.CardLayout2Ext; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTitledPanel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java index bc138af..ca65448 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java @@ -322,7 +322,7 @@ public class SampleCategoryComponent { Float computedNumber = sampleCategory.getComputedWeight(); if (number != null) { -// text += JAXXUtil.getStringValue(number); +// text += JAXXRuntime.getStringValue(number); text += weightUnit.renderWeight(number); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java index fc641e8..d6fba41 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java @@ -29,7 +29,6 @@ import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatchFrequency; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiDecorator; -import jaxx.runtime.SwingUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,6 +36,7 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.decorator.DecoratorUtil; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.ButtonGroup; import javax.swing.JLabel; @@ -308,7 +308,7 @@ public class SpeciesAbleBatchRowHelper { // keep selected rows List<R> rowsToReSelect = Lists.newArrayList(); - for (int rowIndex : SwingUtil.getSelectedModelRows(table)) { + for (int rowIndex : JTables.getSelectedModelRows(table)) { R row = tableModel.getEntry(rowIndex); rowsToReSelect.add(row); } @@ -319,7 +319,7 @@ public class SpeciesAbleBatchRowHelper { // reselect rows for (R row : rowsToReSelect) { int modelRowIndex = tableModel.getRowIndex(row); - SwingUtil.addRowSelectionInterval(table, modelRowIndex); + JTables.addRowSelectionInterval(table, modelRowIndex); } } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx index 3c0df43..4817b0d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx @@ -50,7 +50,7 @@ public AccidentalBatchUI(TuttiUI<?,?> parentUI) { initializer='getContextValue(AccidentalBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> </BeanValidator> <TuttiHelpBroker id='broker' diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java index c8e8d60..6ef2647 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java @@ -49,7 +49,7 @@ import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapColumnUIHan import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx index ba3f0a0..d9c6c5e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.jaxx @@ -33,7 +33,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t @@ -50,7 +50,7 @@ public CreateAccidentalBatchUI(EditCatchesUI parentUI) { initializer='getContextValue(CreateAccidentalBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='species' component='accidentalSpeciesComboBox'/> <field name='gender' diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java index 09b1360..768bee5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx index 61150fa..eebd14c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx @@ -53,7 +53,7 @@ public BenthosBatchUI(TuttiUI<?,?> parentUI) { initializer='getContextValue(BenthosBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='benthosTotalSortedWeight' component='benthosTotalSortedWeightField'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index 96ba18a..5f0d9b0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -63,8 +63,7 @@ import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; @@ -78,6 +77,7 @@ import org.jdesktop.swingx.table.TableColumnExt; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.swing.extra.JTables; import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; @@ -965,7 +965,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent JXTable table = getTable(); // get selected row - int insertRow = SwingUtil.getSelectedModelRow(table); + int insertRow = JTables.getSelectedModelRow(table); BenthosBatchTableModel tableModel = getTableModel(); BenthosBatchRowModel parentBatch = tableModel.getEntry(insertRow); @@ -1068,7 +1068,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent model.setLeafNumber(model.getLeafNumber() + newBatches.size() - 1); // update columns for the parent shell - tableModel.updateShell(shell, SwingUtil.getSelectedModelColumn(getTable())); + tableModel.updateShell(shell, JTables.getSelectedModelColumn(getTable())); } public void updateTotalFromFrequencies(BenthosBatchRowModel row) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java index d43f6ec..ed2a77a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ChangeBenthosBatchSampleCategoryAction.java @@ -39,10 +39,11 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchU import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.swing.extra.JComboBoxes; +import org.nuiton.jaxx.swing.extra.JTables; +import org.nuiton.jaxx.swing.extra.list.renderer.DecoratorListCellRenderer; import org.nuiton.jaxx.widgets.number.NumberEditor; import javax.swing.JComboBox; @@ -79,10 +80,10 @@ public class ChangeBenthosBatchSampleCategoryAction extends SimpleActionSupport< BenthosBatchTableModel tableModel = handler.getTableModel(); // get selected row - int rowIndex = SwingUtil.getSelectedModelRow(ui.getTable()); + int rowIndex = JTables.getSelectedModelRow(ui.getTable()); // get selected column - int columnIndex = SwingUtil.getSelectedModelColumn(ui.getTable()); + int columnIndex = JTables.getSelectedModelColumn(ui.getTable()); // get selected row BenthosBatchRowModel selectedRow = tableModel.getEntry(rowIndex); @@ -161,7 +162,7 @@ public class ChangeBenthosBatchSampleCategoryAction extends SimpleActionSupport< JComboBox editor = new JComboBox(); editor.setRenderer(new DecoratorListCellRenderer(handler.getDecorator(CaracteristicQualitativeValue.class, null))); - SwingUtil.fillComboBox(editor, availableValues, availableValues.get(0)); + JComboBoxes.fillComboBox(editor, availableValues, availableValues.get(0)); int response = JOptionPane.showConfirmDialog( handler.getTopestUI(), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java index 83eb1eb..5e33806 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java @@ -33,8 +33,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchU import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightUI; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JOptionPane; import java.util.Map; @@ -90,7 +90,7 @@ public class CreateBenthosMelagAction extends LongActionSupport<BenthosBatchUIMo boolean result = super.prepareAction(); - int[] selectedRowIndexes = SwingUtil.getSelectedModelRows(handler.getTable()); + int[] selectedRowIndexes = JTables.getSelectedModelRows(handler.getTable()); BenthosBatchTableModel tableModel = handler.getTableModel(); @@ -139,7 +139,7 @@ public class CreateBenthosMelagAction extends LongActionSupport<BenthosBatchUIMo t("tutti.createBenthosMelag.error.title"), JOptionPane.ERROR_MESSAGE); - SwingUtil.setSelectionInterval(handler.getTable(), selectedRowIndex); + JTables.setSelectionInterval(handler.getTable(), selectedRowIndex); result = false; // pas besoin de continuer a inspecter les autres lots break; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java index 655f9cc..9ce365d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenAddBenthosBatchSampleCategoryUIAction.java @@ -32,9 +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.split.SplitBenthosBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.swing.extra.JTables; import static org.nuiton.i18n.I18n.t; @@ -62,11 +62,11 @@ public class OpenAddBenthosBatchSampleCategoryUIAction extends SimpleActionSuppo BenthosBatchTableModel tableModel = ui.getHandler().getTableModel(); // get selected row - int rowIndex = SwingUtil.getSelectedModelRow(ui.getTable()); + int rowIndex = JTables.getSelectedModelRow(ui.getTable()); Preconditions.checkState(rowIndex != -1, "Cant split batch if no batch selected"); // get selected column - int columnIndex = SwingUtil.getSelectedModelColumn(ui.getTable()); + int columnIndex = JTables.getSelectedModelColumn(ui.getTable()); Preconditions.checkState(columnIndex != -1, "Cant split batch if no batch selected"); // get selected row diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java index d5acb9d..ed1d6b6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java @@ -28,12 +28,11 @@ 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.frequency.BenthosFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JTables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.TableColumnModelExt; +import org.nuiton.jaxx.swing.extra.JTables; /** * Created on 3/7/15. @@ -57,7 +56,7 @@ public class OpenEditBenthosBatchFrequencyUIAction extends SimpleActionSupport<B JXTable table = ui.getTable(); - int rowIndex = SwingUtil.getSelectedModelRow(table); + int rowIndex = JTables.getSelectedModelRow(table); TableColumnModelExt columnModel = (TableColumnModelExt) table.getColumnModel(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java index c607127..de422dc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenSplitBenthosBatchUIAction.java @@ -33,10 +33,10 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchU import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JOptionPane; @@ -65,7 +65,7 @@ public class OpenSplitBenthosBatchUIAction extends SimpleActionSupport<BenthosBa JXTable table = ui.getTable(); // get selected row - int rowIndex = SwingUtil.getSelectedModelRow(table); + int rowIndex = JTables.getSelectedModelRow(table); Preconditions.checkState(rowIndex != -1, "Cant split batch if no batch selected"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java index e58f5fd..708cf39 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java @@ -33,8 +33,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchU import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import jaxx.runtime.SwingUtil; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JOptionPane; import java.util.Set; @@ -92,7 +92,7 @@ public class RemoveBenthosBatchAction extends LongActionSupport<BenthosBatchUIMo JXTable table = handler.getTable(); - rowIndex = SwingUtil.getSelectedModelRow(table); + rowIndex = JTables.getSelectedModelRow(table); Preconditions.checkState(rowIndex != -1, "Cant remove batch if no batch selected"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java index 66b8f32..c6e2ae8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java @@ -32,8 +32,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchU import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import jaxx.runtime.SwingUtil; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JOptionPane; import java.util.Set; @@ -98,7 +98,7 @@ public class RemoveBenthosSubBatchAction extends LongActionSupport<BenthosBatchU JXTable table = handler.getTable(); - rowIndex = SwingUtil.getSelectedModelRow(table); + rowIndex = JTables.getSelectedModelRow(table); Preconditions.checkState(rowIndex != -1, "Cant remove sub batch if no batch selected"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java index 2d82743..821eb8a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java @@ -33,8 +33,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchU 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.actions.LongActionSupport; -import jaxx.runtime.SwingUtil; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.swing.extra.JTables; import java.io.Serializable; import java.util.Collection; @@ -63,7 +63,7 @@ public class RenameBenthosBatchAction extends LongActionSupport<BenthosBatchUIMo BenthosBatchTableModel tableModel = handler.getTableModel(); JXTable table = handler.getTable(); - int selectedRowIndex = SwingUtil.getSelectedModelRow(table); + int selectedRowIndex = JTables.getSelectedModelRow(table); BenthosBatchRowModel row = tableModel.getEntry(selectedRowIndex); BenthosBatchUIModel model = handler.getModel(); @@ -92,7 +92,7 @@ public class RenameBenthosBatchAction extends LongActionSupport<BenthosBatchUIMo BenthosBatchTableModel tableModel = handler.getTableModel(); JXTable table = handler.getTable(); - int selectedRowIndex = SwingUtil.getSelectedModelRow(table); + int selectedRowIndex = JTables.getSelectedModelRow(table); BenthosBatchRowModel row = tableModel.getEntry(selectedRowIndex); PersistenceService persistenceService = getContext().getPersistenceService(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx index 9ff2abf..a613269 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx @@ -33,14 +33,14 @@ org.jdesktop.swingx.JXTable - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.nuiton.jaxx.widgets.number.NumberEditor java.awt.Color javax.swing.ListSelectionModel static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -54,7 +54,7 @@ public CreateBenthosBatchUI(EditCatchesUI parentUI) { initializer='getContextValue(CreateBenthosBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='species' component='speciesComboBox'/> <field name='sampleCategory' component='sampleCategoryComboBox'/> <field name='batchWeight' component='batchWeightField'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java index bd099e8..d7f4290 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java @@ -41,7 +41,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBe import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java index dad0276..316c148 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java @@ -29,11 +29,11 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchR import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JTables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.runtime.api.swing.Icons; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.AbstractCellEditor; import javax.swing.JTable; @@ -73,7 +73,7 @@ public class BenthosFrequencyCellComponent extends DefaultTableCellRenderer { public BenthosFrequencyCellComponent(Color computedDataColor) { setHorizontalAlignment(CENTER); - setIcon(SwingUtil.createActionIcon("show-frequency")); + setIcon(Icons.createActionIcon("show-frequency")); this.computedDataColor = computedDataColor; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogCellComponent.java index 9e227d4..35a607d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogCellComponent.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency; */ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.actions.DeleteBenthosFrequencyLogRowAction; -import jaxx.runtime.swing.JAXXWidgetUtil; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractCellEditor; import javax.swing.JButton; @@ -60,7 +60,7 @@ public class BenthosFrequencyLogCellComponent extends JPanel implements Serializ add(label, BorderLayout.CENTER); JButton deleteButton = new JButton(); - deleteButton.setIcon(JAXXWidgetUtil.createActionIcon("delete")); + deleteButton.setIcon(Icons.createActionIcon("delete")); deleteButton.setBorderPainted(false); deleteButton.setBorder(null); deleteButton.setBackground(null); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx index 2f81bba..4992080 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx @@ -37,8 +37,8 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor - jaxx.runtime.swing.CardLayout2Ext - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.swing.extra.layout.CardLayout2Ext + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable @@ -49,7 +49,7 @@ java.awt.Color static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -61,7 +61,7 @@ public BenthosFrequencyUI(TuttiUI parentUI) { <BenthosFrequencyUIModel id='model' initializer='getContextValue(BenthosFrequencyUIModel.class)'/> - <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + <BeanValidator id='validator' bean='model' uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='lengthStepCaracteristic' component='lengthStepCaracteristicComboBox'/> <field name='step' component='stepField'/> <field name='rows' component='tableScrollPane'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java index 63f95f0..bca8c2c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java @@ -40,8 +40,8 @@ import fr.ifremer.tutti.ui.swing.util.TuttiNumberTickUnitSource; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java index 663ccc2..71dd63f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java @@ -27,8 +27,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.ac import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; import javax.swing.AbstractAction; import javax.swing.JOptionPane; @@ -54,7 +54,7 @@ public class AddBenthosFrequencyLengthStepCaracteristicAction extends AbstractAc putValue(NAME, t("tutti.editBenthosFrequencies.action.addLengthStepCaracteristic")); putValue(SHORT_DESCRIPTION, t("tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.mnemonic"), 'Z')); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editBenthosFrequencies.action.addLengthStepCaracteristic.mnemonic"), 'Z')); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java index 4f182fe..5b4c794 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/CancelEditBenthosFrequencyAction.java @@ -25,9 +25,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.ac */ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -54,8 +55,8 @@ public class CancelEditBenthosFrequencyAction extends AbstractAction { putValue(NAME, t("tutti.editBenthosFrequencies.action.cancel")); putValue(SHORT_DESCRIPTION, t("tutti.editBenthosFrequencies.action.cancel.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editBenthosFrequencies.action.cancel.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("cancel")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editBenthosFrequencies.action.cancel.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("cancel")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java index ff30ecb..5d4e2c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.Ben import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUIHandler; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractAction; import javax.swing.JOptionPane; @@ -56,7 +56,7 @@ public class DeleteBenthosFrequencyLogRowAction extends AbstractAction { this.ui = ui; this.component = component; - putValue(SMALL_ICON, SwingUtil.createActionIcon("delete")); + putValue(SMALL_ICON, Icons.createActionIcon("delete")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java index d2caa75..da6c524 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/GenerateBenthosFrequencyLengthStepsAction.java @@ -32,8 +32,9 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.Ben import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUIModel; import fr.ifremer.tutti.util.Numbers; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JTables; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -61,8 +62,8 @@ public class GenerateBenthosFrequencyLengthStepsAction extends AbstractAction { putValue(NAME, t("tutti.editBenthosFrequencies.action.generate")); putValue(SHORT_DESCRIPTION, t("tutti.editBenthosFrequencies.action.generate.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editBenthosFrequencies.action.generate.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("generate")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editBenthosFrequencies.action.generate.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("generate")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java index 4427d02..0fff3ed 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/ResetBenthosFrequencyAction.java @@ -27,7 +27,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.ac import com.google.common.collect.Lists; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -52,8 +53,8 @@ public class ResetBenthosFrequencyAction extends AbstractAction { putValue(NAME, t("tutti.editBenthosFrequencies.action.reset")); putValue(SHORT_DESCRIPTION, t("tutti.editBenthosFrequencies.action.reset.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editBenthosFrequencies.action.reset.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("reset")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editBenthosFrequencies.action.reset.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("reset")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java index dcfd9d5..5004ba0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndCloseBenthosFrequencyAction.java @@ -26,9 +26,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.ac import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUIHandler; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; import java.awt.event.ActionEvent; @@ -52,8 +53,8 @@ public class SaveAndCloseBenthosFrequencyAction extends SaveSupportAction { putValue(NAME, t("tutti.editBenthosFrequencies.action.saveAndClose")); putValue(SHORT_DESCRIPTION, t("tutti.editBenthosFrequencies.action.saveAndClose.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editBenthosFrequencies.action.saveAndClose.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("save")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editBenthosFrequencies.action.saveAndClose.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("save")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java index 32c58b2..6fcbf59 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveAndContinueBenthosFrequencyAction.java @@ -25,9 +25,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.ac */ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; import java.awt.event.ActionEvent; @@ -51,8 +52,8 @@ public class SaveAndContinueBenthosFrequencyAction extends SaveSupportAction { putValue(NAME, t("tutti.editBenthosFrequencies.action.saveAndContinue")); putValue(SHORT_DESCRIPTION, t("tutti.editBenthosFrequencies.action.saveAndContinue.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editBenthosFrequencies.action.saveAndContinue.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("save")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editBenthosFrequencies.action.saveAndContinue.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("save")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java index deedbac..e9d4886 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/SaveSupportAction.java @@ -29,7 +29,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.Ben import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUIModel; -import jaxx.runtime.swing.JTables; +import org.nuiton.jaxx.swing.extra.JTables; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import javax.swing.AbstractAction; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx index 740eaff..dd06a65 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx @@ -31,14 +31,14 @@ org.jdesktop.swingx.JXTable - jaxx.runtime.validator.swing.SwingValidatorUtil + org.nuiton.jaxx.validator.swing.SwingValidatorUtil javax.swing.ListSelectionModel java.awt.Color static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -52,7 +52,7 @@ public SplitBenthosBatchUI(EditCatchesUI parentUI) { initializer='getContextValue(SplitBenthosBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='selectedCategory' component='categoryComboBox'/> <field name='sampleWeight' component='sampleWeightField'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java index 625aae1..335781c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java @@ -37,7 +37,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchR import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx index 75d9b08..3ac2133 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx @@ -56,7 +56,7 @@ public IndividualObservationBatchUI(TuttiUI<?,?> parentUI) { initializer='getContextValue(IndividualObservationBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> </BeanValidator> <TuttiHelpBroker id='broker' diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java index 330eec6..a716731 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java @@ -56,7 +56,7 @@ import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.table.CaracteristicColumnIdentifier; import fr.ifremer.tutti.util.Numbers; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx index d5038ee..95eb0ed 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.jaxx @@ -33,7 +33,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t @@ -50,7 +50,7 @@ public CreateIndividualObservationBatchUI(EditCatchesUI parentUI) { initializer='getContextValue(CreateIndividualObservationBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='species' component='individualObservationSpeciesComboBox'/> <field name='weight' diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java index 4001291..9d67998 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java @@ -40,15 +40,15 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.Table; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; +import org.nuiton.jaxx.runtime.api.swing.Table; +import org.nuiton.jaxx.runtime.api.swing.JLayers; import org.nuiton.jaxx.widgets.number.NumberEditor; import javax.swing.JComponent; @@ -246,7 +246,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa ui.registerHelpId(ui.getBroker(), jLabel, "tutti.createIndividualObservationBatch.field.defaultCaracteristic.help"); configurationPanel.add(jLabel, new GridBagConstraints(0, index, 1, 1, 0.0, 0.0, 17, 1, new Insets(3, 3, 3, 3), 0, 0)); - configurationPanel.add(SwingUtil.boxComponentWithJxLayer(editor), new GridBagConstraints(1, index, 2, 1, 1.0, 0.0, 10, 1, new Insets(3, 3, 3, 3), 0, 0)); + configurationPanel.add(JLayers.boxComponentWithJLayer(editor), new GridBagConstraints(1, index, 2, 1, 1.0, 0.0, 10, 1, new Insets(3, 3, 3, 3), 0, 0)); index++; } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx index 29ae951..5d6f8ff 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx @@ -53,7 +53,7 @@ public MarineLitterBatchUI(TuttiUI<?,?> parentUI) { initializer='getContextValue(MarineLitterBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='marineLitterTotalWeight' component='marineLitterTotalWeightField'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java index 9cc4d87..c515e70 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java @@ -41,7 +41,7 @@ import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellEditor; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentCellRenderer; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx index 36a7f95..d6571c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.jaxx @@ -30,7 +30,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t @@ -47,7 +47,7 @@ public CreateMarineLitterBatchUI(EditCatchesUI parentUI) { initializer='getContextValue(CreateMarineLitterBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='marineLitterCategory' component='marineLitterCategoryComboBox'/> <field name='marineLitterSizeCategory' diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java index 02b96b1..b1f8e70 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx index 1e88b04..1657f78 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUI.jaxx @@ -25,7 +25,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.FileEditor + org.nuiton.jaxx.runtime.swing.editor.FileEditor </import> <script><![CDATA[ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java index 304ad95..484ed70 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java @@ -24,10 +24,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species; import com.google.common.io.Files; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.spi.UIHandler; +import org.nuiton.jaxx.swing.extra.Swings; import java.io.File; @@ -126,7 +126,7 @@ public class ImportPupitriPopupUIHandler implements UIHandler<ImportPupitriPopup public void open() { resetFields(); - SwingUtil.center(TuttiUIUtil.getApplicationContext(ui).getMainUI(), ui); + Swings.center(TuttiUIUtil.getApplicationContext(ui).getMainUI(), ui); ui.setVisible(true); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx index 765592a..6ce2264 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx @@ -51,7 +51,7 @@ public SpeciesBatchUI(TuttiUI<?,?> parentUI) { initializer='getContextValue(SpeciesBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='speciesTotalSortedWeight' component='speciesTotalSortedWeightField'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 392fd99..0861ab4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -62,9 +62,8 @@ import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JTables; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.swing.extra.JTables; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; @@ -970,7 +969,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec JXTable table = getTable(); // get selected row - int insertRow = SwingUtil.getSelectedModelRow(table); + int insertRow = JTables.getSelectedModelRow(table); SpeciesBatchTableModel tableModel = getTableModel(); SpeciesBatchRowModel parentBatch = tableModel.getEntry(insertRow); @@ -1074,7 +1073,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec model.setLeafNumber(model.getLeafNumber() + newBatches.size() - 1); // update columns for the parent shell - tableModel.updateShell(shell, SwingUtil.getSelectedModelColumn(getTable())); + tableModel.updateShell(shell, JTables.getSelectedModelColumn(getTable())); } public void updateTotalFromFrequencies(SpeciesBatchRowModel row) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ChangeSpeciesBatchSampleCategoryAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ChangeSpeciesBatchSampleCategoryAction.java index ab2e9c2..9f22bf1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ChangeSpeciesBatchSampleCategoryAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ChangeSpeciesBatchSampleCategoryAction.java @@ -37,12 +37,13 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchR 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.content.operation.catches.species.SpeciesBatchUIHandler; -import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; +import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.swing.extra.JComboBoxes; +import org.nuiton.jaxx.swing.extra.JTables; +import org.nuiton.jaxx.swing.extra.list.renderer.DecoratorListCellRenderer; import org.nuiton.jaxx.widgets.number.NumberEditor; import javax.swing.JComboBox; @@ -79,10 +80,10 @@ public class ChangeSpeciesBatchSampleCategoryAction extends SimpleActionSupport< SpeciesBatchTableModel tableModel = handler.getTableModel(); // get selected row - int rowIndex = SwingUtil.getSelectedModelRow(ui.getTable()); + int rowIndex = JTables.getSelectedModelRow(ui.getTable()); // get selected column - int columnIndex = SwingUtil.getSelectedModelColumn(ui.getTable()); + int columnIndex = JTables.getSelectedModelColumn(ui.getTable()); // get selected row SpeciesBatchRowModel selectedRow = tableModel.getEntry(rowIndex); @@ -158,7 +159,7 @@ public class ChangeSpeciesBatchSampleCategoryAction extends SimpleActionSupport< JComboBox editor = new JComboBox(); editor.setRenderer(new DecoratorListCellRenderer(handler.getDecorator(CaracteristicQualitativeValue.class, null))); - SwingUtil.fillComboBox(editor, availableValues, availableValues.get(0)); + JComboBoxes.fillComboBox(editor, availableValues, availableValues.get(0)); int response = JOptionPane.showConfirmDialog( handler.getTopestUI(), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java index 36fc93e..5992f01 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/CreateSpeciesMelagAction.java @@ -24,17 +24,17 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions; import com.google.common.collect.Maps; import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesAbleBatchRowHelper; 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.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.util.species.EnterMelagWeightUI; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JOptionPane; import java.util.Map; @@ -90,7 +90,7 @@ public class CreateSpeciesMelagAction extends LongActionSupport<SpeciesBatchUIMo boolean result = super.prepareAction(); - int[] selectedRowIndexes = SwingUtil.getSelectedModelRows(handler.getTable()); + int[] selectedRowIndexes = JTables.getSelectedModelRows(handler.getTable()); SpeciesBatchTableModel tableModel = handler.getTableModel(); @@ -139,7 +139,7 @@ public class CreateSpeciesMelagAction extends LongActionSupport<SpeciesBatchUIMo t("tutti.createSpeciesMelag.error.title"), JOptionPane.ERROR_MESSAGE); - SwingUtil.setSelectionInterval(handler.getTable(), selectedRowIndex); + JTables.setSelectionInterval(handler.getTable(), selectedRowIndex); result = false; // pas besoin de continuer a inspecter les autres lots break; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java index 1cc85a4..24618f8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenAddSpeciesBatchSampleCategoryUIAction.java @@ -32,9 +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.split.SplitSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.swing.extra.JTables; import static org.nuiton.i18n.I18n.t; @@ -62,11 +62,11 @@ public class OpenAddSpeciesBatchSampleCategoryUIAction extends SimpleActionSuppo SpeciesBatchTableModel tableModel = ui.getHandler().getTableModel(); // get selected row - int rowIndex = SwingUtil.getSelectedModelRow(ui.getTable()); + int rowIndex = JTables.getSelectedModelRow(ui.getTable()); Preconditions.checkState(rowIndex != -1, "Cant split batch if no batch selected"); // get selected column - int columnIndex = SwingUtil.getSelectedModelColumn(ui.getTable()); + int columnIndex = JTables.getSelectedModelColumn(ui.getTable()); Preconditions.checkState(columnIndex != -1, "Cant split batch if no batch selected"); // get selected row diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java index 112289d..d961256 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java @@ -28,8 +28,7 @@ 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.frequency.SpeciesFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JTables; +import org.nuiton.jaxx.swing.extra.JTables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -57,7 +56,7 @@ public class OpenEditSpeciesBatchFrequencyUIAction extends SimpleActionSupport<S JXTable table = ui.getTable(); - int rowIndex = SwingUtil.getSelectedModelRow(table); + int rowIndex = JTables.getSelectedModelRow(table); TableColumnModelExt columnModel = (TableColumnModelExt) table.getColumnModel(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenSplitSpeciesBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenSplitSpeciesBatchUIAction.java index d41b7cf..ceaa39f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenSplitSpeciesBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenSplitSpeciesBatchUIAction.java @@ -33,10 +33,10 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchU import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JOptionPane; @@ -65,7 +65,7 @@ public class OpenSplitSpeciesBatchUIAction extends SimpleActionSupport<SpeciesBa JXTable table = ui.getTable(); // get selected row - int rowIndex = SwingUtil.getSelectedModelRow(table); + int rowIndex = JTables.getSelectedModelRow(table); Preconditions.checkState(rowIndex != -1, "Cant split batch if no batch selected"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesBatchAction.java index a9fe585..90343cd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesBatchAction.java @@ -26,15 +26,15 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; 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.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import jaxx.runtime.SwingUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JOptionPane; import java.util.Set; @@ -83,7 +83,7 @@ public class RemoveSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo JXTable table = handler.getTable(); - int rowIndex = SwingUtil.getSelectedModelRow(table); + int rowIndex = JTables.getSelectedModelRow(table); Preconditions.checkState(rowIndex != -1, "Cant remove batch if no batch selected"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesSubBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesSubBatchAction.java index aa0ca16..00e0b01 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesSubBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesSubBatchAction.java @@ -26,14 +26,14 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; 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.TuttiUIUtil; -import jaxx.runtime.SwingUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JOptionPane; import java.util.Set; @@ -98,7 +98,7 @@ public class RemoveSpeciesSubBatchAction extends LongActionSupport<SpeciesBatchU JXTable table = handler.getTable(); - rowIndex = SwingUtil.getSelectedModelRow(table); + rowIndex = JTables.getSelectedModelRow(table); Preconditions.checkState(rowIndex != -1, "Cant remove sub batch if no batch selected"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RenameSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RenameSpeciesBatchAction.java index 1b3080d..19038e0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RenameSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RenameSpeciesBatchAction.java @@ -27,14 +27,14 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; 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.content.operation.catches.species.SpeciesBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUIModel; -import jaxx.runtime.SwingUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.jdesktop.swingx.JXTable; +import org.nuiton.jaxx.swing.extra.JTables; import java.io.Serializable; import java.util.Collection; @@ -63,7 +63,7 @@ public class RenameSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo SpeciesBatchTableModel tableModel = handler.getTableModel(); JXTable table = handler.getTable(); - int selectedRowIndex = SwingUtil.getSelectedModelRow(table); + int selectedRowIndex = JTables.getSelectedModelRow(table); SpeciesBatchRowModel row = tableModel.getEntry(selectedRowIndex); SpeciesBatchUIModel model = handler.getModel(); @@ -91,7 +91,7 @@ public class RenameSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo SpeciesBatchTableModel tableModel = handler.getTableModel(); JXTable table = handler.getTable(); - int selectedRowIndex = SwingUtil.getSelectedModelRow(table); + int selectedRowIndex = JTables.getSelectedModelRow(table); SpeciesBatchRowModel row = tableModel.getEntry(selectedRowIndex); PersistenceService persistenceService = getContext().getPersistenceService(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx index d523757..91cbff1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx @@ -33,14 +33,14 @@ org.jdesktop.swingx.JXTable - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.nuiton.jaxx.widgets.number.NumberEditor java.awt.Color javax.swing.ListSelectionModel static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -54,7 +54,7 @@ public CreateSpeciesBatchUI(EditCatchesUI parentUI) { initializer='getContextValue(CreateSpeciesBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='species' component='speciesComboBox'/> <field name='sampleCategory' component='sampleCategoryComboBox'/> <field name='batchWeight' component='batchWeightField'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index bc5830a..06251b3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -41,7 +41,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSp import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java index 68e1212..fe46426 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java @@ -29,11 +29,11 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchR 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.computable.ComputableData; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JTables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import org.nuiton.jaxx.runtime.api.swing.Icons; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.AbstractCellEditor; import javax.swing.JTable; @@ -73,7 +73,7 @@ public class SpeciesFrequencyCellComponent extends DefaultTableCellRenderer { public SpeciesFrequencyCellComponent(Color computedDataColor) { setHorizontalAlignment(CENTER); - setIcon(SwingUtil.createActionIcon("show-frequency")); + setIcon(Icons.createActionIcon("show-frequency")); this.computedDataColor = computedDataColor; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java index 01fb088..ad2dd4c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogCellComponent.java @@ -23,7 +23,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; */ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.actions.DeleteSpeciesFrequencyLogRowAction; -import jaxx.runtime.swing.JAXXWidgetUtil; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractCellEditor; import javax.swing.JButton; @@ -60,7 +60,7 @@ public class SpeciesFrequencyLogCellComponent extends JPanel { add(label, BorderLayout.CENTER); JButton deleteButton = new JButton(); - deleteButton.setIcon(JAXXWidgetUtil.createActionIcon("delete")); + deleteButton.setIcon(Icons.createActionIcon("delete")); deleteButton.setBorderPainted(false); deleteButton.setBorder(null); deleteButton.setBackground(null); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx index 42f0911..79deaeb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx @@ -37,8 +37,8 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor - jaxx.runtime.swing.CardLayout2Ext - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.swing.extra.layout.CardLayout2Ext + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable @@ -49,7 +49,7 @@ java.awt.Color static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -61,7 +61,7 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { <SpeciesFrequencyUIModel id='model' initializer='getContextValue(SpeciesFrequencyUIModel.class)'/> - <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + <BeanValidator id='validator' bean='model' uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='lengthStepCaracteristic' component='lengthStepCaracteristicComboBox'/> <field name='step' component='stepField'/> <field name='rows' component='tableScrollPane'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 60c44cc..dc1d544 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -45,8 +45,8 @@ import fr.ifremer.tutti.ui.swing.util.TuttiNumberTickUnitSource; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java index 8cdb3f8..d0efd9f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java @@ -27,8 +27,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; import javax.swing.AbstractAction; import javax.swing.JOptionPane; @@ -54,7 +54,7 @@ public class AddSpeciesFrequencyLengthStepCaracteristicAction extends AbstractAc putValue(NAME, t("tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic")); putValue(SHORT_DESCRIPTION, t("tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic"), 'Z')); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic"), 'Z')); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java index 64b6595..94c985c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/CancelEditSpeciesFrequencyAction.java @@ -25,9 +25,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac */ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -54,8 +55,8 @@ public class CancelEditSpeciesFrequencyAction extends AbstractAction { putValue(NAME, t("tutti.editSpeciesFrequencies.action.cancel")); putValue(SHORT_DESCRIPTION, t("tutti.editSpeciesFrequencies.action.cancel.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.cancel.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("cancel")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.cancel.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("cancel")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java index ebd0bf7..188e7c6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.Spe import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractAction; import javax.swing.JOptionPane; @@ -56,7 +56,7 @@ public class DeleteSpeciesFrequencyLogRowAction extends AbstractAction { this.ui = ui; this.component = component; - putValue(SMALL_ICON, SwingUtil.createActionIcon("delete")); + putValue(SMALL_ICON, Icons.createActionIcon("delete")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java index 0fd249b..0d93594 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/GenerateSpeciesFrequencyLengthStepsAction.java @@ -32,8 +32,9 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.Spe import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIModel; import fr.ifremer.tutti.util.Numbers; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JTables; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -61,8 +62,8 @@ public class GenerateSpeciesFrequencyLengthStepsAction extends AbstractAction { putValue(NAME, t("tutti.editSpeciesFrequencies.action.generate")); putValue(SHORT_DESCRIPTION, t("tutti.editSpeciesFrequencies.action.generate.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.generate.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("generate")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.generate.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("generate")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java index 8b72765..a36bcfb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ResetSpeciesFrequencyAction.java @@ -27,7 +27,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac import com.google.common.collect.Lists; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; @@ -52,8 +53,8 @@ public class ResetSpeciesFrequencyAction extends AbstractAction { putValue(NAME, t("tutti.editSpeciesFrequencies.action.reset")); putValue(SHORT_DESCRIPTION, t("tutti.editSpeciesFrequencies.action.reset.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.reset.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("reset")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.reset.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("reset")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java index dcac177..d3a5738 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndCloseSpeciesFrequencyAction.java @@ -26,9 +26,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; import java.awt.event.ActionEvent; @@ -52,8 +53,8 @@ public class SaveAndCloseSpeciesFrequencyAction extends SaveSupportAction { putValue(NAME, t("tutti.editSpeciesFrequencies.action.saveAndClose")); putValue(SHORT_DESCRIPTION, t("tutti.editSpeciesFrequencies.action.saveAndClose.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.saveAndClose.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("save")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.saveAndClose.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("save")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java index 0032b0f..9f11f8a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveAndContinueSpeciesFrequencyAction.java @@ -25,9 +25,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.ac */ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.swing.Icons; import java.awt.event.ActionEvent; @@ -51,8 +52,8 @@ public class SaveAndContinueSpeciesFrequencyAction extends SaveSupportAction { putValue(NAME, t("tutti.editSpeciesFrequencies.action.saveAndContinue")); putValue(SHORT_DESCRIPTION, t("tutti.editSpeciesFrequencies.action.saveAndContinue.tip")); - putValue(MNEMONIC_KEY, (int) SwingUtil.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.saveAndContinue.mnemonic"), 'Z')); - putValue(SMALL_ICON, SwingUtil.createActionIcon("save")); + putValue(MNEMONIC_KEY, (int) JAXXRuntime.getFirstCharAt(t("tutti.editSpeciesFrequencies.action.saveAndContinue.mnemonic"), 'Z')); + putValue(SMALL_ICON, Icons.createActionIcon("save")); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java index 0395c38..d016af1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/SaveSupportAction.java @@ -29,7 +29,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.Spe import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUIModel; -import jaxx.runtime.swing.JTables; +import org.nuiton.jaxx.swing.extra.JTables; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import javax.swing.AbstractAction; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx index 306b50a..62e3ff9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx @@ -31,14 +31,14 @@ org.jdesktop.swingx.JXTable - jaxx.runtime.validator.swing.SwingValidatorUtil + org.nuiton.jaxx.validator.swing.SwingValidatorUtil javax.swing.ListSelectionModel java.awt.Color static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -52,7 +52,7 @@ public SplitSpeciesBatchUI(EditCatchesUI parentUI) { initializer='getContextValue(SplitSpeciesBatchUIModel.class)'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='selectedCategory' component='categoryComboBox'/> <field name='sampleWeight' component='sampleWeightField'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java index f6ab59d..b21766e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java @@ -37,7 +37,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchR import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java index a4cab77..5bba0b8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIHandler.java @@ -33,8 +33,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx index 61e6ff0..336dded 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.jaxx @@ -27,7 +27,7 @@ fr.ifremer.tutti.persistence.entities.referential.Caracteristic fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable javax.swing.ListSelectionModel java.awt.Color diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java index bf859b2..a39ba43 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java @@ -22,24 +22,17 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing; * #L% */ -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueRenderer; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx index d04edf2..a8f9df3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.jaxx @@ -27,7 +27,7 @@ fr.ifremer.tutti.persistence.entities.referential.Caracteristic fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java index 6f77d9c..53553bc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java @@ -22,24 +22,17 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing; * #L% */ -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueEditor; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicValueRenderer; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx index 31ec865..c2d3dc2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.jaxx @@ -29,10 +29,10 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -49,7 +49,7 @@ constructorParams='"tutti.editProgram.help"'/> <BeanValidator id='validator' bean='model' context='edit' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='name' component='nameField'/> <field name='zone' component='zoneComboBox'/> <field name='description' component='descriptionPane'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java index d4c0981..5b878f2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java @@ -25,11 +25,11 @@ package fr.ifremer.tutti.ui.swing.content.program; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.util.CloseableUI; +import org.nuiton.jaxx.runtime.api.internal.binding.JAXXBindings; import javax.swing.JComponent; @@ -107,7 +107,7 @@ public class EditProgramUIHandler extends AbstractTuttiUIHandler<EditProgramUIMo model.setModify(model.isCreate()); //FIXME Binding does not work - JAXXUtil.applyDataBinding(ui, EditProgramUI.BINDING_RESET_BUTTON_ENABLED); + JAXXBindings.applyDataBinding(ui, EditProgramUI.BINDING_RESET_BUTTON_ENABLED); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx index 7be67a1..bd59f6e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx @@ -30,8 +30,8 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.bean.BeanDoubleList + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList java.awt.Color @@ -40,7 +40,7 @@ org.jdesktop.swingx.JXTable static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> @@ -58,7 +58,7 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.editProtocol.help"'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='name' component='nameField'/> <field name='comment' component='commentPane'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index 9dfd3c4..4874f12 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -50,12 +50,11 @@ import fr.ifremer.tutti.ui.swing.content.home.actions.EditProtocolAction; import fr.ifremer.tutti.ui.swing.content.home.actions.ImportProtocolAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesAbleBatchRowHelper; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.bean.BeanDoubleList; -import jaxx.runtime.swing.editor.bean.BeanDoubleListModel; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.swing.editor.bean.BeanUIUtil; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleList; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanDoubleListModel; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanUIUtil; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -66,6 +65,8 @@ import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.util.CloseableUI; +import org.nuiton.jaxx.swing.extra.JComboBoxes; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -508,7 +509,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI }); // always scroll to selected row - SwingUtil.scrollToTableSelection(caracteristicsMappingTable); + JTables.scrollToTableSelection(caracteristicsMappingTable); tableModel.setRows(caracteristicMappingRows); } @@ -545,7 +546,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI tableModel.setRows(operationFieldMappingRows); // always scroll to selected row - SwingUtil.scrollToTableSelection(operationFieldsTable); + JTables.scrollToTableSelection(operationFieldsTable); } populateImportColumnTableEditors(); @@ -894,7 +895,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI if (!dataToList.isEmpty() && dataToList.get(0) != null) { dataToList.add(0, null); } - SwingUtil.fillComboBox(comboBox, dataToList, null); + JComboBoxes.fillComboBox(comboBox, dataToList, null); } protected void addLengthClassesColumnToModel(TableColumnModel model, @@ -944,7 +945,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addHighlighters(table); // always scroll to selected row - SwingUtil.scrollToTableSelection(table); + JTables.scrollToTableSelection(table); // add selection listener table.getSelectionModel().addListSelectionListener(selectionListener); @@ -1092,7 +1093,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI protected void populateImportColumnTableEditor(JXTable table, int columnIndex, ArrayList<String> dataToList) { JComboBox comboBox = new JComboBox(); - SwingUtil.fillComboBox(comboBox, dataToList, null); + JComboBoxes.fillComboBox(comboBox, dataToList, null); TableColumnExt col = table.getColumnExt(columnIndex); ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddBenthosProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddBenthosProtocolAction.java index fe6cd4b..483225b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddBenthosProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddBenthosProtocolAction.java @@ -24,14 +24,14 @@ package fr.ifremer.tutti.ui.swing.content.protocol.actions; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; 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 fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.swing.extra.JTables; import java.util.Collection; @@ -96,7 +96,7 @@ public class AddBenthosProtocolAction extends LongActionSupport<EditProtocolUIMo // select this new row int rowIndex = tableModel.getRowIndex(newRow); - SwingUtil.setSelectionInterval(handler.getBenthosTable(), rowIndex); + JTables.setSelectionInterval(handler.getBenthosTable(), rowIndex); // add notification String speciesStr = decorate(species); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddCaracteristicMappingAction.java index 123c53a..aabf16b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddCaracteristicMappingAction.java @@ -24,14 +24,14 @@ package fr.ifremer.tutti.ui.swing.content.protocol.actions; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; 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.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 fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.swing.extra.JTables; import static org.nuiton.i18n.I18n.t; @@ -81,7 +81,7 @@ public class AddCaracteristicMappingAction extends LongActionSupport<EditProtoco // select this new row int rowIndex = tableModel.getRowIndex(newRow); - SwingUtil.setSelectionInterval(handler.getCaracteristicsMappingTable(), rowIndex); + JTables.setSelectionInterval(handler.getCaracteristicsMappingTable(), rowIndex); // add notification String caracteristicStr = decorate(caracteristic); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddSpeciesProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddSpeciesProtocolAction.java index d68a12b..e56ef9a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddSpeciesProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddSpeciesProtocolAction.java @@ -24,14 +24,14 @@ package fr.ifremer.tutti.ui.swing.content.protocol.actions; import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; 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 fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.swing.extra.JTables; import java.util.Collection; @@ -94,7 +94,7 @@ public class AddSpeciesProtocolAction extends LongActionSupport<EditProtocolUIMo // select this new row int rowIndex = tableModel.getRowIndex(newRow); - SwingUtil.setSelectionInterval(handler.getSpeciesTable(), rowIndex); + JTables.setSelectionInterval(handler.getSpeciesTable(), rowIndex); // add notification String speciesStr = decorate(species); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveBenthosProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveBenthosProtocolAction.java index 49b7646..366849b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveBenthosProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveBenthosProtocolAction.java @@ -27,13 +27,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; 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 fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JTable; import java.util.Collections; @@ -86,7 +86,7 @@ public class RemoveBenthosProtocolAction extends LongActionSupport<EditProtocolU EditProtocolUIModel model = getModel(); - for (Integer rowIndex : SwingUtil.getSelectedModelRows(table)) { + for (Integer rowIndex : JTables.getSelectedModelRows(table)) { // get row to remove EditProtocolSpeciesRowModel selectedRow = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveCaracteristicMappingAction.java index 5fa92bf..d2d4209 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveCaracteristicMappingAction.java @@ -27,13 +27,13 @@ package fr.ifremer.tutti.ui.swing.content.protocol.actions; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; 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.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; -import jaxx.runtime.SwingUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JTable; import java.util.ArrayList; @@ -82,7 +82,7 @@ public class RemoveCaracteristicMappingAction extends LongActionSupport<EditProt removedRows = Sets.newHashSet(); removedRowIndexes = new ArrayList<Integer>(); - for (Integer rowIndex : SwingUtil.getSelectedModelRows(table)) { + for (Integer rowIndex : JTables.getSelectedModelRows(table)) { removedRowIndexes.add(rowIndex); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveSpeciesProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveSpeciesProtocolAction.java index 28b9737..181c71c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveSpeciesProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveSpeciesProtocolAction.java @@ -27,13 +27,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; 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 fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; +import org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JTable; import java.util.Collections; @@ -84,7 +84,7 @@ public class RemoveSpeciesProtocolAction extends LongActionSupport<EditProtocolU removedSpecies = Sets.newHashSet(); removedRows = Sets.newHashSet(); - for (Integer rowIndex : SwingUtil.getSelectedModelRows(table)) { + for (Integer rowIndex : JTables.getSelectedModelRows(table)) { // get row to remove EditProtocolSpeciesRowModel selectedRow = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css index 327477b..e61972b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css @@ -32,7 +32,7 @@ #speciesLabel { text: { t("tutti.manageTemporaryReferential.field.species", model.getNbTemporarySpecies()) }; toolTipText: { t("tutti.manageTemporaryReferential.field.species.tip", model.getNbTemporarySpecies()) }; - icon: {SwingUtil.createImageIcon("action-species.gif")}; + icon: {Icons.createImageIcon("action-species.gif")}; } #speciesActionComboBox { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java index 8884d60..0080ead 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIHandler.java @@ -27,7 +27,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java index c36268a..b9d5eab 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/AbstractOpenReplaceTemporaryUIAction.java @@ -36,10 +36,11 @@ import fr.ifremer.tutti.ui.swing.content.referential.replace.AbstractReplaceTemp import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; +import org.nuiton.jaxx.runtime.api.context.JAXXInitialContext; +import org.nuiton.jaxx.swing.extra.Swings; import javax.swing.JButton; import java.util.List; @@ -166,9 +167,9 @@ public abstract class AbstractOpenReplaceTemporaryUIAction<E extends TuttiRefere UI dialog = createUI(ctx); MainUI mainUI = TuttiUIUtil.getApplicationContext(dialog).getMainUI(); - SwingUtil.setComponentHeight(dialog, 400); - SwingUtil.setComponentWidth(dialog, mainUI.getWidth() - 100); - SwingUtil.center(mainUI, dialog); + JAXXRuntime.setComponentHeight(dialog, 400); + JAXXRuntime.setComponentWidth(dialog, mainUI.getWidth() - 100); + Swings.center(mainUI, dialog); dialog.setContextValue(getUI(), "owner"); dialog.setVisible(true); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryGearUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryGearUIAction.java index 6d2c283..2e0e5b9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryGearUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryGearUIAction.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryGearUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryGearUIModel; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.api.context.JAXXInitialContext; import javax.swing.JButton; import java.util.List; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryPersonUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryPersonUIAction.java index 9f8e2cd..86d432d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryPersonUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryPersonUIAction.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryPersonUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryPersonUIModel; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.api.context.JAXXInitialContext; import javax.swing.JButton; import java.util.List; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporarySpeciesUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporarySpeciesUIAction.java index 2645fbc..e740e70 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporarySpeciesUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporarySpeciesUIAction.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporarySpeciesUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporarySpeciesUIModel; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.api.context.JAXXInitialContext; import javax.swing.JButton; import java.util.List; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryVesselUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryVesselUIAction.java index 9228c29..cc56bed 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryVesselUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryVesselUIAction.java @@ -30,7 +30,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.referential.ManageTemporaryReferentialUIHandler; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryVesselUI; import fr.ifremer.tutti.ui.swing.content.referential.replace.ReplaceTemporaryVesselUIModel; -import jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.runtime.api.context.JAXXInitialContext; import javax.swing.JButton; import java.util.List; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx index 63313dd..4e03b79 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx @@ -33,7 +33,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox static org.nuiton.i18n.I18n.t </import> @@ -41,7 +41,7 @@ <AbstractReplaceTemporaryUIModel id='model' genericType="E" initializer='null'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='selectedSource' component='sourceListComboBox'/> <field name='selectedTarget' component='targetListComboBox'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUI.jaxx index 1fdf41a..42ca291 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUI.jaxx @@ -26,7 +26,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Gear - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> <ReplaceTemporaryGearUIModel id='model' initializer='getContextValue(ReplaceTemporaryGearUIModel.class)'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUIHandler.java index 111a16c..ba8ba28 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryGearUIHandler.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.referential.replace; */ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUI.jaxx index dc5a21f..e473ff4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUI.jaxx @@ -26,7 +26,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Person - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> <ReplaceTemporaryPersonUIModel id='model' initializer='getContextValue(ReplaceTemporaryPersonUIModel.class)'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIHandler.java index 937f048..0345e12 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryPersonUIHandler.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.referential.replace; */ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUI.jaxx index b1c8178..248c06d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUI.jaxx @@ -26,7 +26,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Species - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> <ReplaceTemporarySpeciesUIModel id='model' initializer='getContextValue(ReplaceTemporarySpeciesUIModel.class)'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUIHandler.java index c93af1d..4a066df 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporarySpeciesUIHandler.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.referential.replace; */ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUI.jaxx index e273bef..ab5e20e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUI.jaxx @@ -26,7 +26,7 @@ <import> fr.ifremer.tutti.persistence.entities.referential.Vessel - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> <ReplaceTemporaryVesselUIModel id='model' initializer='getContextValue(ReplaceTemporaryVesselUIModel.class)'/> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUIHandler.java index 1fa92c7..312d9ad 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/ReplaceTemporaryVesselUIHandler.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.referential.replace; */ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx index 2549373..7d59363 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUI.jaxx @@ -29,12 +29,12 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox java.io.File static org.nuiton.i18n.I18n.t - static jaxx.runtime.SwingUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <script><![CDATA[ @@ -49,7 +49,7 @@ <TuttiHelpBroker id='broker' constructorParams='"tutti.report.help"'/> <BeanValidator id='validator' bean='model' - uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> + uiClass='org.nuiton.jaxx.validator.swing.ui.ImageValidationUI'> <field name='fishingOperation' component='fishingOperationComboBox'/> <field name='report' component='reportComboBox'/> </BeanValidator> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java index 344e76e..574a2f8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java @@ -27,7 +27,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.report.ReportGenerationService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.swing.util.CloseableUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUI.jaxx index b7bf3e2..6754dfe 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUI.jaxx @@ -32,6 +32,8 @@ org.jdesktop.swingx.JXTitledPanel + org.nuiton.jaxx.swing.extra.layout.CardLayout2Ext + </import> <script><![CDATA[ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java index 0078647..7c24970 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java @@ -26,22 +26,22 @@ import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.ui.swing.content.validation.actions.EditCruiseInValidationUIAction; -import fr.ifremer.tutti.ui.swing.content.validation.actions.EditFishingOperationInValidationUIAction; import fr.ifremer.tutti.ui.swing.content.cruise.EditCruiseUI; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; +import fr.ifremer.tutti.ui.swing.content.validation.actions.EditCruiseInValidationUIAction; +import fr.ifremer.tutti.ui.swing.content.validation.actions.EditFishingOperationInValidationUIAction; import fr.ifremer.tutti.ui.swing.content.validation.tree.CruiseTreeNode; import fr.ifremer.tutti.ui.swing.content.validation.tree.OperationTreeNode; import fr.ifremer.tutti.ui.swing.content.validation.tree.ValidationTreeCellRenderer; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.RemoveablePropertyChangeListener; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.action.ApplicationActionUIModel; import org.nuiton.jaxx.application.swing.util.CloseableUI; +import org.nuiton.jaxx.swing.extra.JTrees; import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; @@ -158,8 +158,8 @@ public class ValidateCruiseUIHandler extends AbstractTuttiUIHandler<ValidateCrui Decorator<Cruise> cruiseDecorator = getDecorator(Cruise.class, null); Decorator<FishingOperation> fishingOperationDecorator = getDecorator(FishingOperation.class, null); navigation.setCellRenderer(new ValidationTreeCellRenderer(cruiseDecorator, fishingOperationDecorator)); - SwingUtil.expandTree(navigation); - SwingUtil.addExpandOnClickListener(navigation); + JTrees.expandTree(navigation); + JTrees.addExpandOnClickListener(navigation); FishingOperationsUI operationPanel = ui.getOperationPanel(); operationPanel.getTopPanel().setVisible(false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/CruiseTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/CruiseTreeNode.java index 9c68947..2da2454 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/CruiseTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/CruiseTreeNode.java @@ -27,7 +27,7 @@ package fr.ifremer.tutti.ui.swing.content.validation.tree; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.Cruise; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.api.swing.Icons; import org.nuiton.validator.NuitonValidatorResult; import org.nuiton.validator.NuitonValidatorScope; @@ -47,7 +47,7 @@ public class CruiseTreeNode extends TuttiMessageNodeSupport<Cruise> { private static final long serialVersionUID = 1L; - private static final ImageIcon CRUISE_ICON = SwingUtil.createActionIcon("cruise"); + private static final ImageIcon CRUISE_ICON = Icons.createActionIcon("cruise"); public CruiseTreeNode(Cruise cruise, NuitonValidatorResult validationResult) { super(cruise, CRUISE_ICON, null); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java index b6f0469..09b1f19 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.ui.swing.content.validation.tree; * #L% */ -import jaxx.runtime.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/OperationTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/OperationTreeNode.java index 1abde2b..7fef534 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/OperationTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/OperationTreeNode.java @@ -27,7 +27,7 @@ package fr.ifremer.tutti.ui.swing.content.validation.tree; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.api.swing.Icons; import org.nuiton.validator.NuitonValidatorResult; import org.nuiton.validator.NuitonValidatorScope; @@ -47,7 +47,7 @@ public class OperationTreeNode extends TuttiMessageNodeSupport<FishingOperation> private static final long serialVersionUID = 1L; - private static final ImageIcon OBSERVED_FISHING_TRIP_ICON = SwingUtil.createActionIcon("observed_fishing_trip"); + private static final ImageIcon OBSERVED_FISHING_TRIP_ICON = Icons.createActionIcon("observed_fishing_trip"); public OperationTreeNode(FishingOperation operation, NuitonValidatorResult validationResult) { super(operation, OBSERVED_FISHING_TRIP_ICON, null); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java index a6e497a..0f2fda3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java @@ -41,9 +41,6 @@ import fr.ifremer.tutti.ui.swing.util.actions.ShowComboBoxPopupActions; import fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.editor.cell.NumberCellEditor; -import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -60,6 +57,9 @@ import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.jaxx.application.swing.util.ActionListCellRenderer; +import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; +import org.nuiton.jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.jaxx.widgets.number.NumberEditor; import org.nuiton.validator.bean.simple.SimpleBeanValidator; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java index 4ec2aca..a2be96b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java @@ -25,14 +25,14 @@ package fr.ifremer.tutti.ui.swing.util; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Cruises; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; +import org.nuiton.jaxx.runtime.api.JAXXObject; +import org.nuiton.jaxx.runtime.api.context.JAXXContexts; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractButton; import javax.swing.Action; @@ -79,7 +79,7 @@ public final class TuttiUIUtil extends ApplicationUIUtil { } public static void setParentUI(JAXXObject ui, TuttiUI<?, ?> parentUI) { - JAXXUtil.initContext(ui, parentUI); + JAXXContexts.initContext(ui, parentUI); setApplicationContext(ui, parentUI.getHandler().getContext()); } @@ -140,7 +140,7 @@ public final class TuttiUIUtil extends ApplicationUIUtil { iconName = "cruise-waiting"; } } - return SwingUtil.createActionIcon(iconName); + return Icons.createActionIcon(iconName); } public static void openResource(File file) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java index 88f7e10..36ec52e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.ui.swing.util.actions; * #L% */ -import jaxx.runtime.JAXXObject; +import org.nuiton.jaxx.runtime.api.JAXXObject; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java index dda23ab..f153e37 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentCellRenderer.java @@ -23,9 +23,9 @@ package fr.ifremer.tutti.ui.swing.util.attachment; */ import fr.ifremer.tutti.persistence.entities.data.Attachment; -import jaxx.runtime.SwingUtil; import org.apache.commons.collections4.CollectionUtils; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.JComponent; import javax.swing.JTable; @@ -65,7 +65,7 @@ public class AttachmentCellRenderer extends DefaultTableCellRenderer { protected AttachmentCellRenderer(Decorator<Attachment> decorator) { setHorizontalAlignment(CENTER); - setIcon(SwingUtil.createActionIcon("edit-attachment")); + setIcon(Icons.createActionIcon("edit-attachment")); this.noneText = n("tutti.attachmentEditor.none.tip"); this.decorator = decorator; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx index f211177..e48c707 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.jaxx @@ -26,7 +26,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.FileEditor + org.nuiton.jaxx.runtime.swing.editor.FileEditor org.jdesktop.swingx.JXTitledPanel javax.swing.JComponent </import> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java index 13b7184..39f6706 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUIHandler.java @@ -27,9 +27,9 @@ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.attachment.actions.HideAttachmentUIAction; import fr.ifremer.tutti.ui.swing.util.attachment.actions.ShowAttachmentUIAction; -import jaxx.runtime.swing.ComponentMover; -import jaxx.runtime.swing.ComponentResizer; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.swing.extra.ComponentMover; +import org.nuiton.jaxx.swing.extra.ComponentResizer; +import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.Action; import javax.swing.JButton; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx index 885d6df..e0b7f3e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.jaxx @@ -27,14 +27,14 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil static org.nuiton.i18n.I18n.t - static jaxx.runtime.JAXXUtil.getStringValue + static org.nuiton.jaxx.runtime.api.JAXXRuntime.getStringValue </import> <AttachmentItemModel id='model' initializer="getContextValue(AttachmentItemModel.class)"/> <script><![CDATA[ public AttachmentItem(AttachmentEditorUI parentUI) { - JAXXUtil.initContext(this, parentUI); + JAXXContexts.initContext(this, parentUI); TuttiUIUtil.setApplicationContext(this, parentUI.getModel()); } ]]></script> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemHandler.java index 509d02f..962f62c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemHandler.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.util.attachment; */ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JComponent; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java index 5562449..40883fe 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java @@ -24,10 +24,10 @@ package fr.ifremer.tutti.ui.swing.util.attachment; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.JToggleButton; import javax.swing.event.ChangeEvent; @@ -66,7 +66,7 @@ public class ButtonAttachment extends JToggleButton { public ButtonAttachment(TuttiUIContext context, AttachmentModelAware model) { - setIcon(SwingUtil.createActionIcon("edit-attachment")); + setIcon(Icons.createActionIcon("edit-attachment")); setText(t("tutti.attachmentEditor.simpleText")); setToolTipText(t("tutti.attachmentEditor.action.tip")); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/HideAttachmentUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/HideAttachmentUIAction.java index 1336cc2..b0b2d7e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/HideAttachmentUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/actions/HideAttachmentUIAction.java @@ -26,7 +26,7 @@ package fr.ifremer.tutti.ui.swing.util.attachment.actions; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentEditorUI; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.Action; import javax.swing.ImageIcon; @@ -45,7 +45,7 @@ public class HideAttachmentUIAction extends SimpleActionSupport<AttachmentEditor public HideAttachmentUIAction(AttachmentEditorUI ui) { super(ui); - ImageIcon actionIcon = SwingUtil.createActionIcon("close-dialog"); + ImageIcon actionIcon = Icons.createActionIcon("close-dialog"); putValue(Action.SMALL_ICON, actionIcon); putValue(Action.LARGE_ICON_KEY, actionIcon); putValue(Action.ACTION_COMMAND_KEY, "close"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java index 205251f..8be08fb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/auth/LoginUIHandler.java @@ -25,8 +25,8 @@ package fr.ifremer.tutti.ui.swing.util.auth; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.swing.extra.Swings; import javax.swing.JComponent; import java.awt.Container; @@ -82,7 +82,7 @@ public class LoginUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, Login Container parent = ui.getModel().getMainUI(); if (parent != null) { - SwingUtil.center(parent, ui); + Swings.center(parent, ui); } ui.setVisible(true); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java index af702a1..bb1bee9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java @@ -30,12 +30,12 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativ import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import jaxx.runtime.SwingUtil; import org.apache.commons.collections4.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractCellEditor; import javax.swing.JTable; @@ -82,7 +82,7 @@ public class CaracteristicMapCellComponent extends DefaultTableCellRenderer { this.computedDataColor = context.getConfig().getColorComputedWeights(); setHorizontalAlignment(CENTER); - setIcon(SwingUtil.createActionIcon("show-frequency")); + setIcon(Icons.createActionIcon("show-frequency")); } public void setText(CaracteristicMap map) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx index c82c7d1..39458ef 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.jaxx @@ -27,7 +27,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox org.jdesktop.swingx.JXTable javax.swing.ListSelectionModel java.awt.Color diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java index ac8a1db..91fc749 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUIHandler.java @@ -31,8 +31,8 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.collections4.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java index 1140a6e..b649244 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java @@ -27,14 +27,14 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.editor.bean.BeanUIUtil; -import jaxx.runtime.swing.editor.cell.NumberCellEditor; -import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanUIUtil; +import org.nuiton.jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.nuiton.jaxx.swing.extra.JComboBoxes; +import org.nuiton.jaxx.swing.extra.list.renderer.DecoratorListCellRenderer; import javax.swing.AbstractCellEditor; import javax.swing.JComboBox; @@ -113,7 +113,7 @@ public class CaracteristicValueEditor extends AbstractCellEditor implements Tabl if (!data.isEmpty() && data.get(0) != null) { data.add(0, null); } - SwingUtil.fillComboBox(comboBox, data, null); + JComboBoxes.fillComboBox(comboBox, data, null); ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java index 0190653..f7f0f9e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueRenderer.java @@ -26,7 +26,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; +import org.nuiton.jaxx.swing.extra.table.renderer.DecoratorTableCellRenderer; import org.nuiton.decorator.Decorator; import javax.swing.JLabel; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorAddRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorAddRowAction.java index e9c3c05..3b6d530 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorAddRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorAddRowAction.java @@ -31,7 +31,7 @@ import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorRowMo import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorTableModel; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUIModel; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorRemoveRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorRemoveRowAction.java index 3fce8c2..7b66702 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorRemoveRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/actions/CaracteristicEditorRemoveRowAction.java @@ -32,7 +32,7 @@ import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorRowMo import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorTableModel; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI; import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUIModel; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java index 7d45083..8488d9e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java @@ -25,9 +25,9 @@ package fr.ifremer.tutti.ui.swing.util.catches; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.swing.extra.PropertyChangeListeners; +import org.nuiton.jaxx.swing.extra.Swings; import javax.swing.JComponent; import javax.swing.JRootPane; @@ -86,7 +86,7 @@ public class EnterWeightUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, @Override public void windowClosed(WindowEvent e) { Component ui = (Component) e.getSource(); - JAXXUtil.destroy(ui); + PropertyChangeListeners.destroy(ui); } }); @@ -99,7 +99,7 @@ public class EnterWeightUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, ui.setWeightLabel(weightLabel); ui.setOriginalWeight(weight); ui.setWeightUnit(weightUnit); - SwingUtil.center(getContext().getMainUI(), ui); + Swings.center(getContext().getMainUI(), ui); ui.pack(); ui.getEditor().requestFocusInWindow(); ui.setVisible(true); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java index 708ec3f..5f1ea00 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/ButtonComment.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.ui.swing.util.comment; import fr.ifremer.tutti.persistence.entities.CommentAware; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.SwingUtil; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.JToggleButton; import javax.swing.event.ChangeEvent; @@ -56,7 +56,7 @@ public class ButtonComment extends JToggleButton { public ButtonComment(TuttiUIContext context, CommentAware model) { - setIcon(SwingUtil.createActionIcon("edit-comment")); + setIcon(Icons.createActionIcon("edit-comment")); setToolTipText(t("tutti.commentEditor.action.tip")); popup = new CommentEditorUI(context); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java index 2dc160b..b31df60 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentCellRenderer.java @@ -22,8 +22,8 @@ package fr.ifremer.tutti.ui.swing.util.comment; * #L% */ -import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.JComponent; import javax.swing.JTable; @@ -59,7 +59,7 @@ public class CommentCellRenderer extends DefaultTableCellRenderer { protected CommentCellRenderer() { setHorizontalAlignment(CENTER); - setIcon(SwingUtil.createActionIcon("edit-comment")); + setIcon(Icons.createActionIcon("edit-comment")); this.noneText = n("tutti.commentEditor.none.tip"); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java index e8ec789..ba60562 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUIHandler.java @@ -25,10 +25,10 @@ package fr.ifremer.tutti.ui.swing.util.comment; import fr.ifremer.tutti.persistence.entities.CommentAware; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.spi.UIHandler; -import jaxx.runtime.swing.ComponentMover; -import jaxx.runtime.swing.ComponentResizer; +import org.nuiton.jaxx.runtime.api.spi.UIHandler; +import org.nuiton.jaxx.swing.extra.ComponentMover; +import org.nuiton.jaxx.swing.extra.ComponentResizer; +import org.nuiton.jaxx.runtime.api.swing.Icons; import javax.swing.AbstractAction; import javax.swing.Action; @@ -112,7 +112,7 @@ public class CommentEditorUIHandler implements UIHandler<CommentEditorUI> { }; //TODO Use fr.ifremer.tutti.ui.swing.util.TuttiUIUtil.prepareAction() - ImageIcon actionIcon = SwingUtil.createActionIcon("close-dialog"); + ImageIcon actionIcon = Icons.createActionIcon("close-dialog"); closeAction.putValue(Action.SMALL_ICON, actionIcon); closeAction.putValue(Action.LARGE_ICON_KEY, actionIcon); closeAction.putValue(Action.ACTION_COMMAND_KEY, "close"); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java index 48f59e1..fee0e49 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java @@ -24,7 +24,7 @@ package fr.ifremer.tutti.ui.swing.util.computable; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; import org.nuiton.jaxx.widgets.number.NumberEditorHandler; import org.nuiton.jaxx.widgets.number.NumberEditorModel; @@ -123,7 +123,7 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { DecimalFormat decimalFormat = Weights.getDecimalFormat(1, decimalNumber); modelText = decimalFormat.format(computedData); } else { - modelText = JAXXUtil.getStringValue(computedData); + modelText = JAXXRuntime.getStringValue(computedData); } tf.setText(modelText); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java index 3465ea9..a5e1ca1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.util.computable; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.util.Weights; -import jaxx.runtime.JAXXUtil; +import org.nuiton.jaxx.runtime.api.JAXXRuntime; import javax.swing.AbstractCellEditor; import javax.swing.JLabel; @@ -223,15 +223,15 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { if (useFloat && decimalNumber != null && dataValue != null) { DecimalFormat decimalFormat = Weights.getDecimalFormat(1, decimalNumber); - text = JAXXUtil.getStringValue(decimalFormat.format(dataValue)); + text = JAXXRuntime.getStringValue(decimalFormat.format(dataValue)); } else { - text = JAXXUtil.getStringValue(dataValue); + text = JAXXRuntime.getStringValue(dataValue); } } else { font = TuttiUI.TEXTFIELD_NORMAL_FONT; foreground = Color.BLACK; - text = JAXXUtil.getStringValue(dataValue); + text = JAXXRuntime.getStringValue(dataValue); } Component component = delegate.getTableCellRendererComponent(table, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java index 5ff03b5..832c127 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java @@ -27,7 +27,7 @@ import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.jdesktop.swingx.renderer.DefaultTableRenderer; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java index 51edec2..11384a1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java @@ -27,7 +27,7 @@ import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; +import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.jdesktop.swingx.renderer.DefaultTableRenderer; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java index 54e2675..3f578c0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java @@ -25,9 +25,9 @@ package fr.ifremer.tutti.ui.swing.util.species; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.swing.extra.PropertyChangeListeners; +import org.nuiton.jaxx.swing.extra.Swings; import javax.swing.JComponent; import java.awt.Component; @@ -70,7 +70,7 @@ public class EnterMelagWeightUIHandler extends AbstractTuttiUIHandler<TuttiUICon @Override public void windowClosed(WindowEvent e) { Component ui = (Component) e.getSource(); - JAXXUtil.destroy(ui); + PropertyChangeListeners.destroy(ui); } }); initUI(ui); @@ -81,7 +81,7 @@ public class EnterMelagWeightUIHandler extends AbstractTuttiUIHandler<TuttiUICon protected Float openAndGetWeightValue(WeightUnit weightUnit) { ui.setWeightUnit(weightUnit); - SwingUtil.center(getContext().getMainUI(), ui); + Swings.center(getContext().getMainUI(), ui); ui.pack(); ui.getEditor().requestFocusInWindow(); ui.setVisible(true); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx index ac10ee3..44e3df5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.jaxx @@ -26,7 +26,7 @@ fr.ifremer.tutti.persistence.entities.referential.Species fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.bean.BeanFilterableComboBox + org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox </import> <script><![CDATA[ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java index 127ff21..e073936 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; -import jaxx.runtime.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java index d6ac4aa..adf3cc7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java @@ -30,8 +30,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataTableCell.TuttiComputedOrNotDataTableCellEditor; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.editor.cell.NumberCellEditor; +import org.nuiton.jaxx.runtime.swing.editor.cell.NumberCellEditor; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; @@ -42,6 +41,7 @@ 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 org.nuiton.jaxx.swing.extra.JTables; import javax.swing.JTable; import javax.swing.ListSelectionModel; @@ -269,7 +269,7 @@ public abstract class AbstractTuttiTableUIHandler<R extends AbstractTuttiBeanUIM }); // always scroll to selected row - SwingUtil.scrollToTableSelection(getTable()); + JTables.scrollToTableSelection(getTable()); // always force to uninstall listener uninstallTableSaveOnRowChangedSelectionListener(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.