This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b8781d4d511e1d88d90842b0b58cb86c4f7b03f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 31 18:54:43 2014 +0100 utilisation de jaxx 2.20 et du nouvel éditeur de nombre --- pom.xml | 8 +++- tutti-ui-swing/pom.xml | 4 ++ .../tutti/ui/swing/content/cruise/EditCruiseUI.css | 4 +- .../ui/swing/content/cruise/EditCruiseUI.jaxx | 2 +- .../content/operation/EditFishingOperationUI.css | 40 ++++++++--------- .../content/operation/EditFishingOperationUI.jaxx | 2 +- .../content/operation/catches/EditCatchesUI.css | 14 +++--- .../operation/catches/SampleCategoryComponent.java | 16 +++---- .../accidental/create/CreateAccidentalBatchUI.css | 11 +++-- .../accidental/create/CreateAccidentalBatchUI.jaxx | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 10 ++--- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../benthos/create/CreateBenthosBatchUI.css | 11 +++-- .../benthos/create/CreateBenthosBatchUI.jaxx | 2 +- .../benthos/frequency/BenthosFrequencyUI.css | 34 +++++--------- .../benthos/frequency/BenthosFrequencyUI.jaxx | 5 +-- .../frequency/BenthosFrequencyUIHandler.java | 2 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 12 ++--- .../IndividualObservationBatchUI.jaxx | 2 +- .../create/CreateIndividualObservationBatchUI.css | 6 +-- .../create/CreateIndividualObservationBatchUI.jaxx | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 6 +-- .../catches/marinelitter/MarineLitterBatchUI.css | 6 +-- .../create/CreateMarineLitterBatchUI.css | 6 +-- .../create/CreateMarineLitterBatchUI.jaxx | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 10 ++--- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../species/create/CreateSpeciesBatchUI.css | 11 +++-- .../species/create/CreateSpeciesBatchUI.jaxx | 2 +- .../species/frequency/SpeciesFrequencyUI.css | 34 +++++--------- .../species/frequency/SpeciesFrequencyUI.jaxx | 5 +-- .../frequency/SpeciesFrequencyUIHandler.java | 2 +- .../species/frequency/SpeciesFrequencyUIModel.java | 12 ++--- .../ui/swing/util/AbstractTuttiUIHandler.java | 25 ++++++++++- .../util/computable/ComputableDataEditor.jaxx | 13 ++---- .../computable/ComputableDataEditorHandler.java | 52 +++++++++++----------- .../util/computable/ComputableDataTableCell.java | 19 ++++---- .../ui/swing/util/species/EnterMelagWeightUI.css | 3 +- .../ui/swing/util/species/EnterMelagWeightUI.jaxx | 5 +-- .../util/species/EnterMelagWeightUIHandler.java | 2 +- 40 files changed, 194 insertions(+), 218 deletions(-) diff --git a/pom.xml b/pom.xml index d0e5b16..10c8902 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <eugenePluginVersion>2.13</eugenePluginVersion> - <jaxxVersion>2.17</jaxxVersion> + <jaxxVersion>2.20-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.7</slf4jVersion> <adagioVersion>3.6.4</adagioVersion> @@ -359,7 +359,11 @@ <artifactId>jaxx-application-swing</artifactId> <version>${jaxxVersion}</version> </dependency> - + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + <version>${jaxxVersion}</version> + </dependency> <!-- SwingX --> <dependency> <groupId>org.swinglabs.swingx</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 1712f52..d84ffcc 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -204,6 +204,10 @@ </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-application-api</artifactId> </dependency> <dependency> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css index 37c8da5..9e34c20 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css @@ -198,8 +198,8 @@ JTextField { #multirigNumberField { property: multirigNumber; - model: {model.getMultirigNumber()}; - useFloat: false; + numberValue: {model.getMultirigNumber()}; + numberType:{Integer.class}; numberPattern: {INT_1_DIGITS_PATTERN}; _validatorLabel: {t("tutti.editCruise.field.multirigNumber")}; _help: {"tutti.editCruise.field.multirigNumber.help"}; 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 d34d290..5258cc7 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 @@ -34,7 +34,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor jaxx.runtime.swing.editor.SimpleTimeEditor jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css index dede964..675bc4c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css @@ -123,8 +123,8 @@ JXDatePicker { #fishingOperationNumberField { property: fishingOperationNumber; - model: {model.getFishingOperationNumber()}; - useFloat: false; + numberValue: {model.getFishingOperationNumber()}; + numberType:{Integer.class}; numberPattern: {INT_6_DIGITS_PATTERN}; _validatorLabel: {t("tutti.editFishingOperation.field.fishingOperationNumber")}; _help: {"tutti.editFishingOperation.field.fishingOperationNumber.help"}; @@ -317,26 +317,26 @@ CardLayout2Ext { .degree { showReset: false; - useFloat: false; + numberType:{Integer.class}; useSign: true; } .minute { showReset: false; - useFloat: false; + numberType:{Integer.class}; useSign: false; numberPattern: {INT_2_DIGITS_PATTERN}; } .decimalMinute { showReset: false; - useFloat: true; + numberType:{Float.class}; useSign: false; } .second { showReset: false; - useFloat: false; + numberType:{Integer.class}; useSign: false; numberPattern: {INT_2_DIGITS_PATTERN}; } @@ -353,10 +353,10 @@ CardLayout2Ext { #gearShootingStartLatitudeDDField { property: gearShootingStartLatitude; - model: {model.getGearShootingStartLatitude()}; - showReset: false; - useFloat: true; + numberValue: {model.getGearShootingStartLatitude()}; + numberType:{Float.class}; useSign: true; + showReset: false; _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLatitude")}; toolTipText: "tutti.editFishingOperation.field.gearShootingStartLatitude.tip"; } @@ -393,10 +393,10 @@ CardLayout2Ext { #gearShootingStartLongitudeDDField { property: gearShootingStartLongitude; - model: {model.getGearShootingStartLongitude()}; - showReset: false; - useFloat: true; + numberValue: {model.getGearShootingStartLongitude()}; + numberType:{Float.class}; useSign: true; + showReset: false; _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLongitude")}; toolTipText: "tutti.editFishingOperation.field.gearShootingStartLongitude.tip"; } @@ -435,10 +435,10 @@ CardLayout2Ext { #gearShootingEndLatitudeDDField { property: gearShootingEndLatitude; - model: {model.getGearShootingEndLatitude()}; - showReset: false; - useFloat: true; + numberValue: {model.getGearShootingEndLatitude()}; + numberType:{Float.class}; useSign: true; + showReset: false; _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLatitude")}; toolTipText: "tutti.editFishingOperation.field.gearShootingEndLatitude.tip"; } @@ -475,10 +475,10 @@ CardLayout2Ext { #gearShootingEndLongitudeDDField { property: gearShootingEndLongitude; - model: {model.getGearShootingEndLongitude()}; - showReset: false; - useFloat: true; + numberValue: {model.getGearShootingEndLongitude()}; + numberType:{Float.class}; useSign: true; + showReset: false; _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLongitude")}; toolTipText: "tutti.editFishingOperation.field.gearShootingEndLongitude.tip"; } @@ -578,8 +578,8 @@ CardLayout2Ext { #trawlDistanceField { property: trawlDistance; - model: {model.getTrawlDistance()}; - useFloat: false; + numberValue: {model.getTrawlDistance()}; + numberType:{Integer.class}; numberPattern: {INT_6_DIGITS_PATTERN}; enabled: {!model.isFishingOperationRectiligne()}; toolTipText: {handler.getTrawlDistanceTooltipText(model.getTrawlDistance())}; 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 909b0d3..7c50d86 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 @@ -39,7 +39,7 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor jaxx.runtime.swing.editor.SimpleTimeEditor jaxx.runtime.swing.editor.gis.DmsCoordinateEditor jaxx.runtime.swing.editor.gis.DmdCoordinateEditor diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css index 098681d..0a4d207 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css @@ -25,14 +25,14 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - useFloat: true; + numberType: {Float.class}; } ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -94,7 +94,7 @@ ComputableDataEditor { #catchTotalWeightField { bean: {model.getCatchTotalComputedOrNotWeight()}; - model: {model.getCatchTotalWeight()}; + numberValue: {model.getCatchTotalWeight()}; _help: {"tutti.editCatchBatch.field.catchTotalWeight.help"}; } @@ -154,7 +154,7 @@ ComputableDataEditor { #catchTotalRejectedWeightField { bean: {model.getCatchTotalRejectedComputedOrNotWeight()}; - model: {model.getCatchTotalRejectedWeight()}; + numberValue: {model.getCatchTotalRejectedWeight()}; _help: {"tutti.editCatchBatch.field.catchTotalRejectedWeight.help"}; _validatorLabel: {t("tutti.editCatchBatch.field.catchTotalRejectedWeight")}; } @@ -207,7 +207,7 @@ ComputableDataEditor { #speciesTotalSortedWeightField { bean: {model.getSpeciesTotalSortedComputedOrNotWeight()}; - model: {model.getSpeciesTotalSortedWeight()}; + numberValue: {model.getSpeciesTotalSortedWeight()}; _help: {"tutti.editCatchBatch.field.speciesTotalSortedWeight.help"}; } @@ -273,7 +273,7 @@ ComputableDataEditor { #benthosTotalSortedWeightField { bean: {model.getBenthosTotalSortedComputedOrNotWeight()}; - model: {model.getBenthosTotalSortedWeight()}; + numberValue: {model.getBenthosTotalSortedWeight()}; _help: {"tutti.editCatchBatch.field.benthosTotalSortedWeight.help"}; } @@ -324,7 +324,7 @@ ComputableDataEditor { #marineLitterTotalWeightField { bean: {model.getMarineLitterTotalComputedOrNotWeight()}; - model: {model.getMarineLitterTotalWeight()}; + numberValue: {model.getMarineLitterTotalWeight()}; _help: {"tutti.editCatchBatch.field.marineLitterTotalWeight.help"}; } 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 5f8c805..bc138af 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 @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.swing.editor.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import org.apache.commons.lang3.StringUtils; import org.nuiton.decorator.Decorator; @@ -100,7 +100,7 @@ public class SampleCategoryComponent { numberEditor.getTextField().setBorder(null); numberEditor.getTextField().addFocusListener(this); numberEditor.getTextField().addAncestorListener(this); - numberEditor.setModelType(Float.class); + numberEditor.setNumberType(Float.class); numberEditor.setUseSign(false); numberEditor.setNumberPattern(weightUnit.getNumberEditorPattern()); numberEditor.init(); @@ -128,14 +128,14 @@ public class SampleCategoryComponent { C categoryValue = sampleCategory == null ? null : sampleCategory.getCategoryValue(); Float number = sampleCategory == null ? null : sampleCategory.getCategoryWeight(); - numberEditor.setModel(number); + numberEditor.setNumberValue(number); // Check nullity and set the text that will be selected with the current value if (number == null) { - numberEditor.setModelText(""); + numberEditor.getModel().setTextValue(""); } else { // numberEditor.setModelText(String.valueOf(number)); - numberEditor.setModelText(weightUnit.renderWeight(number)); + numberEditor.getModel().setTextValue(weightUnit.renderWeight(number)); } String label = sampleCategory == null ? "-" : @@ -155,7 +155,7 @@ public class SampleCategoryComponent { @Override public Float getCellEditorValue() { - return (Float) numberEditor.getModel(); + return (Float) numberEditor.getModel().getNumberValue(); } @Override @@ -207,9 +207,9 @@ public class SampleCategoryComponent { } protected void resetEditor() { - numberEditor.setModel(null); + numberEditor.setNumberValue(null); // Use empty string, otherwise there is a NPE in NumberEditorHandler - numberEditor.setModelText(""); + numberEditor.getModel().setTextValue(""); editorLabel.setText("-"); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css index 934c90b..2b382ac 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css @@ -28,6 +28,7 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; + bean: {model}; } #createAccidentalBatchTopPanel { @@ -70,9 +71,8 @@ NumberEditor { #accidentalWeightField { property: weight; - useFloat: true; - bean: {model}; - model: {model.getWeight()}; + numberType: {Float.class}; + numberValue: {model.getWeight()}; _help: {"tutti.createAccidentalBatch.field.accidentalWeight.help"}; } @@ -85,10 +85,9 @@ NumberEditor { #accidentalSizeField { property: size; - useFloat: true; + numberType: {Float.class}; numberPattern: {DECIMAL3_PATTERN}; - bean: {model}; - model: {model.getSize()}; + numberValue: {model.getSize()}; _help: {"tutti.createAccidentalBatch.field.accidentalSize.help"}; } 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 f7e41e6..0c70d9f 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 @@ -34,7 +34,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t </import> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css index 5d44d45..9b74b5c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css @@ -25,7 +25,7 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - useFloat: true; + numberType: {Float.class}; _selectOnFocus: {true}; } @@ -33,7 +33,7 @@ ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -75,7 +75,7 @@ ComputableDataEditor { #benthosTotalSortedWeightField { bean: {model.getBenthosTotalSortedComputedOrNotWeight()}; - model: {model.getBenthosTotalSortedWeight()}; + numberValue: {model.getBenthosTotalSortedWeight()}; _help: {"tutti.editBenthosBatch.field.benthosTotalSortedWeight.help"}; } @@ -117,7 +117,7 @@ ComputableDataEditor { #benthosTotalInertWeightField { bean: {model.getBenthosTotalInertComputedOrNotWeight()}; - model: {model.getBenthosTotalInertWeight()}; + numberValue: {model.getBenthosTotalInertWeight()}; _help: {"tutti.editBenthosBatch.field.benthosTotalInertWeight.help"}; } @@ -131,7 +131,7 @@ ComputableDataEditor { #benthosTotalLivingNotItemizedWeightField { bean: {model.getBenthosTotalLivingNotItemizedComputedOrNotWeight()}; - model: {model.getBenthosTotalLivingNotItemizedWeight()}; + numberValue: {model.getBenthosTotalLivingNotItemizedWeight()}; _help: {"tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help"}; } 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 6d8ba7c..9cc5688 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 @@ -69,7 +69,7 @@ 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.editor.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -1106,7 +1106,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent NumberEditor editor = new NumberEditor(); editor.setNumberPattern(TuttiUI.DECIMAL3_PATTERN); editor.setUseSign(false); - editor.setUseFloat(true); +// editor.setUseFloat(true); editor.setShowPopupButton(false); editor.setShowReset(false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css index 0b739c7..75e1332 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css @@ -29,6 +29,7 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; + bean: {model}; } #createBenthosBatchTopPanel { @@ -76,9 +77,8 @@ NumberEditor { #batchWeightField { property: batchWeight; - model: {model.getBatchWeight()}; - useFloat: true; - bean: {model}; + numberValue: {model.getBatchWeight()}; + numberType: {Float.class}; _help: {"tutti.createBenthosBatch.field.batchWeight.help"}; } @@ -91,10 +91,9 @@ NumberEditor { #batchCountField { property: batchCount; - model: {model.getBatchCount()}; - useFloat: false; + numberValue: {model.getBatchCount()}; + numberType: {Integer.class}; numberPattern: {INT_6_DIGITS_PATTERN}; - bean: {model}; _help: {"tutti.createBenthosBatch.field.batchCount.help"}; } 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 6db38ae..42124f7 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 @@ -34,7 +34,7 @@ org.jdesktop.swingx.JXTable jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor java.awt.Color javax.swing.ListSelectionModel diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css index 169c3a0..1e9376b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css @@ -28,13 +28,17 @@ BeanFilterableComboBox { NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; + bean: {model}; + numberType: {Float.class}; + showReset: true; + _selectOnFocus: true; } ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -52,12 +56,9 @@ ComputableDataEditor { #stepField { property: step; - model: {model.getStep()}; - useFloat: true; + numberValue: {model.getStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; enabled: {!model.isSimpleCountingMode()}; - _selectOnFocus: true; _validatorLabel: {t("tutti.editBenthosFrequencies.field.step")}; _help: {"tutti.editBenthosFrequencies.field.step.help"}; } @@ -88,7 +89,7 @@ ComputableDataEditor { #totalWeightField { bean: {model.getTotalComputedOrNotWeight()}; - model: {model.getTotalWeight()}; + numberValue: {model.getTotalWeight()}; _validatorLabel: {t("tutti.editBenthosFrequencies.field.totalWeight")}; _help: {"tutti.editBenthosFrequencies.field.totalWeight.help"}; } @@ -118,12 +119,8 @@ ComputableDataEditor { #minStepField { property: minStep; - model: {model.getMinStep()}; - useFloat: true; - showReset: true; + numberValue: {model.getMinStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; - _selectOnFocus: true; _help: {"tutti.editBenthosFrequencies.field.minStep.help"}; } @@ -136,12 +133,8 @@ ComputableDataEditor { #maxStepField { property: maxStep; - model: {model.getMaxStep()}; - useFloat: true; - showReset: true; + numberValue: {model.getMaxStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; - _selectOnFocus: true; _help: {"tutti.editBenthosFrequencies.field.maxStep.help"}; } @@ -153,12 +146,8 @@ ComputableDataEditor { } #rafaleStepField { - modelType: {Float.class}; - useFloat: true; - showReset: true; numberPattern: {DECIMAL1_PATTERN}; enabled: {model.getLengthStepCaracteristic() != null}; - _selectOnFocus: true; _help: {"tutti.editBenthosFrequencies.field.rafaleStep.help"}; } @@ -230,11 +219,8 @@ ComputableDataEditor { #simpleCountingField { property: simpleCount; - model: {model.getSimpleCount()}; - useFloat: false; - showReset: true; + numberValue: {model.getSimpleCount()}; numberPattern: {TuttiUI.INT_6_DIGITS_PATTERN}; - bean: {model}; _help: {"tutti.editBenthosFrequencies.field.simpleCounting.help"}; } 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 dfeed1f..9eb0c03 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 @@ -34,7 +34,7 @@ jaxx.runtime.swing.CardLayout2Ext jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable @@ -130,8 +130,7 @@ public BenthosFrequencyUI(TuttiUI parentUI) { </row> <row> <cell weightx='1.0'> - <NumberEditor id='rafaleStepField' - constructorParams='this'/> + <NumberEditor id='rafaleStepField' constructorParams='this'/> </cell> </row> </Table> 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 7ccff5e..77e370c 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 @@ -300,7 +300,7 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { e.consume(); - Float step = (Float) BenthosFrequencyUIHandler.this.ui.getRafaleStepField().getModel(); + Float step = (Float) BenthosFrequencyUIHandler.this.ui.getRafaleStepField().getModel().getNumberValue(); applyRafaleStep(step); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java index 9f0f219..742c9d3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java @@ -100,7 +100,7 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa * * @since 0.2 */ - protected float step; + protected Float step; /** * Min step to auto generate length steps. @@ -195,12 +195,6 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa return new BenthosBatchRowModel(weightUnit, sampleCategoryModel); } -// @Override -// public void setRows(List<BenthosFrequencyRowModel> rows) { -// super.setRows(rows); -// setEmptyRows(Sets.<BenthosFrequencyRowModel>newHashSet()); -// } - public FrequencyConfigurationMode getConfigurationMode() { return configurationMode; } @@ -214,11 +208,11 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa firePropertyChange(PROPERTY_SIMPLE_COUNTING_MODE, null, isSimpleCountingMode()); } - public float getStep() { + public Float getStep() { return step; } - public void setStep(float step) { + public void setStep(Float step) { Object oldValue = getStep(); this.step = step; firePropertyChange(PROPERTY_STEP, oldValue, step); 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 50b023a..707cc0f 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 @@ -33,7 +33,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css index f63f99d..2da9999 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css @@ -28,7 +28,7 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; - useFloat: true; + numberType: {Float.class}; showReset: true; } @@ -68,7 +68,7 @@ NumberEditor { #individualObservationWeightField { property: weight; - model: {model.getWeight()}; + numberValue: {model.getWeight()}; _help: {"tutti.createIndividualObservationBatch.field.individualObservationWeight.help"}; } @@ -81,7 +81,7 @@ NumberEditor { #individualObservationSizeField { property: size; - model: {model.getSize()}; + numberValue: {model.getSize()}; _help: {"tutti.createIndividualObservationBatch.field.individualObservationSize.help"}; } 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 6b20d74..a92d369 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 @@ -34,7 +34,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t </import> 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 6a318e6..594b8f3 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 @@ -42,7 +42,7 @@ 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.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -167,7 +167,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa String name = caracteristic.getId() + "CaracteristicField"; numberEditor.setName(name); numberEditor.setProperty(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY); - numberEditor.setUseFloat(true); +// numberEditor.setUseFloat(true); numberEditor.setShowReset(true); numberEditor.setBean(editorModel); numberEditor.setAutoPopup(getConfig().isAutoPopupNumberEditor()); @@ -177,7 +177,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - numberEditor.setModel((Number) evt.getNewValue()); + numberEditor.setNumberValue((Number) evt.getNewValue()); } }); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css index b06c559..850577f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css @@ -24,9 +24,6 @@ ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; - /*numberPattern: {DECIMAL3_PATTERN}; - decimalNumber: 3;*/ computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -54,7 +51,8 @@ ComputableDataEditor { #marineLitterTotalWeightField { bean: {model.getMarineLitterTotalComputedOrNotWeight()}; - model: {model.getMarineLitterTotalWeight()}; + numberType: {Float.class}; + numberValue: {model.getMarineLitterTotalWeight()}; _help: {"tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css index 39f3702..c9aed46 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css @@ -29,7 +29,7 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - useFloat: true; + numberType: {Float.class}; } #createMarineLitterBatchTopPanel { @@ -71,7 +71,7 @@ NumberEditor { #marineLitterNumberField { property: number; - model: {model.getNumber()}; + numberValue: {model.getNumber()}; numberPattern: {DECIMAL3_PATTERN}; _help: {"tutti.createMarineLitterBatch.field.number.help"}; } @@ -86,7 +86,7 @@ NumberEditor { #marineLitterWeightField { property: weight; - model: {model.getWeight()}; + numberValue: {model.getWeight()}; _help: {"tutti.createMarineLitterBatch.field.weight.help"}; } 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 5107650..c1220d9 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 @@ -31,7 +31,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t </import> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css index e15cd97..cf4b6c4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css @@ -25,7 +25,7 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - useFloat: true; + numberType: {Float.class}; _selectOnFocus: {true}; } @@ -33,7 +33,7 @@ ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -75,7 +75,7 @@ ComputableDataEditor { #speciesTotalSortedWeightField { bean: {model.getSpeciesTotalSortedComputedOrNotWeight()}; - model: {model.getSpeciesTotalSortedWeight()}; + numberValue: {model.getSpeciesTotalSortedWeight()}; _help: {"tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help"}; } @@ -117,7 +117,7 @@ ComputableDataEditor { #speciesTotalInertWeightField { bean: {model.getSpeciesTotalInertComputedOrNotWeight()}; - model: {model.getSpeciesTotalInertWeight()}; + numberValue: {model.getSpeciesTotalInertWeight()}; _help: {"tutti.editSpeciesBatch.field.speciesTotalInertWeight.help"}; } @@ -131,7 +131,7 @@ ComputableDataEditor { #speciesTotalLivingNotItemizedWeightField { bean: {model.getSpeciesTotalLivingNotItemizedComputedOrNotWeight()}; - model: {model.getSpeciesTotalLivingNotItemizedWeight()}; + numberValue: {model.getSpeciesTotalLivingNotItemizedWeight()}; _help: {"tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help"}; } 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 6e132a0..c6bb1b8 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 @@ -69,7 +69,7 @@ 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.editor.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -1113,7 +1113,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec NumberEditor editor = new NumberEditor(); editor.setNumberPattern(TuttiUI.DECIMAL3_PATTERN); editor.setUseSign(false); - editor.setUseFloat(true); +// editor.setUseFloat(true); editor.setShowPopupButton(false); editor.setShowReset(false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css index 29b07d3..271a302 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css @@ -29,6 +29,7 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; + bean: {model}; } #createSpeciesBatchTopPanel { @@ -76,9 +77,8 @@ NumberEditor { #batchWeightField { property: batchWeight; - model: {model.getBatchWeight()}; - useFloat: true; - bean: {model}; + numberValue: {model.getBatchWeight()}; + numberType: {Float.class}; _help: {"tutti.createSpeciesBatch.field.batchWeight.help"}; } @@ -91,10 +91,9 @@ NumberEditor { #batchCountField { property: batchCount; - model: {model.getBatchCount()}; - useFloat: false; + numberValue: {model.getBatchCount()}; + numberType: {Integer.class}; numberPattern: {INT_6_DIGITS_PATTERN}; - bean: {model}; _help: {"tutti.createSpeciesBatch.field.batchCount.help"}; } 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 c2c45aa..f5eef9f 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 @@ -34,7 +34,7 @@ org.jdesktop.swingx.JXTable jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor java.awt.Color javax.swing.ListSelectionModel diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css index 395a20e..98deb3d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css @@ -28,13 +28,17 @@ BeanFilterableComboBox { NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; + bean: {model}; + numberType: {Float.class}; + showReset: true; + _selectOnFocus: true; } ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -52,12 +56,9 @@ ComputableDataEditor { #stepField { property: step; - model: {model.getStep()}; - useFloat: true; + numberValue: {model.getStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; enabled: {!model.isSimpleCountingMode()}; - _selectOnFocus: true; _validatorLabel: {t("tutti.editSpeciesFrequencies.field.step")}; _help: {"tutti.editSpeciesFrequencies.field.step.help"}; } @@ -88,7 +89,7 @@ ComputableDataEditor { #totalWeightField { bean: {model.getTotalComputedOrNotWeight()}; - model: {model.getTotalWeight()}; + numberValue: {model.getTotalWeight()}; _validatorLabel: {t("tutti.editSpeciesFrequencies.field.totalWeight")}; _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"}; } @@ -118,12 +119,8 @@ ComputableDataEditor { #minStepField { property: minStep; - model: {model.getMinStep()}; - useFloat: true; - showReset: true; + numberValue: {model.getMinStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; - _selectOnFocus: true; _help: {"tutti.editSpeciesFrequencies.field.minStep.help"}; } @@ -136,12 +133,8 @@ ComputableDataEditor { #maxStepField { property: maxStep; - model: {model.getMaxStep()}; - useFloat: true; - showReset: true; + numberValue: {model.getMaxStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; - _selectOnFocus: true; _help: {"tutti.editSpeciesFrequencies.field.maxStep.help"}; } @@ -153,12 +146,8 @@ ComputableDataEditor { } #rafaleStepField { - modelType: {Float.class}; - useFloat: true; - showReset: true; numberPattern: {DECIMAL1_PATTERN}; enabled: {model.getLengthStepCaracteristic() != null}; - _selectOnFocus: true; _help: {"tutti.editSpeciesFrequencies.field.rafaleStep.help"}; } @@ -230,11 +219,8 @@ ComputableDataEditor { #simpleCountingField { property: simpleCount; - model: {model.getSimpleCount()}; - useFloat: false; - showReset: true; + numberValue: {model.getSimpleCount()}; numberPattern: {TuttiUI.INT_6_DIGITS_PATTERN}; - bean: {model}; _help: {"tutti.editSpeciesFrequencies.field.simpleCounting.help"}; } 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 b0ffb8a..b885b6f 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 @@ -34,7 +34,7 @@ jaxx.runtime.swing.CardLayout2Ext jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable org.jdesktop.swingx.JXMultiSplitPane @@ -131,8 +131,7 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { </row> <row> <cell weightx='1.0'> - <NumberEditor id='rafaleStepField' - constructorParams='this'/> + <NumberEditor id='rafaleStepField' constructorParams='this'/> </cell> </row> </Table> 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 5531d70..9a7183f 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 @@ -359,7 +359,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { e.consume(); - Float step = (Float) SpeciesFrequencyUIHandler.this.ui.getRafaleStepField().getModel(); + Float step = (Float) SpeciesFrequencyUIHandler.this.ui.getRafaleStepField().getModel().getNumberValue(); applyRafaleStep(step, false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index 74e996c..5fc004c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -100,7 +100,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa * * @since 0.2 */ - protected float step; + protected Float step; /** * Min step to auto generate length steps. @@ -195,12 +195,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa return new SpeciesBatchRowModel(weightUnit, sampleCategoryModel); } -// @Override -// public void setRows(List<SpeciesFrequencyRowModel> rows) { -// super.setRows(rows); -// setEmptyRows(Sets.<SpeciesFrequencyRowModel>newHashSet()); -// } - public FrequencyConfigurationMode getConfigurationMode() { return configurationMode; } @@ -214,11 +208,11 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChange(PROPERTY_SIMPLE_COUNTING_MODE, null, isSimpleCountingMode()); } - public float getStep() { + public Float getStep() { return step; } - public void setStep(float step) { + public void setStep(Float step) { Object oldValue = getStep(); this.step = step; firePropertyChange(PROPERTY_STEP, oldValue, step); 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 da357ea..d510355 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,7 +41,7 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor; import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.editor.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -301,7 +301,9 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend @Override protected void initUIComponent(Object component) { - if (component instanceof JXTitledPanel) { + if (component instanceof NumberEditor) { + initNumberEditor((NumberEditor) component); + } else if (component instanceof JXTitledPanel) { initJXTitledPanel((JXTitledPanel) component); } else if (component instanceof ButtonAttachment) { @@ -364,6 +366,25 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend } } + protected void initNumberEditor(NumberEditor editor) { + if (log.isDebugEnabled()) { + log.debug("init number editor " + editor.getName()); + } + editor.init(); + + // Force binding if value is already in model + Number model = editor.getModel().getNumberValue(); + if (model != null) { + editor.setNumberValue(null); + editor.setNumberValue(model); + } + + if (isAutoSelectOnFocus(editor)) { + + addAutoSelectOnFocus(editor.getTextField()); + } + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx index 12a4201..1b976c8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx @@ -17,21 +17,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<jaxx.runtime.swing.editor.NumberEditor genericType='E extends Number'> +<org.nuiton.jaxx.widgets.number.NumberEditor genericType='E extends Number'> <import> java.awt.Color </import> - <String id='property' javaBean='ComputableData.PROPERTY_DATA'/> - - <ComputableData id='bean' genericType='E' javaBean='null'/> - <Color id='computedDataColor' javaBean='null'/> - <!-- ui handler --> - <ComputableDataEditorHandler id='handler' constructorParams='this'/> - <Integer id='decimalNumber' javaBean='null'/> <script><![CDATA[ @@ -40,10 +33,12 @@ super.setBean(bean); } + public void init() { super.setProperty(ComputableData.PROPERTY_DATA); super.init(); } + public void setProperty(String property) { // cannot change the property } ]]> </script> -</jaxx.runtime.swing.editor.NumberEditor> +</org.nuiton.jaxx.widgets.number.NumberEditor> 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 2d445f0..3686b3a 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 @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.util.computable; /* @@ -23,10 +22,11 @@ package fr.ifremer.tutti.ui.swing.util.computable; * #L% */ -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.util.Weights; import jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.editor.NumberEditorHandler; +import org.nuiton.jaxx.widgets.number.NumberEditorHandler; +import org.nuiton.jaxx.widgets.number.NumberEditorModel; import javax.swing.JTextField; import java.awt.Color; @@ -44,10 +44,6 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { protected Integer decimalNumber; - public ComputableDataEditorHandler(ComputableDataEditor ui) { - super(ui); - } - @Override public void init() { final PropertyChangeListener l = new PropertyChangeListener() { @@ -57,11 +53,11 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { } }; - ComputableData bean = (ComputableData) editor.getBean(); + ComputableData bean = (ComputableData) ui.getModel().getBean(); if (bean != null) { bean.addPropertyChangeListener(l); } - editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_BEAN, new PropertyChangeListener() { + ui.getModel().addPropertyChangeListener(NumberEditorModel.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -77,15 +73,16 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { } }); - editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_MODEL, l); + //FIXME NumberEditor +// ui.addPropertyChangeListener(ComputableDataEditor.PROPERTY_MODEL, l); - editor.getTextField().addFocusListener(new FocusListener() { + ui.getTextField().addFocusListener(new FocusListener() { public void focusGained(FocusEvent e) { - JTextField tf = editor.getTextField(); + JTextField tf = ui.getTextField(); tf.setFont(TuttiUI.TEXTFIELD_NORMAL_FONT); tf.setForeground(Color.BLACK); - if (editor.getModel() == null) { + if (ui.getModel() == null) { tf.setText(""); } } @@ -95,31 +92,34 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { } }); - editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_DECIMAL_NUMBER, - new PropertyChangeListener() { + ui.addPropertyChangeListener(ComputableDataEditor.PROPERTY_DECIMAL_NUMBER, + new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - decimalNumber = (Integer) evt.getNewValue(); - } - }); + public void propertyChange(PropertyChangeEvent evt) { + decimalNumber = (Integer) evt.getNewValue(); + } + }); - decimalNumber = ((ComputableDataEditor) editor).getDecimalNumber(); + decimalNumber = ((ComputableDataEditor) ui).getDecimalNumber(); super.init(); } protected void setComputedTextIfNullModel() { - ComputableData bean = (ComputableData) editor.getBean(); - JTextField tf = editor.getTextField(); - if (bean != null && editor.getModel() == null) { + ComputableData bean = (ComputableData) ui.getModel().getBean(); + JTextField tf = ui.getTextField(); +// if (bean != null && ui.getModel() == null) { + //FIXME NumberEditor + if (bean != null) { tf.setFont(TuttiUI.TEXTFIELD_COMPUTED_FONT); - tf.setForeground(((ComputableDataEditor) editor).getComputedDataColor()); + tf.setForeground(((ComputableDataEditor) ui).getComputedDataColor()); String modelText; Number computedData = bean.getComputedData(); - if (editor.isUseFloat() - && decimalNumber != null && computedData != null) { +// if (ui.isUseFloat() && decimalNumber != null && computedData != null) { + //FIXME NumberEditor + if (decimalNumber != null && computedData != null) { DecimalFormat decimalFormat = Weights.getDecimalFormat(1, decimalNumber); modelText = decimalFormat.format(computedData); } else { 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 7c6b0b1..3465ea9 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 @@ -22,9 +22,9 @@ package fr.ifremer.tutti.ui.swing.util.computable; * #L% */ -import fr.ifremer.tutti.util.Weights; 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 javax.swing.AbstractCellEditor; @@ -43,6 +43,7 @@ import java.awt.Component; import java.awt.Font; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import java.io.Serializable; import java.text.DecimalFormat; /** @@ -103,9 +104,8 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { numberEditor.setSelectAllTextOnError(true); numberEditor.setNumberPattern(numberPattern); - numberEditor.setModelType(type); + numberEditor.setNumberType(type); numberEditor.setUseSign(useSign); - numberEditor.setUseFloat(useFloat); numberEditor.setDecimalNumber(decimalNumber); numberEditor.init(); } @@ -115,12 +115,13 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { boolean isSelected, int row, int column) { data = (ComputableData) value; - numberEditor.setModel(data.getData()); + numberEditor.setNumberValue(data.getData()); // Check nullity and set the text that will be selected with the current value - if (data.getData() != null) { - numberEditor.setModelText(String.valueOf(data.getData())); - } + //FIXME NumberEditor +// if (data.getData() != null) { +// numberEditor.getModel().setTextValue(String.valueOf(data.getData())); +// } return numberEditor; } @@ -170,9 +171,9 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { boolean result = super.stopCellEditing(); // Reset previous data to avoid keeping it on other cell edition if (result) { - data.setData(numberEditor.getModel()); + data.setData(numberEditor.getModel().getNumberValue()); - numberEditor.setBean(null); + numberEditor.setBean((Serializable) null); data = null; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css index c5ed36c..bb5ffbd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css @@ -30,8 +30,7 @@ } #editor { - modelType: {Float.class}; - useFloat: true; + numberType: {Float.class}; useSign: false; autoPopup: false; showPopupButton: true; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx index 0d4298a..ab72539 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx @@ -26,7 +26,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor </import> <script><![CDATA[ @@ -59,8 +59,7 @@ public Float openAndGetWeightValue(WeightUnit weightUnit) { </row> </Table> <JPanel layout='{new GridLayout(1,0)}' constraints='BorderLayout.SOUTH'> - <JButton id='cancelButton' - onActionPerformed='editor.setModel(null); dispose();'/> + <JButton id='cancelButton' onActionPerformed='editor.getModel().setNumberValue(null); dispose();'/> <JButton id='validateButton' onActionPerformed='dispose();'/> </JPanel> </JDialog> 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 0412d4a..3ff73b9 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 @@ -85,7 +85,7 @@ public class EnterMelagWeightUIHandler extends AbstractTuttiUIHandler<TuttiUICon ui.pack(); ui.getEditor().requestFocusInWindow(); ui.setVisible(true); - Number weight = ui.getEditor().getModel(); + Number weight = ui.getEditor().getModel().getNumberValue(); return weight == null ? null : weight.floatValue(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit a0718dee5188e72dca28186870384936902a90d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 1 17:48:48 2015 +0100 merge rate... --- pom.xml | 6 ++- tutti-ui-swing/pom.xml | 4 ++ .../tutti/ui/swing/content/cruise/EditCruiseUI.css | 4 +- .../ui/swing/content/cruise/EditCruiseUI.jaxx | 2 +- .../content/operation/EditFishingOperationUI.css | 61 ++++++---------------- .../content/operation/EditFishingOperationUI.jaxx | 22 ++++---- .../content/operation/catches/EditCatchesUI.css | 14 ++--- .../operation/catches/SampleCategoryComponent.java | 16 +++--- .../accidental/create/CreateAccidentalBatchUI.css | 11 ++-- .../accidental/create/CreateAccidentalBatchUI.jaxx | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 10 ++-- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../benthos/create/CreateBenthosBatchUI.css | 11 ++-- .../benthos/create/CreateBenthosBatchUI.jaxx | 2 +- .../benthos/frequency/BenthosFrequencyUI.css | 34 ++++-------- .../benthos/frequency/BenthosFrequencyUI.jaxx | 2 +- .../frequency/BenthosFrequencyUIHandler.java | 2 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 8 +-- .../IndividualObservationBatchUI.jaxx | 2 +- .../create/CreateIndividualObservationBatchUI.css | 6 +-- .../create/CreateIndividualObservationBatchUI.jaxx | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 6 +-- .../catches/marinelitter/MarineLitterBatchUI.css | 6 +-- .../create/CreateMarineLitterBatchUI.css | 6 +-- .../create/CreateMarineLitterBatchUI.jaxx | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 10 ++-- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../species/create/CreateSpeciesBatchUI.css | 11 ++-- .../species/create/CreateSpeciesBatchUI.jaxx | 2 +- .../species/frequency/SpeciesFrequencyUI.css | 34 ++++-------- .../species/frequency/SpeciesFrequencyUI.jaxx | 2 +- .../frequency/SpeciesFrequencyUIHandler.java | 2 +- .../species/frequency/SpeciesFrequencyUIModel.java | 8 +-- .../ui/swing/util/AbstractTuttiUIHandler.java | 25 ++++++++- .../fr/ifremer/tutti/ui/swing/util/TuttiUI.java | 8 +++ .../util/computable/ComputableDataEditor.jaxx | 13 ++--- .../computable/ComputableDataEditorHandler.java | 52 +++++++++--------- .../util/computable/ComputableDataTableCell.java | 19 +++---- .../ui/swing/util/species/EnterMelagWeightUI.css | 3 +- .../ui/swing/util/species/EnterMelagWeightUI.jaxx | 5 +- .../util/species/EnterMelagWeightUIHandler.java | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 8 +-- 42 files changed, 208 insertions(+), 245 deletions(-) diff --git a/pom.xml b/pom.xml index 492c71b..10c8902 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,11 @@ <artifactId>jaxx-application-swing</artifactId> <version>${jaxxVersion}</version> </dependency> - + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + <version>${jaxxVersion}</version> + </dependency> <!-- SwingX --> <dependency> <groupId>org.swinglabs.swingx</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 1712f52..d84ffcc 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -204,6 +204,10 @@ </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-number</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-application-api</artifactId> </dependency> <dependency> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css index 37c8da5..9e34c20 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css @@ -198,8 +198,8 @@ JTextField { #multirigNumberField { property: multirigNumber; - model: {model.getMultirigNumber()}; - useFloat: false; + numberValue: {model.getMultirigNumber()}; + numberType:{Integer.class}; numberPattern: {INT_1_DIGITS_PATTERN}; _validatorLabel: {t("tutti.editCruise.field.multirigNumber")}; _help: {"tutti.editCruise.field.multirigNumber.help"}; 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 d34d290..5258cc7 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 @@ -34,7 +34,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor jaxx.runtime.swing.editor.SimpleTimeEditor jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css index dede964..2668220 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css @@ -66,6 +66,13 @@ JXDatePicker { _selectOnFocus: {true}; } +.degreDecimal { + numberType: {Float.class}; + numberPattern: {SIGNED_DECIMAL3_PATTERN}; + useSign: true; + showReset: false; +} + #editFishingOperationTopPanel { _help: {"tutti.editFishingOperation.help"}; } @@ -123,8 +130,8 @@ JXDatePicker { #fishingOperationNumberField { property: fishingOperationNumber; - model: {model.getFishingOperationNumber()}; - useFloat: false; + numberValue: {model.getFishingOperationNumber()}; + numberType:{Integer.class}; numberPattern: {INT_6_DIGITS_PATTERN}; _validatorLabel: {t("tutti.editFishingOperation.field.fishingOperationNumber")}; _help: {"tutti.editFishingOperation.field.fishingOperationNumber.help"}; @@ -315,32 +322,6 @@ CardLayout2Ext { _help: {"tutti.editFishingOperation.field.secondaryVessel.help"}; } -.degree { - showReset: false; - useFloat: false; - useSign: true; -} - -.minute { - showReset: false; - useFloat: false; - useSign: false; - numberPattern: {INT_2_DIGITS_PATTERN}; -} - -.decimalMinute { - showReset: false; - useFloat: true; - useSign: false; -} - -.second { - showReset: false; - useFloat: false; - useSign: false; - numberPattern: {INT_2_DIGITS_PATTERN}; -} - /****************************************************************************** * Start Latitude *****************************************************************************/ @@ -353,10 +334,7 @@ CardLayout2Ext { #gearShootingStartLatitudeDDField { property: gearShootingStartLatitude; - model: {model.getGearShootingStartLatitude()}; - showReset: false; - useFloat: true; - useSign: true; + numberValue: {model.getGearShootingStartLatitude()}; _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLatitude")}; toolTipText: "tutti.editFishingOperation.field.gearShootingStartLatitude.tip"; } @@ -393,10 +371,7 @@ CardLayout2Ext { #gearShootingStartLongitudeDDField { property: gearShootingStartLongitude; - model: {model.getGearShootingStartLongitude()}; - showReset: false; - useFloat: true; - useSign: true; + numberValue: {model.getGearShootingStartLongitude()}; _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingStartLongitude")}; toolTipText: "tutti.editFishingOperation.field.gearShootingStartLongitude.tip"; } @@ -435,10 +410,7 @@ CardLayout2Ext { #gearShootingEndLatitudeDDField { property: gearShootingEndLatitude; - model: {model.getGearShootingEndLatitude()}; - showReset: false; - useFloat: true; - useSign: true; + numberValue: {model.getGearShootingEndLatitude()}; _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLatitude")}; toolTipText: "tutti.editFishingOperation.field.gearShootingEndLatitude.tip"; } @@ -475,10 +447,7 @@ CardLayout2Ext { #gearShootingEndLongitudeDDField { property: gearShootingEndLongitude; - model: {model.getGearShootingEndLongitude()}; - showReset: false; - useFloat: true; - useSign: true; + numberValue: {model.getGearShootingEndLongitude()}; _validatorLabel: {t("tutti.editFishingOperation.field.gearShootingEndLongitude")}; toolTipText: "tutti.editFishingOperation.field.gearShootingEndLongitude.tip"; } @@ -578,8 +547,8 @@ CardLayout2Ext { #trawlDistanceField { property: trawlDistance; - model: {model.getTrawlDistance()}; - useFloat: false; + numberValue: {model.getTrawlDistance()}; + numberType:{Integer.class}; numberPattern: {INT_6_DIGITS_PATTERN}; enabled: {!model.isFishingOperationRectiligne()}; toolTipText: {handler.getTrawlDistanceTooltipText(model.getTrawlDistance())}; 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 909b0d3..06d3d79 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 @@ -39,7 +39,7 @@ jaxx.runtime.swing.editor.bean.BeanFilterableComboBox jaxx.runtime.swing.editor.bean.BeanDoubleList - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor jaxx.runtime.swing.editor.SimpleTimeEditor jaxx.runtime.swing.editor.gis.DmsCoordinateEditor jaxx.runtime.swing.editor.gis.DmdCoordinateEditor @@ -252,9 +252,8 @@ public EditFishingOperationUI(FishingOperationsUI parentUI) { </cell> <cell weightx='1'> <JPanel id='gearShootingStartLatitudePanel'> - <NumberEditor id='gearShootingStartLatitudeDDField' - constraints='"DD"' - constructorParams='this'/> + <NumberEditor id='gearShootingStartLatitudeDDField' styleClass="degreDecimal" + constraints='"DD"' constructorParams='this'/> <DmsCoordinateEditor constraints='"DMS"' id='gearShootingStartLatitudeDMSField'/> <DmdCoordinateEditor constraints='"DMD"' @@ -263,9 +262,8 @@ public EditFishingOperationUI(FishingOperationsUI parentUI) { </cell> <cell weightx='1'> <JPanel id='gearShootingStartLongitudePanel'> - <NumberEditor id='gearShootingStartLongitudeDDField' - constraints='"DD"' - constructorParams='this'/> + <NumberEditor id='gearShootingStartLongitudeDDField' styleClass="degreDecimal" + constraints='"DD"' constructorParams='this'/> <DmsCoordinateEditor constraints='"DMS"' id='gearShootingStartLongitudeDMSField'/> <DmdCoordinateEditor constraints='"DMD"' @@ -287,9 +285,8 @@ public EditFishingOperationUI(FishingOperationsUI parentUI) { </cell> <cell weightx='1'> <JPanel id='gearShootingEndLatitudePanel'> - <NumberEditor id='gearShootingEndLatitudeDDField' - constraints='"DD"' - constructorParams='this'/> + <NumberEditor id='gearShootingEndLatitudeDDField' styleClass="degreDecimal" + constraints='"DD"' constructorParams='this'/> <DmsCoordinateEditor constraints='"DMS"' id='gearShootingEndLatitudeDMSField'/> <DmdCoordinateEditor constraints='"DMD"' @@ -298,9 +295,8 @@ public EditFishingOperationUI(FishingOperationsUI parentUI) { </cell> <cell weightx='1'> <JPanel id='gearShootingEndLongitudePanel'> - <NumberEditor id='gearShootingEndLongitudeDDField' - constraints='"DD"' - constructorParams='this'/> + <NumberEditor id='gearShootingEndLongitudeDDField' styleClass="degreDecimal" + constraints='"DD"' constructorParams='this'/> <DmsCoordinateEditor constraints='"DMS"' id='gearShootingEndLongitudeDMSField'/> <DmdCoordinateEditor constraints='"DMD"' diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css index 098681d..0a4d207 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css @@ -25,14 +25,14 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - useFloat: true; + numberType: {Float.class}; } ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -94,7 +94,7 @@ ComputableDataEditor { #catchTotalWeightField { bean: {model.getCatchTotalComputedOrNotWeight()}; - model: {model.getCatchTotalWeight()}; + numberValue: {model.getCatchTotalWeight()}; _help: {"tutti.editCatchBatch.field.catchTotalWeight.help"}; } @@ -154,7 +154,7 @@ ComputableDataEditor { #catchTotalRejectedWeightField { bean: {model.getCatchTotalRejectedComputedOrNotWeight()}; - model: {model.getCatchTotalRejectedWeight()}; + numberValue: {model.getCatchTotalRejectedWeight()}; _help: {"tutti.editCatchBatch.field.catchTotalRejectedWeight.help"}; _validatorLabel: {t("tutti.editCatchBatch.field.catchTotalRejectedWeight")}; } @@ -207,7 +207,7 @@ ComputableDataEditor { #speciesTotalSortedWeightField { bean: {model.getSpeciesTotalSortedComputedOrNotWeight()}; - model: {model.getSpeciesTotalSortedWeight()}; + numberValue: {model.getSpeciesTotalSortedWeight()}; _help: {"tutti.editCatchBatch.field.speciesTotalSortedWeight.help"}; } @@ -273,7 +273,7 @@ ComputableDataEditor { #benthosTotalSortedWeightField { bean: {model.getBenthosTotalSortedComputedOrNotWeight()}; - model: {model.getBenthosTotalSortedWeight()}; + numberValue: {model.getBenthosTotalSortedWeight()}; _help: {"tutti.editCatchBatch.field.benthosTotalSortedWeight.help"}; } @@ -324,7 +324,7 @@ ComputableDataEditor { #marineLitterTotalWeightField { bean: {model.getMarineLitterTotalComputedOrNotWeight()}; - model: {model.getMarineLitterTotalWeight()}; + numberValue: {model.getMarineLitterTotalWeight()}; _help: {"tutti.editCatchBatch.field.marineLitterTotalWeight.help"}; } 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 5f8c805..bc138af 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 @@ -25,7 +25,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import jaxx.runtime.swing.editor.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import org.apache.commons.lang3.StringUtils; import org.nuiton.decorator.Decorator; @@ -100,7 +100,7 @@ public class SampleCategoryComponent { numberEditor.getTextField().setBorder(null); numberEditor.getTextField().addFocusListener(this); numberEditor.getTextField().addAncestorListener(this); - numberEditor.setModelType(Float.class); + numberEditor.setNumberType(Float.class); numberEditor.setUseSign(false); numberEditor.setNumberPattern(weightUnit.getNumberEditorPattern()); numberEditor.init(); @@ -128,14 +128,14 @@ public class SampleCategoryComponent { C categoryValue = sampleCategory == null ? null : sampleCategory.getCategoryValue(); Float number = sampleCategory == null ? null : sampleCategory.getCategoryWeight(); - numberEditor.setModel(number); + numberEditor.setNumberValue(number); // Check nullity and set the text that will be selected with the current value if (number == null) { - numberEditor.setModelText(""); + numberEditor.getModel().setTextValue(""); } else { // numberEditor.setModelText(String.valueOf(number)); - numberEditor.setModelText(weightUnit.renderWeight(number)); + numberEditor.getModel().setTextValue(weightUnit.renderWeight(number)); } String label = sampleCategory == null ? "-" : @@ -155,7 +155,7 @@ public class SampleCategoryComponent { @Override public Float getCellEditorValue() { - return (Float) numberEditor.getModel(); + return (Float) numberEditor.getModel().getNumberValue(); } @Override @@ -207,9 +207,9 @@ public class SampleCategoryComponent { } protected void resetEditor() { - numberEditor.setModel(null); + numberEditor.setNumberValue(null); // Use empty string, otherwise there is a NPE in NumberEditorHandler - numberEditor.setModelText(""); + numberEditor.getModel().setTextValue(""); editorLabel.setText("-"); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css index 934c90b..2b382ac 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css @@ -28,6 +28,7 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; + bean: {model}; } #createAccidentalBatchTopPanel { @@ -70,9 +71,8 @@ NumberEditor { #accidentalWeightField { property: weight; - useFloat: true; - bean: {model}; - model: {model.getWeight()}; + numberType: {Float.class}; + numberValue: {model.getWeight()}; _help: {"tutti.createAccidentalBatch.field.accidentalWeight.help"}; } @@ -85,10 +85,9 @@ NumberEditor { #accidentalSizeField { property: size; - useFloat: true; + numberType: {Float.class}; numberPattern: {DECIMAL3_PATTERN}; - bean: {model}; - model: {model.getSize()}; + numberValue: {model.getSize()}; _help: {"tutti.createAccidentalBatch.field.accidentalSize.help"}; } 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 f7e41e6..0c70d9f 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 @@ -34,7 +34,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t </import> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css index 5d44d45..9b74b5c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css @@ -25,7 +25,7 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - useFloat: true; + numberType: {Float.class}; _selectOnFocus: {true}; } @@ -33,7 +33,7 @@ ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -75,7 +75,7 @@ ComputableDataEditor { #benthosTotalSortedWeightField { bean: {model.getBenthosTotalSortedComputedOrNotWeight()}; - model: {model.getBenthosTotalSortedWeight()}; + numberValue: {model.getBenthosTotalSortedWeight()}; _help: {"tutti.editBenthosBatch.field.benthosTotalSortedWeight.help"}; } @@ -117,7 +117,7 @@ ComputableDataEditor { #benthosTotalInertWeightField { bean: {model.getBenthosTotalInertComputedOrNotWeight()}; - model: {model.getBenthosTotalInertWeight()}; + numberValue: {model.getBenthosTotalInertWeight()}; _help: {"tutti.editBenthosBatch.field.benthosTotalInertWeight.help"}; } @@ -131,7 +131,7 @@ ComputableDataEditor { #benthosTotalLivingNotItemizedWeightField { bean: {model.getBenthosTotalLivingNotItemizedComputedOrNotWeight()}; - model: {model.getBenthosTotalLivingNotItemizedWeight()}; + numberValue: {model.getBenthosTotalLivingNotItemizedWeight()}; _help: {"tutti.editBenthosBatch.field.benthosTotalLivingNotItemizedWeight.help"}; } 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 6d8ba7c..9cc5688 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 @@ -69,7 +69,7 @@ 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.editor.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -1106,7 +1106,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent NumberEditor editor = new NumberEditor(); editor.setNumberPattern(TuttiUI.DECIMAL3_PATTERN); editor.setUseSign(false); - editor.setUseFloat(true); +// editor.setUseFloat(true); editor.setShowPopupButton(false); editor.setShowReset(false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css index 0b739c7..75e1332 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css @@ -29,6 +29,7 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; + bean: {model}; } #createBenthosBatchTopPanel { @@ -76,9 +77,8 @@ NumberEditor { #batchWeightField { property: batchWeight; - model: {model.getBatchWeight()}; - useFloat: true; - bean: {model}; + numberValue: {model.getBatchWeight()}; + numberType: {Float.class}; _help: {"tutti.createBenthosBatch.field.batchWeight.help"}; } @@ -91,10 +91,9 @@ NumberEditor { #batchCountField { property: batchCount; - model: {model.getBatchCount()}; - useFloat: false; + numberValue: {model.getBatchCount()}; + numberType: {Integer.class}; numberPattern: {INT_6_DIGITS_PATTERN}; - bean: {model}; _help: {"tutti.createBenthosBatch.field.batchCount.help"}; } 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 6db38ae..42124f7 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 @@ -34,7 +34,7 @@ org.jdesktop.swingx.JXTable jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor java.awt.Color javax.swing.ListSelectionModel diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css index 3f5e8e5..a1b43ce 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css @@ -28,13 +28,17 @@ BeanFilterableComboBox { NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; + bean: {model}; + numberType: {Float.class}; + showReset: true; + _selectOnFocus: true; } ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -52,12 +56,9 @@ ComputableDataEditor { #stepField { property: step; - model: {model.getStep()}; - useFloat: true; + numberValue: {model.getStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; enabled: {!model.isSimpleCountingMode() && model.isCanEditLengthStep()}; - _selectOnFocus: true; _validatorLabel: {t("tutti.editBenthosFrequencies.field.step")}; _help: {"tutti.editBenthosFrequencies.field.step.help"}; } @@ -88,7 +89,7 @@ ComputableDataEditor { #totalWeightField { bean: {model.getTotalComputedOrNotWeight()}; - model: {model.getTotalWeight()}; + numberValue: {model.getTotalWeight()}; _validatorLabel: {t("tutti.editBenthosFrequencies.field.totalWeight")}; _help: {"tutti.editBenthosFrequencies.field.totalWeight.help"}; } @@ -118,12 +119,8 @@ ComputableDataEditor { #minStepField { property: minStep; - model: {model.getMinStep()}; - useFloat: true; - showReset: true; + numberValue: {model.getMinStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; - _selectOnFocus: true; _help: {"tutti.editBenthosFrequencies.field.minStep.help"}; } @@ -136,12 +133,8 @@ ComputableDataEditor { #maxStepField { property: maxStep; - model: {model.getMaxStep()}; - useFloat: true; - showReset: true; + numberValue: {model.getMaxStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; - _selectOnFocus: true; _help: {"tutti.editBenthosFrequencies.field.maxStep.help"}; } @@ -153,12 +146,8 @@ ComputableDataEditor { } #rafaleStepField { - modelType: {Float.class}; - useFloat: true; - showReset: true; numberPattern: {DECIMAL1_PATTERN}; enabled: {model.getLengthStepCaracteristic() != null}; - _selectOnFocus: true; _help: {"tutti.editBenthosFrequencies.field.rafaleStep.help"}; } @@ -230,11 +219,8 @@ ComputableDataEditor { #simpleCountingField { property: simpleCount; - model: {model.getSimpleCount()}; - useFloat: false; - showReset: true; + numberValue: {model.getSimpleCount()}; numberPattern: {TuttiUI.INT_6_DIGITS_PATTERN}; - bean: {model}; _help: {"tutti.editBenthosFrequencies.field.simpleCounting.help"}; } 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 3c90364..2f81bba 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 @@ -39,7 +39,7 @@ jaxx.runtime.swing.CardLayout2Ext jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable 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 a2c409e..b9e15de 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 @@ -234,7 +234,7 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { e.consume(); - Float step = (Float) BenthosFrequencyUIHandler.this.ui.getRafaleStepField().getModel(); + Float step = (Float) BenthosFrequencyUIHandler.this.ui.getRafaleStepField().getModel().getNumberValue(); applyBenthosFrequencyRafaleAction.applyRafaleStep(step, false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java index e8b375f..e2e5392 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java @@ -108,7 +108,7 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa * * @since 0.2 */ - protected float step; + protected Float step; /** * Min step to auto generate length steps. @@ -209,7 +209,7 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa dataset = new XYSeriesCollection(series); dataset.setIntervalPositionFactor(0); - dataset.setIntervalWidth(step); + dataset.setIntervalWidth(0); } public void reloadRows() { @@ -293,11 +293,11 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa firePropertyChange(PROPERTY_SIMPLE_COUNTING_MODE, null, isSimpleCountingMode()); } - public float getStep() { + public Float getStep() { return step; } - public void setStep(float step) { + public void setStep(Float step) { Object oldValue = getStep(); this.step = step; firePropertyChange(PROPERTY_STEP, oldValue, step); 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 50b023a..707cc0f 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 @@ -33,7 +33,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css index f63f99d..2da9999 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css @@ -28,7 +28,7 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; - useFloat: true; + numberType: {Float.class}; showReset: true; } @@ -68,7 +68,7 @@ NumberEditor { #individualObservationWeightField { property: weight; - model: {model.getWeight()}; + numberValue: {model.getWeight()}; _help: {"tutti.createIndividualObservationBatch.field.individualObservationWeight.help"}; } @@ -81,7 +81,7 @@ NumberEditor { #individualObservationSizeField { property: size; - model: {model.getSize()}; + numberValue: {model.getSize()}; _help: {"tutti.createIndividualObservationBatch.field.individualObservationSize.help"}; } 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 6b20d74..a92d369 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 @@ -34,7 +34,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t </import> 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 6a318e6..594b8f3 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 @@ -42,7 +42,7 @@ 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.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -167,7 +167,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa String name = caracteristic.getId() + "CaracteristicField"; numberEditor.setName(name); numberEditor.setProperty(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY); - numberEditor.setUseFloat(true); +// numberEditor.setUseFloat(true); numberEditor.setShowReset(true); numberEditor.setBean(editorModel); numberEditor.setAutoPopup(getConfig().isAutoPopupNumberEditor()); @@ -177,7 +177,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - numberEditor.setModel((Number) evt.getNewValue()); + numberEditor.setNumberValue((Number) evt.getNewValue()); } }); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css index b06c559..850577f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css @@ -24,9 +24,6 @@ ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; - /*numberPattern: {DECIMAL3_PATTERN}; - decimalNumber: 3;*/ computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -54,7 +51,8 @@ ComputableDataEditor { #marineLitterTotalWeightField { bean: {model.getMarineLitterTotalComputedOrNotWeight()}; - model: {model.getMarineLitterTotalWeight()}; + numberType: {Float.class}; + numberValue: {model.getMarineLitterTotalWeight()}; _help: {"tutti.editMarineLitterBatch.field.marineLitterTotalWeight.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css index 39f3702..c9aed46 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css @@ -29,7 +29,7 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - useFloat: true; + numberType: {Float.class}; } #createMarineLitterBatchTopPanel { @@ -71,7 +71,7 @@ NumberEditor { #marineLitterNumberField { property: number; - model: {model.getNumber()}; + numberValue: {model.getNumber()}; numberPattern: {DECIMAL3_PATTERN}; _help: {"tutti.createMarineLitterBatch.field.number.help"}; } @@ -86,7 +86,7 @@ NumberEditor { #marineLitterWeightField { property: weight; - model: {model.getWeight()}; + numberValue: {model.getWeight()}; _help: {"tutti.createMarineLitterBatch.field.weight.help"}; } 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 5107650..c1220d9 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 @@ -31,7 +31,7 @@ fr.ifremer.tutti.ui.swing.util.TuttiUIUtil jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor static org.nuiton.i18n.I18n.t </import> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css index e15cd97..cf4b6c4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css @@ -25,7 +25,7 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; bean: {model}; showReset: true; - useFloat: true; + numberType: {Float.class}; _selectOnFocus: {true}; } @@ -33,7 +33,7 @@ ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -75,7 +75,7 @@ ComputableDataEditor { #speciesTotalSortedWeightField { bean: {model.getSpeciesTotalSortedComputedOrNotWeight()}; - model: {model.getSpeciesTotalSortedWeight()}; + numberValue: {model.getSpeciesTotalSortedWeight()}; _help: {"tutti.editSpeciesBatch.field.speciesTotalSortedWeight.help"}; } @@ -117,7 +117,7 @@ ComputableDataEditor { #speciesTotalInertWeightField { bean: {model.getSpeciesTotalInertComputedOrNotWeight()}; - model: {model.getSpeciesTotalInertWeight()}; + numberValue: {model.getSpeciesTotalInertWeight()}; _help: {"tutti.editSpeciesBatch.field.speciesTotalInertWeight.help"}; } @@ -131,7 +131,7 @@ ComputableDataEditor { #speciesTotalLivingNotItemizedWeightField { bean: {model.getSpeciesTotalLivingNotItemizedComputedOrNotWeight()}; - model: {model.getSpeciesTotalLivingNotItemizedWeight()}; + numberValue: {model.getSpeciesTotalLivingNotItemizedWeight()}; _help: {"tutti.editSpeciesBatch.field.speciesTotalLivingNotItemizedWeight.help"}; } 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 6e132a0..c6bb1b8 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 @@ -69,7 +69,7 @@ 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.editor.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; @@ -1113,7 +1113,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec NumberEditor editor = new NumberEditor(); editor.setNumberPattern(TuttiUI.DECIMAL3_PATTERN); editor.setUseSign(false); - editor.setUseFloat(true); +// editor.setUseFloat(true); editor.setShowPopupButton(false); editor.setShowReset(false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css index 29b07d3..271a302 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css @@ -29,6 +29,7 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; + bean: {model}; } #createSpeciesBatchTopPanel { @@ -76,9 +77,8 @@ NumberEditor { #batchWeightField { property: batchWeight; - model: {model.getBatchWeight()}; - useFloat: true; - bean: {model}; + numberValue: {model.getBatchWeight()}; + numberType: {Float.class}; _help: {"tutti.createSpeciesBatch.field.batchWeight.help"}; } @@ -91,10 +91,9 @@ NumberEditor { #batchCountField { property: batchCount; - model: {model.getBatchCount()}; - useFloat: false; + numberValue: {model.getBatchCount()}; + numberType: {Integer.class}; numberPattern: {INT_6_DIGITS_PATTERN}; - bean: {model}; _help: {"tutti.createSpeciesBatch.field.batchCount.help"}; } 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 c2c45aa..f5eef9f 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 @@ -34,7 +34,7 @@ org.jdesktop.swingx.JXTable jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor java.awt.Color javax.swing.ListSelectionModel diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css index 8bea573..6aa423d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css @@ -28,13 +28,17 @@ BeanFilterableComboBox { NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; + bean: {model}; + numberType: {Float.class}; + showReset: true; + _selectOnFocus: true; } ComputableDataEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; - useFloat: true; + numberType: {Float.class}; computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -52,12 +56,9 @@ ComputableDataEditor { #stepField { property: step; - model: {model.getStep()}; - useFloat: true; + numberValue: {model.getStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; enabled: {!model.isSimpleCountingMode() && model.isCanEditLengthStep()}; - _selectOnFocus: true; _validatorLabel: {t("tutti.editSpeciesFrequencies.field.step")}; _help: {"tutti.editSpeciesFrequencies.field.step.help"}; } @@ -88,7 +89,7 @@ ComputableDataEditor { #totalWeightField { bean: {model.getTotalComputedOrNotWeight()}; - model: {model.getTotalWeight()}; + numberValue: {model.getTotalWeight()}; _validatorLabel: {t("tutti.editSpeciesFrequencies.field.totalWeight")}; _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"}; } @@ -118,12 +119,8 @@ ComputableDataEditor { #minStepField { property: minStep; - model: {model.getMinStep()}; - useFloat: true; - showReset: true; + numberValue: {model.getMinStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; - _selectOnFocus: true; _help: {"tutti.editSpeciesFrequencies.field.minStep.help"}; } @@ -136,12 +133,8 @@ ComputableDataEditor { #maxStepField { property: maxStep; - model: {model.getMaxStep()}; - useFloat: true; - showReset: true; + numberValue: {model.getMaxStep()}; numberPattern: {DECIMAL1_PATTERN}; - bean: {model}; - _selectOnFocus: true; _help: {"tutti.editSpeciesFrequencies.field.maxStep.help"}; } @@ -153,12 +146,8 @@ ComputableDataEditor { } #rafaleStepField { - modelType: {Float.class}; - useFloat: true; - showReset: true; numberPattern: {DECIMAL1_PATTERN}; enabled: {model.getLengthStepCaracteristic() != null}; - _selectOnFocus: true; _help: {"tutti.editSpeciesFrequencies.field.rafaleStep.help"}; } @@ -230,11 +219,8 @@ ComputableDataEditor { #simpleCountingField { property: simpleCount; - model: {model.getSimpleCount()}; - useFloat: false; - showReset: true; + numberValue: {model.getSimpleCount()}; numberPattern: {TuttiUI.INT_6_DIGITS_PATTERN}; - bean: {model}; _help: {"tutti.editSpeciesFrequencies.field.simpleCounting.help"}; } 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 57b33b1..42f0911 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 @@ -39,7 +39,7 @@ jaxx.runtime.swing.CardLayout2Ext jaxx.runtime.swing.editor.bean.BeanFilterableComboBox - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor org.jdesktop.swingx.JXTable 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 16d0999..c8a0ee5 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 @@ -289,7 +289,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci public void keyReleased(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ENTER) { e.consume(); - Float step = (Float) SpeciesFrequencyUIHandler.this.ui.getRafaleStepField().getModel(); + Float step = (Float) SpeciesFrequencyUIHandler.this.ui.getRafaleStepField().getModel().getNumberValue(); applySpeciesFrequencyRafaleAction.applyRafaleStep(step, false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index d2899a2..60f3663 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -108,7 +108,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa * * @since 0.2 */ - protected float step; + protected Float step; /** * Min step to auto generate length steps. @@ -208,7 +208,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa dataset = new XYSeriesCollection(series); dataset.setIntervalPositionFactor(0); - dataset.setIntervalWidth(step); + dataset.setIntervalWidth(0); } public void reloadRows() { @@ -292,11 +292,11 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChange(PROPERTY_SIMPLE_COUNTING_MODE, null, isSimpleCountingMode()); } - public float getStep() { + public Float getStep() { return step; } - public void setStep(float step) { + public void setStep(Float step) { Object oldValue = getStep(); this.step = step; firePropertyChange(PROPERTY_STEP, oldValue, step); 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 da357ea..d510355 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,7 +41,7 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment; import fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor; import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.editor.NumberEditor; +import org.nuiton.jaxx.widgets.number.NumberEditor; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -301,7 +301,9 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend @Override protected void initUIComponent(Object component) { - if (component instanceof JXTitledPanel) { + if (component instanceof NumberEditor) { + initNumberEditor((NumberEditor) component); + } else if (component instanceof JXTitledPanel) { initJXTitledPanel((JXTitledPanel) component); } else if (component instanceof ButtonAttachment) { @@ -364,6 +366,25 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend } } + protected void initNumberEditor(NumberEditor editor) { + if (log.isDebugEnabled()) { + log.debug("init number editor " + editor.getName()); + } + editor.init(); + + // Force binding if value is already in model + Number model = editor.getModel().getNumberValue(); + if (model != null) { + editor.setNumberValue(null); + editor.setNumberValue(model); + } + + if (isAutoSelectOnFocus(editor)) { + + addAutoSelectOnFocus(editor.getTextField()); + } + } + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java index 7330de8..5d643d0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java @@ -35,6 +35,14 @@ import java.awt.Font; */ public interface TuttiUI<M, H extends AbstractTuttiUIHandler<M, ?>> extends ApplicationUI<M, H> { + /** + * Pattern to use for signed decimal numeric values with 3 decimal digits in + * editors. + * + * @since 0.1 + */ + public static final String SIGNED_DECIMAL3_PATTERN = "-?\\d{0,3}(\\.\\d{0,3})?"; + Font TEXTFIELD_NORMAL_FONT = UIManager.getDefaults().getFont("TextField.font"); Font TEXTFIELD_COMPUTED_FONT = UIManager.getDefaults().getFont("TextField.font").deriveFont(Font.ITALIC); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx index 12a4201..1b976c8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditor.jaxx @@ -17,21 +17,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<jaxx.runtime.swing.editor.NumberEditor genericType='E extends Number'> +<org.nuiton.jaxx.widgets.number.NumberEditor genericType='E extends Number'> <import> java.awt.Color </import> - <String id='property' javaBean='ComputableData.PROPERTY_DATA'/> - - <ComputableData id='bean' genericType='E' javaBean='null'/> - <Color id='computedDataColor' javaBean='null'/> - <!-- ui handler --> - <ComputableDataEditorHandler id='handler' constructorParams='this'/> - <Integer id='decimalNumber' javaBean='null'/> <script><![CDATA[ @@ -40,10 +33,12 @@ super.setBean(bean); } + public void init() { super.setProperty(ComputableData.PROPERTY_DATA); super.init(); } + public void setProperty(String property) { // cannot change the property } ]]> </script> -</jaxx.runtime.swing.editor.NumberEditor> +</org.nuiton.jaxx.widgets.number.NumberEditor> 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 2d445f0..3686b3a 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 @@ -1,4 +1,3 @@ - package fr.ifremer.tutti.ui.swing.util.computable; /* @@ -23,10 +22,11 @@ package fr.ifremer.tutti.ui.swing.util.computable; * #L% */ -import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.util.Weights; import jaxx.runtime.JAXXUtil; -import jaxx.runtime.swing.editor.NumberEditorHandler; +import org.nuiton.jaxx.widgets.number.NumberEditorHandler; +import org.nuiton.jaxx.widgets.number.NumberEditorModel; import javax.swing.JTextField; import java.awt.Color; @@ -44,10 +44,6 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { protected Integer decimalNumber; - public ComputableDataEditorHandler(ComputableDataEditor ui) { - super(ui); - } - @Override public void init() { final PropertyChangeListener l = new PropertyChangeListener() { @@ -57,11 +53,11 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { } }; - ComputableData bean = (ComputableData) editor.getBean(); + ComputableData bean = (ComputableData) ui.getModel().getBean(); if (bean != null) { bean.addPropertyChangeListener(l); } - editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_BEAN, new PropertyChangeListener() { + ui.getModel().addPropertyChangeListener(NumberEditorModel.PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -77,15 +73,16 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { } }); - editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_MODEL, l); + //FIXME NumberEditor +// ui.addPropertyChangeListener(ComputableDataEditor.PROPERTY_MODEL, l); - editor.getTextField().addFocusListener(new FocusListener() { + ui.getTextField().addFocusListener(new FocusListener() { public void focusGained(FocusEvent e) { - JTextField tf = editor.getTextField(); + JTextField tf = ui.getTextField(); tf.setFont(TuttiUI.TEXTFIELD_NORMAL_FONT); tf.setForeground(Color.BLACK); - if (editor.getModel() == null) { + if (ui.getModel() == null) { tf.setText(""); } } @@ -95,31 +92,34 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { } }); - editor.addPropertyChangeListener(ComputableDataEditor.PROPERTY_DECIMAL_NUMBER, - new PropertyChangeListener() { + ui.addPropertyChangeListener(ComputableDataEditor.PROPERTY_DECIMAL_NUMBER, + new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - decimalNumber = (Integer) evt.getNewValue(); - } - }); + public void propertyChange(PropertyChangeEvent evt) { + decimalNumber = (Integer) evt.getNewValue(); + } + }); - decimalNumber = ((ComputableDataEditor) editor).getDecimalNumber(); + decimalNumber = ((ComputableDataEditor) ui).getDecimalNumber(); super.init(); } protected void setComputedTextIfNullModel() { - ComputableData bean = (ComputableData) editor.getBean(); - JTextField tf = editor.getTextField(); - if (bean != null && editor.getModel() == null) { + ComputableData bean = (ComputableData) ui.getModel().getBean(); + JTextField tf = ui.getTextField(); +// if (bean != null && ui.getModel() == null) { + //FIXME NumberEditor + if (bean != null) { tf.setFont(TuttiUI.TEXTFIELD_COMPUTED_FONT); - tf.setForeground(((ComputableDataEditor) editor).getComputedDataColor()); + tf.setForeground(((ComputableDataEditor) ui).getComputedDataColor()); String modelText; Number computedData = bean.getComputedData(); - if (editor.isUseFloat() - && decimalNumber != null && computedData != null) { +// if (ui.isUseFloat() && decimalNumber != null && computedData != null) { + //FIXME NumberEditor + if (decimalNumber != null && computedData != null) { DecimalFormat decimalFormat = Weights.getDecimalFormat(1, decimalNumber); modelText = decimalFormat.format(computedData); } else { 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 7c6b0b1..3465ea9 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 @@ -22,9 +22,9 @@ package fr.ifremer.tutti.ui.swing.util.computable; * #L% */ -import fr.ifremer.tutti.util.Weights; 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 javax.swing.AbstractCellEditor; @@ -43,6 +43,7 @@ import java.awt.Component; import java.awt.Font; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; +import java.io.Serializable; import java.text.DecimalFormat; /** @@ -103,9 +104,8 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { numberEditor.setSelectAllTextOnError(true); numberEditor.setNumberPattern(numberPattern); - numberEditor.setModelType(type); + numberEditor.setNumberType(type); numberEditor.setUseSign(useSign); - numberEditor.setUseFloat(useFloat); numberEditor.setDecimalNumber(decimalNumber); numberEditor.init(); } @@ -115,12 +115,13 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { boolean isSelected, int row, int column) { data = (ComputableData) value; - numberEditor.setModel(data.getData()); + numberEditor.setNumberValue(data.getData()); // Check nullity and set the text that will be selected with the current value - if (data.getData() != null) { - numberEditor.setModelText(String.valueOf(data.getData())); - } + //FIXME NumberEditor +// if (data.getData() != null) { +// numberEditor.getModel().setTextValue(String.valueOf(data.getData())); +// } return numberEditor; } @@ -170,9 +171,9 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { boolean result = super.stopCellEditing(); // Reset previous data to avoid keeping it on other cell edition if (result) { - data.setData(numberEditor.getModel()); + data.setData(numberEditor.getModel().getNumberValue()); - numberEditor.setBean(null); + numberEditor.setBean((Serializable) null); data = null; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css index c5ed36c..bb5ffbd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.css @@ -30,8 +30,7 @@ } #editor { - modelType: {Float.class}; - useFloat: true; + numberType: {Float.class}; useSign: false; autoPopup: false; showPopupButton: true; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx index 0d4298a..ab72539 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/EnterMelagWeightUI.jaxx @@ -26,7 +26,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - jaxx.runtime.swing.editor.NumberEditor + org.nuiton.jaxx.widgets.number.NumberEditor </import> <script><![CDATA[ @@ -59,8 +59,7 @@ public Float openAndGetWeightValue(WeightUnit weightUnit) { </row> </Table> <JPanel layout='{new GridLayout(1,0)}' constraints='BorderLayout.SOUTH'> - <JButton id='cancelButton' - onActionPerformed='editor.setModel(null); dispose();'/> + <JButton id='cancelButton' onActionPerformed='editor.getModel().setNumberValue(null); dispose();'/> <JButton id='validateButton' onActionPerformed='dispose();'/> </JPanel> </JDialog> 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 0412d4a..3ff73b9 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 @@ -85,7 +85,7 @@ public class EnterMelagWeightUIHandler extends AbstractTuttiUIHandler<TuttiUICon ui.pack(); ui.getEditor().requestFocusInWindow(); ui.setVisible(true); - Number weight = ui.getEditor().getModel(); + Number weight = ui.getEditor().getModel().getNumberValue(); return weight == null ? null : weight.floatValue(); } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index a13da8f..3903951 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -736,18 +736,18 @@ tutti.editFishingOperation.field.gearShootingEnd.tip=Informations sur la fin de tutti.editFishingOperation.field.gearShootingEndDate=Date de fin de traîne tutti.editFishingOperation.field.gearShootingEndDay=Jour de fin de traîne tutti.editFishingOperation.field.gearShootingEndLatitude=Latitude de fin de traîne -tutti.editFishingOperation.field.gearShootingEndLatitude.tip=<html><body>Latitude de fin de traîne.<br/><strong>Attention, pour saisir une latitude négative en mode DD, il faut entrer -.XXX et non pas -0.XXX</strong></body></html> +tutti.editFishingOperation.field.gearShootingEndLatitude.tip=Latitude de fin de traîne tutti.editFishingOperation.field.gearShootingEndLongitude=Longitude de fin de traîne -tutti.editFishingOperation.field.gearShootingEndLongitude.tip=<html><body>Longitude de fin de traîne.<br/><strong>Attention, pour saisir une longitude négative en mode DD, il faut entrer -.XXX et non pas -0.XXX</strong></body></html> +tutti.editFishingOperation.field.gearShootingEndLongitude.tip=Longitude de fin de traîne tutti.editFishingOperation.field.gearShootingEndTime=Heure de fin de traîne tutti.editFishingOperation.field.gearShootingStart=Début de traîne tutti.editFishingOperation.field.gearShootingStart.tip=Informations sur le début de pêche tutti.editFishingOperation.field.gearShootingStartDate=Date de début de traîne tutti.editFishingOperation.field.gearShootingStartDay=Jour de début de traîne tutti.editFishingOperation.field.gearShootingStartLatitude=Latitude de début de traîne -tutti.editFishingOperation.field.gearShootingStartLatitude.tip=<html><body>Latitude de début de traîne.<br/><strong>Attention, pour saisir une latitude négative en mode DD, il faut entrer -.XXX et non pas -0.XXX</strong></body></html> +tutti.editFishingOperation.field.gearShootingStartLatitude.tip=Latitude de début de traîne tutti.editFishingOperation.field.gearShootingStartLongitude=Longitude de début de traîne -tutti.editFishingOperation.field.gearShootingStartLongitude.tip=<html><body>Longitude de début de traîne.<br/><strong>Attention, pour saisir une longitude négative en mode DD, il faut entrer -.XXX et non pas -0.XXX</strong></body></html> +tutti.editFishingOperation.field.gearShootingStartLongitude.tip=Longitude de début de traîne tutti.editFishingOperation.field.gearShootingStartTime=Heure de début de traîne tutti.editFishingOperation.field.gearTime=Heure tutti.editFishingOperation.field.gearTime.tip=Heures de début et fin de trait -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.