branch feature/16 created (now 178eb89)
This is an automated email from the git hooks/post-receive script. New change to branch feature/16 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 178eb89 Revue du composant de commentaire (Closes #16) This branch includes the following new commits: new 178eb89 Revue du composant de commentaire (Closes #16) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 178eb89b215a2a210f785ac253309a66305a80ba Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 21 15:54:03 2016 +0100 Revue du composant de commentaire (Closes #16) -- 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 feature/16 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 178eb89b215a2a210f785ac253309a66305a80ba Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 21 15:54:03 2016 +0100 Revue du composant de commentaire (Closes #16) --- .../application/swing/ui/content/Common.jcss | 10 ++------ .../swing/ui/content/ObserveFocusManager.java | 20 +++++++-------- .../ui/content/impl/longline/BranchlineUI.jaxx | 7 +++--- .../ui/content/impl/longline/BranchlineUI.jcss | 8 +----- .../content/impl/longline/BranchlineUIHandler.java | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 6 ++--- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 6 ++--- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 5 ++-- .../FloatingObjectTransmittingBuoyOperationUI.jcss | 8 ++---- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 6 ++--- .../ui/content/impl/seine/FloatingObjectUI.jcss | 7 +----- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 6 ++--- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 6 ++--- .../impl/longline/ActivityLonglineUIHandler.java | 2 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 6 ++--- .../content/open/impl/longline/TripLonglineUI.jcss | 9 ------- .../open/impl/longline/TripLonglineUIHandler.java | 2 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 6 ++--- .../content/open/impl/seine/ActivitySeineUI.jcss | 9 ------- .../open/impl/seine/ActivitySeineUIHandler.java | 2 +- .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 8 +++--- .../swing/ui/content/open/impl/seine/RouteUI.jcss | 9 ------- .../ui/content/open/impl/seine/RouteUIHandler.java | 2 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 9 ++++--- .../ui/content/open/impl/seine/TripSeineUI.jcss | 9 ------- .../open/impl/seine/TripSeineUIHandler.java | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 8 +++--- .../content/ref/impl/LengthLengthParameterUI.jcss | 10 +++----- .../content/ref/impl/LengthWeightParameterUI.jaxx | 10 +++----- .../content/ref/impl/LengthWeightParameterUI.jcss | 10 ++------ .../swing/ui/content/ref/impl/ProgramUI.jaxx | 5 ++-- .../swing/ui/content/ref/impl/ProgramUI.jcss | 7 +----- .../swing/ui/content/table/CommonTable.jcss | 4 +++ .../table/impl/longline/CatchLonglineUI.jaxx | 6 ++--- .../table/impl/longline/CatchLonglineUI.jcss | 7 +----- .../content/table/impl/longline/EncounterUI.jaxx | 7 ++---- .../content/table/impl/longline/EncounterUI.jcss | 3 ++- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 6 ++--- .../impl/longline/GearUseFeaturesLonglineUI.jcss | 8 +----- .../content/table/impl/longline/SensorUsedUI.jaxx | 8 ++---- .../content/table/impl/longline/SensorUsedUI.jcss | 3 ++- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 6 ++--- .../table/impl/seine/GearUseFeaturesSeineUI.jcss | 8 +----- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 7 ++---- .../content/table/impl/seine/NonTargetCatchUI.jcss | 8 +----- .../table/impl/seine/NonTargetSampleUI.jaxx | 6 ++--- .../table/impl/seine/NonTargetSampleUI.jcss | 3 ++- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 6 ++--- .../table/impl/seine/ObjectObservedSpeciesUI.jcss | 10 +++----- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 6 ++--- .../table/impl/seine/ObjectSchoolEstimateUI.jcss | 7 ++---- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 8 ++---- .../content/table/impl/seine/SchoolEstimateUI.jcss | 10 +++----- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 8 ++---- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 7 +----- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 7 ++---- .../table/impl/seine/TargetDiscardCatchUI.jcss | 7 +----- .../content/table/impl/seine/TargetSampleUI.jaxx | 5 ++-- .../content/table/impl/seine/TargetSampleUI.jcss | 3 ++- .../application/swing/ui/util/JComment.jaxx | 22 +++++++++++++++++ .../application/swing/ui/util/JComment.jcss | 14 +++++++++++ .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../fr/ird/observe/services/dto/WithComment.java | 27 +++++++++++++++++++++ .../dto/referential/LengthLengthParameterDto.java | 13 ++++++++++ .../dto/referential/LengthWeightParameterDto.java | 13 ++++++++++ .../src/main/xmi/observe-services-dto-common.zargo | Bin 49022 -> 51095 bytes 72 files changed, 214 insertions(+), 282 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss index 2b7e894..9f29a65 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/Common.jcss @@ -45,14 +45,8 @@ BeanComboBox { bean:{bean}; } -#comment { - columnHeaderView:{new JLabel(t("observe.common.comment"))}; - minimumSize:{new Dimension(10,50)}; -} - -#comment2 { - _propertyName: {CommentableDto.PROPERTY_COMMENT}; - text:{getStringValue(bean.getComment())}; +JComment { + model:{getBean()}; } #reset { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java index 216a261..7eebaec 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java @@ -153,7 +153,7 @@ public class ObserveFocusManager { case 1: return ui.getDeleteAll(); case 2: - return ui.getBranchlineDetailUI().getComment2(); + return ui.getBranchlineDetailUI().getComment(); } return super.getLastComponent(aContainer); } @@ -199,7 +199,7 @@ public class ObserveFocusManager { if (ui.getReset().isEnabled()) { return ui.getReset(); } - return ui.getComment2(); + return ui.getComment(); } }); @@ -444,7 +444,7 @@ public class ObserveFocusManager { if (ui.getReset().isEnabled()) { return ui.getReset(); } - return ui.getComment2(); + return ui.getComment(); } }); @@ -484,7 +484,7 @@ public class ObserveFocusManager { if (ui.getReset().isEnabled()) { return ui.getReset(); } - return ui.getComment2(); + return ui.getComment(); } }); @@ -535,7 +535,7 @@ public class ObserveFocusManager { @Override protected Component getLastComponentForEdit(Container aContainer) { TargetSampleUI ui = getUi(); - return getTableDefaultLastComponent(ui, ui.getComment2()); + return getTableDefaultLastComponent(ui, ui.getComment()); } }); @@ -553,7 +553,7 @@ public class ObserveFocusManager { @Override protected Component getLastComponentForEdit(Container aContainer) { TargetSampleUI ui = getUi(); - return getTableDefaultLastComponent(ui, ui.getComment2()); + return getTableDefaultLastComponent(ui, ui.getComment()); } }); @@ -607,7 +607,7 @@ public class ObserveFocusManager { @Override protected Component getLastComponentForEdit(Container aContainer) { SchoolEstimateUI ui = getUi(); - return getTableDefaultLastComponent(ui, ui.getComment2()); + return getTableDefaultLastComponent(ui, ui.getComment()); } }); @@ -621,7 +621,7 @@ public class ObserveFocusManager { @Override protected Component getLastComponentForEdit(Container aContainer) { ObjectSchoolEstimateUI ui = getUi(); - return getTableDefaultLastComponent(ui, ui.getComment2()); + return getTableDefaultLastComponent(ui, ui.getComment()); } }); @@ -635,7 +635,7 @@ public class ObserveFocusManager { @Override protected Component getLastComponentForEdit(Container aContainer) { ObjectObservedSpeciesUI ui = getUi(); - return getTableDefaultLastComponent(ui, ui.getComment2()); + return getTableDefaultLastComponent(ui, ui.getComment()); } }); @@ -653,7 +653,7 @@ public class ObserveFocusManager { @Override protected Component getLastComponentForEdit(Container aContainer) { NonTargetSampleUI ui = getUi(); - return getTableDefaultLastComponent(ui, ui.getComment2()); + return getTableDefaultLastComponent(ui, ui.getComment()); } }); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx index 4f783d8..fd5c47a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx @@ -22,7 +22,6 @@ contentTitle='{n("observe.content.branchline.title")}'> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.BranchlineDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.longline.LineTypeDto @@ -32,6 +31,8 @@ fr.ird.observe.services.dto.referential.longline.HookSizeDto fr.ird.observe.services.dto.referential.longline.HookTypeDto + fr.ird.observe.application.swing.ui.util.JComment + jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox org.nuiton.jaxx.widgets.datetime.DateTimeEditor @@ -250,9 +251,7 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } </row> <row> <cell weighty="1"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss index 10cbff5..c890886 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss @@ -27,14 +27,8 @@ enabled:{!model.isReadingMode()}; } - #comment { - columnHeaderView:{new JLabel(t("observe.content.branchline.comment"))}; -} - -#comment2 { - _tablePropertyName: {BranchlineDto.PROPERTY_COMMENT}; - text:{getStringValue(bean.getComment())}; + title:"observe.content.branchline.comment"; } /* ***************************************************************************** */ diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java index f5bdb62..4110dd9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java @@ -206,7 +206,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl ContentUIModel<BranchlineDto> model = getModel(); - super.startEditUI(BranchlineUI.BINDING_COMMENT2_TEXT, + super.startEditUI(BranchlineUI.BINDING_COMMENT_MODEL, BranchlineUI.BINDING_TOP_TYPE_SELECTED_ITEM, BranchlineUI.BINDING_TRACELINE_TYPE_SELECTED_ITEM, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx index 20765b8..24eb7df 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx @@ -24,7 +24,6 @@ <import> fr.ird.observe.application.swing.ObserveSwingApplicationContext - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.longline.MitigationTypeDto @@ -40,6 +39,7 @@ fr.ird.observe.application.swing.ui.content.table.impl.longline.FloatlinesCompositionUIModel fr.ird.observe.application.swing.ui.content.table.impl.longline.HooksCompositionUI fr.ird.observe.application.swing.ui.content.table.impl.longline.HooksCompositionUIModel + fr.ird.observe.application.swing.ui.util.JComment org.nuiton.jaxx.widgets.select.FilterableDoubleList @@ -129,9 +129,7 @@ <row> <cell fill="both" weighty="1" weightx="1"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index 446bd65..369e764 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -208,7 +208,7 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong LonglineGlobalCompositionUIModel model = (LonglineGlobalCompositionUIModel) getModel(); addInfoMessage(t("observe.content.longlineGlobalComposition.message.updating")); - super.startEditUI(LonglineGlobalCompositionUI.BINDING_COMMENT2_TEXT); + super.startEditUI(LonglineGlobalCompositionUI.BINDING_COMMENT_MODEL); model.setModified(false); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx index 7b48e48..9f4bcfa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx @@ -24,7 +24,6 @@ contentTitle='{n("observe.content.setLongline.title")}'> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.SetLonglineDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.longline.SettingShapeDto @@ -42,6 +41,7 @@ fr.ird.observe.application.swing.ui.content.ContentUIModel fr.ird.observe.application.swing.ui.util.BooleanEditor + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -395,9 +395,7 @@ <row> <cell fill="both" weighty="1" weightx="1"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index 0fdceee..b29de9c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -278,7 +278,7 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLo addInfoMessage(t("observe.content.setLongline.message.updating")); } - super.startEditUI(SetLonglineUI.BINDING_COMMENT2_TEXT, + super.startEditUI(SetLonglineUI.BINDING_COMMENT_MODEL, // setting tab SetLonglineUI.BINDING_HOME_ID_TEXT, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx index c1dd9bb..cfd0393 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx @@ -37,6 +37,7 @@ fr.ird.observe.application.swing.ui.actions.content.SaveEditUIAction fr.ird.observe.application.swing.ui.actions.global.ResetDataGlobalUIAction fr.ird.observe.application.swing.ui.actions.global.SaveDataGlobalUIAction + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.bean.BeanComboBox @@ -101,9 +102,7 @@ <JPanel id="transmittingBuoys" constraints="BorderLayout.CENTER"/> - <JScrollPane id='comment' constraints="BorderLayout.SOUTH" onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id='comment' constraints="BorderLayout.SOUTH"/> </JPanel> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jcss index 8e33bfc..9965c0f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jcss @@ -40,12 +40,8 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.floatingObject"))}; - minimumSize:{new Dimension(10,50)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; + title:"observe.common.comment.floatingObject"; + model:{getBean()}; } #noBaliseEditor { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx index 3f04bea..7763a07 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -24,7 +24,6 @@ contentTitle='{n("observe.content.floatingObject.title")}'> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.seine.ObjectFateDto @@ -36,6 +35,7 @@ fr.ird.observe.application.swing.ui.actions.global.DeleteDataGlobalUIAction fr.ird.observe.application.swing.ui.actions.global.ResetDataGlobalUIAction fr.ird.observe.application.swing.ui.actions.global.SaveDataGlobalUIAction + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -98,9 +98,7 @@ </row> <row> <cell columns='2' fill="both" weighty="0.7"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss index b535eba..6b793b6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jcss @@ -78,12 +78,7 @@ BeanComboBox { } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.floatingObject"))}; - minimumSize:{new Dimension(10,50)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; + title:"observe.common.comment.floatingObject"; } #reset { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index de2541e..0edb9c8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -152,7 +152,7 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, super.startEditUI(FloatingObjectUI.BINDING_DAYS_AT_SEA_COUNT_MODEL, FloatingObjectUI.BINDING_OBJECT_TYPE_SELECTED_ITEM, FloatingObjectUI.BINDING_OBJECT_FATE_SELECTED_ITEM, - FloatingObjectUI.BINDING_COMMENT2_TEXT); + FloatingObjectUI.BINDING_COMMENT_MODEL); contentUIModel.setModified(create); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx index c6ae470..9a93309 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx @@ -24,7 +24,6 @@ contentTitle='{n("observe.content.setSeine.title")}'> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto @@ -37,6 +36,7 @@ fr.ird.observe.application.swing.ui.actions.global.SaveDataGlobalUIAction fr.ird.observe.application.swing.ui.util.BooleanEditor + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -219,9 +219,7 @@ <row> <cell columns='2' fill="both" weighty="1"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 4b44419..a741118 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -212,7 +212,7 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> } super.startEditUI(SetSeineUI.BINDING_SUPPORT_VESSEL_NAME_TEXT, - SetSeineUI.BINDING_COMMENT2_TEXT, + SetSeineUI.BINDING_COMMENT_MODEL, SetSeineUI.BINDING_START_TIME_DATE, SetSeineUI.BINDING_END_SET_TIME_STAMP_DATE, SetSeineUI.BINDING_END_SET_TIME_STAMP_DATE, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx index 0a5b0fd..413dce3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx @@ -27,7 +27,6 @@ <style source="../../../Common.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.ActivityLonglineDto fr.ird.observe.services.dto.longline.SetLonglineDto fr.ird.observe.services.dto.referential.ReferentialReference @@ -35,6 +34,7 @@ fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto fr.ird.observe.application.swing.ui.actions.content.AddActivityLonglineSetUIAction fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -116,9 +116,7 @@ <!-- comment --> <row> <cell columns='2' weighty="1"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index 8608793..7ef4fb4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -221,7 +221,7 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin super.startEditUI( ActivityLonglineUI.BINDING_TIME_STAMP_DATE, ActivityLonglineUI.BINDING_SEA_SURFACE_TEMPERATURE_MODEL, - ActivityLonglineUI.BINDING_COMMENT2_TEXT, + ActivityLonglineUI.BINDING_COMMENT_MODEL, ActivityLonglineUI.BINDING_VESSEL_ACTIVITY_LONGLINE_SELECTED_ITEM, ActivityLonglineUI.BINDING_FPA_ZONE_SELECTED_ITEM, ActivityLonglineUI.BINDING_CLOSE_ENABLED, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx index fbc7f1b..1f0a41c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx @@ -26,7 +26,6 @@ <style source="../../../Common.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.services.dto.longline.TripLonglineActivityDto fr.ird.observe.services.dto.referential.ReferentialReference @@ -36,6 +35,7 @@ fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.services.dto.referential.longline.TripTypeDto fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction + fr.ird.observe.application.swing.ui.util.JComment fr.ird.observe.application.swing.ui.util.tripMap.TripMapUI org.jdesktop.swingx.JXDatePicker @@ -213,9 +213,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityDto> <!-- comment --> <row> <cell columns='2' fill='both' weighty="1"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getModel().getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jcss index 6159bf7..c44461a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jcss @@ -167,15 +167,6 @@ NumberEditor { _propertyName: {TripLonglineDto.PROPERTY_END_DATE}; } -#comment { - columnHeaderView:{new JLabel(t("observe.common.comment"))}; - minimumSize:{new Dimension(10,50)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; -} - #reopen { _toolTipText:{t("observe.content.action.reopen.maree.tip")}; _globalAction:{"openCloseDataGlobal"}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java index 5e683bf..44270d2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -218,7 +218,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr TripLonglineUI.BINDING_OCEAN_SELECTED_ITEM, TripLonglineUI.BINDING_START_DATE_DATE, TripLonglineUI.BINDING_END_DATE_DATE, - TripLonglineUI.BINDING_COMMENT2_TEXT, + TripLonglineUI.BINDING_COMMENT_MODEL, TripLonglineUI.BINDING_HOME_ID_TEXT, TripLonglineUI.BINDING_CLOSE_ENABLED, TripLonglineUI.BINDING_CLOSE_AND_CREATE_ENABLED); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx index e2d2d4f..a76c9da 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx @@ -26,7 +26,6 @@ <style source="../../../Common.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.ActivitySeineDto fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.seine.FloatingObjectDto @@ -42,6 +41,7 @@ fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction fr.ird.observe.application.swing.ui.actions.content.AddActivitySeineSetUIAction fr.ird.observe.application.swing.ui.actions.content.AddActivitySeineFloatingObjectUIAction + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -272,9 +272,7 @@ <!-- comment --> <row> <cell columns='2' weighty="1"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss index 8315928..bacad88 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jcss @@ -224,15 +224,6 @@ numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.DECIMAL2_PATTERN}; } -#comment { - columnHeaderView:{new JLabel(t("observe.common.comment"))}; - minimumSize:{new Dimension(10,50)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; -} - #reopen { _toolTipText:{t("observe.content.action.reopen.activity.tip")}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 0987626..19972ac 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -265,7 +265,7 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, super.startEditUI(ActivitySeineUI.BINDING_TIME_TIME, ActivitySeineUI.BINDING_VESSEL_SPEED_MODEL, ActivitySeineUI.BINDING_SEA_SURFACE_TEMPERATURE_MODEL, - ActivitySeineUI.BINDING_COMMENT2_TEXT, + ActivitySeineUI.BINDING_COMMENT_MODEL, ActivitySeineUI.BINDING_VESSEL_ACTIVITY_SEINE_SELECTED_ITEM, ActivitySeineUI.BINDING_PREVIOUS_FPA_ZONE_SELECTED_ITEM, ActivitySeineUI.BINDING_CURRENT_FPA_ZONE_SELECTED_ITEM, diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx index 4727756..bc6c119 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx @@ -23,8 +23,12 @@ <fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI superGenericType='RouteDto, RouteUI' contentTitle='{n("observe.content.route.title")}'> + <style source="../../../Common.jcss"/> + <import> fr.ird.observe.services.dto.seine.RouteDto + fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction + fr.ird.observe.application.swing.ui.util.JComment org.jdesktop.swingx.JXDatePicker @@ -77,9 +81,7 @@ </row> <row> <cell columns='2' fill="both" weightx="1" weighty="1"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jcss index 115a3db..a3813df 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jcss @@ -63,15 +63,6 @@ NumberEditor { enabled:{!model.isCreatingMode()}; } -#comment { - columnHeaderView:{new JLabel(t("observe.common.comment"))}; - minimumSize:{new Dimension(10,50)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; -} - #reopen { _toolTipText:{t("observe.content.action.reopen.route.tip")}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java index 39517b0..5520965 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java @@ -176,7 +176,7 @@ class RouteUIHandler extends ContentOpenableUIHandler<RouteDto, RouteUI> impleme super.startEditUI(RouteUI.BINDING_DATE_DATE, RouteUI.BINDING_START_LOG_VALUE_MODEL, RouteUI.BINDING_END_LOG_VALUE_ENABLED, - RouteUI.BINDING_COMMENT2_TEXT, + RouteUI.BINDING_COMMENT_MODEL, RouteUI.BINDING_CLOSE_ENABLED, RouteUI.BINDING_CLOSE_AND_CREATE_ENABLED); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx index e2b45aa..6026c5b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -23,6 +23,8 @@ <fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI superGenericType='TripSeineDto, TripSeineUI' contentTitle='{n("observe.content.tripSeine.title")}'> + <style source="../../../Common.jcss"/> + <import> fr.ird.observe.services.dto.seine.TripSeineDto fr.ird.observe.services.dto.seine.RouteDto @@ -34,6 +36,9 @@ fr.ird.observe.services.dto.referential.VesselHelper fr.ird.observe.services.dto.referential.PersonDto fr.ird.observe.services.dto.referential.OceanDto + + fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction + fr.ird.observe.application.swing.ui.util.JComment fr.ird.observe.application.swing.ui.util.tripMap.TripMapUI org.jdesktop.swingx.JXDatePicker @@ -234,9 +239,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) { <!-- comment --> <row> <cell fill='both' weighty="1" columns="2"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getModel().getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jcss index 9f33b17..5f3bc26 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jcss @@ -196,15 +196,6 @@ NumberEditor { _notBlocking:true; } -#comment { - columnHeaderView:{new JLabel(t("observe.common.comment"))}; - minimumSize:{new Dimension(10,50)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; -} - #reopen { _toolTipText:{t("observe.content.action.reopen.maree.tip")}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java index be379af..642500b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -212,7 +212,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein TripSeineUI.BINDING_OCEAN_SELECTED_ITEM, TripSeineUI.BINDING_START_DATE_DATE, TripSeineUI.BINDING_END_DATE_DATE, - TripSeineUI.BINDING_COMMENT2_TEXT, + TripSeineUI.BINDING_COMMENT_MODEL, TripSeineUI.BINDING_ERS_ID_TEXT, TripSeineUI.BINDING_CLOSE_ENABLED, TripSeineUI.BINDING_CLOSE_AND_CREATE_ENABLED); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx index 4a25db9..de6246a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx @@ -30,6 +30,7 @@ fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.services.dto.referential.LengthLengthParameterDto fr.ird.observe.application.swing.ui.UIHelper + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -111,11 +112,8 @@ <!-- source --> <row> - <cell anchor='west'> - <JLabel id='sourceLabel'/> - </cell> - <cell weightx="1" fill="both"> - <JTextField id='sourceField' onKeyReleased='getBean().setSource(sourceField.getText())'/> + <cell columns="2"> + <JComment id="sourceField"/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss index e247d52..17462e4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss @@ -116,11 +116,7 @@ text:{getStringValue(bean.getCoefficients())}; } -#sourceLabel { - text:"observe.common.source"; - labelFor:{sourceField}; -} - #sourceField { - text:{getStringValue(bean.getSource())}; -} + title:"observe.common.source"; + model:{getBean()}; +} \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx index 31f30f9..ec22833 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx @@ -33,6 +33,7 @@ fr.ird.observe.services.dto.referential.OceanDto fr.ird.observe.services.dto.referential.LengthWeightParameterDto fr.ird.observe.application.swing.ui.UIHelper + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -160,13 +161,8 @@ public void decorateUniqueKeyTable(JTable table, <!-- source --> <row> - <cell anchor='west'> - <JLabel id='sourceLabel'/> - </cell> - <cell weightx="1" fill="both"> - <JScrollPane id='sourceFieldPane' onFocusGained='sourceField.requestFocus()'> - <JTextArea id='sourceField' onKeyReleased='getBean().setSource(sourceField.getText())'/> - </JScrollPane> + <cell columns="2"> + <JComment id="sourceField"/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss index 7fe1ed9..052d2be 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss @@ -167,13 +167,7 @@ model:{bean.getMeanWeight()}; } -#sourceLabel { - text:"observe.common.source"; - labelFor:{sourceField}; - verticalAlignment: top; -} - #sourceField { - text:{getStringValue(bean.getSource())}; - rows:5; + title:"observe.common.source"; + model:{getBean()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx index abf51e3..6aaa51c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx @@ -32,6 +32,7 @@ fr.ird.observe.services.dto.referential.ProgramDto fr.ird.observe.services.dto.referential.OrganismDto fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.bean.BeanComboBox @@ -307,9 +308,7 @@ <!-- Comment --> <row> <cell weightx="1" weighty="1" fill="both"> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jcss index e6cc669..1924c23 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jcss @@ -139,11 +139,6 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment"))}; - minimumSize:{new Dimension(10,75)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; + model:{getBean()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/CommonTable.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/CommonTable.jcss index 64bb674..d1e911f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/CommonTable.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/CommonTable.jcss @@ -46,6 +46,10 @@ BeanComboBox { bean:{tableEditBean}; } +JComment { + model: {getTableEditBean()}; +} + #comment { minimumSize:{new Dimension(10,50)}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index 382c10f..fff73e7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -32,7 +32,6 @@ <import> fr.ird.observe.services.dto.DataReference - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.BasketDto fr.ird.observe.services.dto.longline.BranchlineDto fr.ird.observe.services.dto.longline.CatchLonglineDto @@ -49,6 +48,7 @@ fr.ird.observe.services.dto.referential.longline.StomacFullnessDto fr.ird.observe.application.swing.ui.content.table.* fr.ird.observe.application.swing.ui.util.BooleanEditor + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -463,9 +463,7 @@ </row> <row> <cell weighty='1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss index c24608b..38ae930 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -244,12 +244,7 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.content.catchLongline.comment"))}; -} - -#comment2 { - _tablePropertyName: {CommentableDto.PROPERTY_COMMENT}; - text:{getStringValue(tableEditBean.getComment())}; + title:"observe.content.catchLongline.comment"; } /* ***************************************************************************** */ diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx index 8cf6b23..4a9bc37 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx @@ -27,13 +27,13 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto fr.ird.observe.services.dto.longline.EncounterDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.longline.EncounterTypeDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -115,10 +115,7 @@ <Table id='extraZone' fill='both' weightx='1' insets='1'> <row> <cell weighty='1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jcss index a942169..06b7bbd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jcss @@ -63,5 +63,6 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.activity"))}; + title:"observe.common.comment.activity"; + model:{getBean()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx index f85b49e..78b574a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx @@ -29,13 +29,13 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.application.swing.ui.content.table.* fr.ird.observe.application.swing.ui.util.BooleanEditor + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -137,9 +137,7 @@ </row> <row> <cell weighty='0.1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss index e384f13..712855e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jcss @@ -81,13 +81,7 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.content.gearUseFeaturesLongline.comment"))}; - minimumSize:{new Dimension(10,80)}; -} - -#comment2 { - _tablePropertyName: {GearUseFeaturesLonglineDto.PROPERTY_COMMENT}; - text:{getStringValue(tableEditBean.getComment())}; + title:"observe.content.gearUseFeaturesLongline.comment"; } #addMeasurement { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx index a538943..2da7140 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx @@ -27,7 +27,6 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto fr.ird.observe.services.dto.longline.SensorUsedDto fr.ird.observe.services.dto.referential.ReferentialReference @@ -35,6 +34,7 @@ fr.ird.observe.services.dto.referential.longline.SensorBrandDto fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.bean.BeanComboBox @@ -150,11 +150,7 @@ <Table id='extraZone' fill='both' weightx='1' insets='1'> <row> <cell weighty='1'> - <JScrollPane id='comment' - onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jcss index 27f20ae..e169b4c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jcss @@ -111,5 +111,6 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.activity"))}; + title:"observe.common.comment.activity"; + model:{getBean()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index cdfdeab..764b762 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -29,13 +29,13 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.TripSeineGearUseDto fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.application.swing.ui.content.table.* fr.ird.observe.application.swing.ui.util.BooleanEditor + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -137,9 +137,7 @@ </row> <row> <cell weighty='0.1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss index 8e1af4e..549019d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jcss @@ -81,13 +81,7 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.content.gearUseFeaturesSeine.comment"))}; - minimumSize:{new Dimension(10,80)}; -} - -#comment2 { - _tablePropertyName: {GearUseFeaturesSeineDto.PROPERTY_COMMENT}; - text:{getStringValue(tableEditBean.getComment())}; + title:"observe.content.gearUseFeaturesSeine.comment"; } #addMeasurement { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx index b68efe1..97226ee 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -30,7 +30,6 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto fr.ird.observe.services.dto.seine.NonTargetCatchDto fr.ird.observe.services.dto.referential.seine.SpeciesFateDto @@ -38,6 +37,7 @@ fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment fr.ird.observe.application.swing.validation.ObserveSwingValidator jaxx.runtime.swing.editor.NumberEditor @@ -188,10 +188,7 @@ <!-- comment --> <row> <cell columns='3' weighty='1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getTableEditBean().setComment(((JTextArea) event.getSource()).getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss index 3230c29..208e6ee 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss @@ -144,16 +144,10 @@ disabledIcon: {iconDataObserve}; icon: {iconDataCalcule}; enabled: {tableEditBean.getMeanLengthComputedSource() != null}; - /*icon:{getDataIcon(tableEditBean.getMeanLengthComputedSource() != null)};*/ toolTipText:{getHandler().getMeanLengthDataTip(tableEditBean.getMeanLengthComputedSource())}; } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.nonTargetCatch"))}; - minimumSize:{new Dimension(10,80)}; -} - -#comment2 { - text:{getStringValue(tableEditBean.getComment())}; + title:"observe.common.comment.nonTargetCatch"; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index e731157..1fa0ca6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -30,7 +30,6 @@ <style source="AbstractSampleUI.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.services.dto.referential.SpeciesDto @@ -40,6 +39,7 @@ fr.ird.observe.services.dto.seine.NonTargetSampleDto fr.ird.observe.application.swing.ui.content.table.impl.seine.ModeSaisieEchantillonEnum fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -226,9 +226,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <Table id='extraZone' fill='both' weightx='1' insets='0'> <row> <cell weighty='1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss index 47226c2..d518302 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss @@ -81,7 +81,8 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.nonTargetSample"))}; + title:"observe.common.comment.nonTargetSample"; + model:{getBean()}; } #hideFormInformation { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx index ad8fbce..c32ca8b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx @@ -29,13 +29,13 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -105,9 +105,7 @@ <Table id='extraZone' fill='both' weightx='1' insets='0'> <row> <cell weighty='1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jcss index d2ef0ae..dd0555e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jcss @@ -52,10 +52,6 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.floatingObject"))}; - minimumSize:{new Dimension(10,80)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; -} + title:"observe.common.comment.floatingObject"; + model:{getBean()}; +} \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx index 1aa43fa..75628bb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx @@ -29,12 +29,12 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -93,9 +93,7 @@ <Table id='extraZone' fill='both' weightx='1' insets='1'> <row> <cell weighty='1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jcss index 4175538..1e73348 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jcss @@ -42,10 +42,7 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.floatingObject"))}; - minimumSize:{new Dimension(10,80)}; + title:"observe.common.comment.floatingObject"; + model:{getBean()}; } -#comment2 { - text:{getStringValue(bean.getComment())}; -} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx index 25a25f0..0ea301e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx @@ -29,12 +29,12 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto fr.ird.observe.services.dto.seine.SchoolEstimateDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -106,11 +106,7 @@ <Table id='extraZone' fill='both' weightx='1' insets='1'> <row> <cell weighty='1'> - <JScrollPane id='comment' - onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jcss index b9787a6..6220acb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jcss @@ -55,10 +55,6 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.set"))}; - minimumSize:{new Dimension(10,80)}; -} - -#comment2 { - text:{getStringValue(bean.getComment())}; -} + title:"observe.common.comment.set"; + model:{getBean()}; +} \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx index 7e79e8a..6367dec 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx @@ -29,13 +29,13 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto fr.ird.observe.services.dto.seine.TargetCatchDto fr.ird.observe.services.dto.referential.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -125,11 +125,7 @@ <!-- comment --> <row> <cell columns='2' weighty='1'> - <JScrollPane id='comment' - onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getTableEditBean().setComment(((JTextArea) event.getSource()).getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss index 96d8532..46eb2c8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jcss @@ -79,12 +79,7 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.targetCatch"))}; - minimumSize:{new Dimension(10,80)}; -} - -#comment2 { - text:{getStringValue(tableEditBean.getComment())}; + title:"observe.common.comment.targetCatch"; } #targetCatchCompositionEstimatedByObserver { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx index 4ad5a1e..07c4a82 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx @@ -29,7 +29,6 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.CommentableDto fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto fr.ird.observe.services.dto.seine.TargetCatchDto fr.ird.observe.services.dto.referential.ReferentialReference @@ -38,6 +37,7 @@ fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.application.swing.ui.content.table.* fr.ird.observe.application.swing.ui.util.BooleanEditor + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -135,10 +135,7 @@ <!-- comment --> <row> <cell columns='2' weighty='1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' - onKeyReleased='getTableEditBean().setComment(((JTextArea) event.getSource()).getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss index 5231364..ee58337 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jcss @@ -91,12 +91,7 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.targetDiscarded"))}; - minimumSize:{new Dimension(10,80)}; -} - -#comment2 { - text:{getStringValue(tableEditBean.getComment())}; + title:"observe.common.comment.targetDiscarded"; } #targetDiscardCatchCompositionEstimatedByObserver { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx index 56943d3..e15c4ce 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -34,6 +34,7 @@ fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.application.swing.ui.content.table.* + fr.ird.observe.application.swing.ui.util.JComment jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox @@ -191,9 +192,7 @@ public String getLengthDataTip(boolean computed) { <Table id='extraZone' fill='both' weightx='1' insets='0'> <row> <cell weighty='1'> - <JScrollPane id='comment' onFocusGained='comment2.requestFocus()'> - <JTextArea id='comment2' onKeyReleased='getBean().setComment(comment2.getText())'/> - </JScrollPane> + <JComment id="comment"/> </cell> </row> </Table> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss index 4f7f34d..84c9cb5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jcss @@ -50,5 +50,6 @@ } #comment { - columnHeaderView:{new JLabel(t("observe.common.comment.targetSample"))}; + title:"observe.common.comment.targetSample"; + model:{getBean()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx new file mode 100644 index 0000000..0181801 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx @@ -0,0 +1,22 @@ +<JPanel layout="{new BorderLayout()}"> + <import> + fr.ird.observe.services.dto.WithComment + java.awt.Dimension + javax.swing.JLabel + static fr.ird.observe.application.swing.ui.UIHelper.getStringValue + static org.nuiton.i18n.I18n.t + </import> + <WithComment id="model" javaBean="null"/> + <String id="title" javaBean='t("observe.common.comment")'/> + <JScrollPane constraints='BorderLayout.CENTER' id='comment' columnHeaderView="{columnHeader}" + onFocusGained='comment2.requestFocus()'> + <JTextArea id='comment2' + onKeyReleased='model.setComment(comment2.getText().isEmpty() ? null : comment2.getText())'/> + <JPanel id="columnHeader" layout="{new BorderLayout()}"> + <JLabel constraints='BorderLayout.WEST' text="{getTitle()}"/> + <JToolBar constraints='BorderLayout.EAST'> + <JButton id="resetComment" styleClass='resetButton' onActionPerformed="model.setComment(null)"/> + </JToolBar> + </JPanel> + </JScrollPane> +</JPanel> \ No newline at end of file diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss new file mode 100644 index 0000000..a5082f2 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss @@ -0,0 +1,14 @@ +#comment { + columnHeaderView:{new JLabel(getTitle())}; + /*minimumSize:{new Dimension(10,50)};*/ +} + +#comment2 { + /*_propertyName: {CommentableDto.PROPERTY_COMMENT};*/ + rows:5; + text:{getStringValue(getModel().getComment())}; +} + +#resetComment { + toolTipText:"observe.action.resetComment.tip"; +} diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 7fcd4b3..87ef6dd 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -105,6 +105,7 @@ observe.action.reloadDefaultConfiguration=Reload default resources observe.action.reloadDefaultConfiguration.tip=Reload default resources observe.action.reloadResources=Reload i18n observe.action.reloadResources.tip=Reload i18n translations +observe.action.resetComment.tip=Reset comment observe.action.restart.application=Restart observe.action.restart.application.tip=Restart application observe.action.save=Save diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 52203f0..52e47cb 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -105,6 +105,7 @@ observe.action.reloadDefaultConfiguration=Configuración por defecto observe.action.reloadDefaultConfiguration.tip=Restablecer la configuración por defecto observe.action.reloadResources=Recargar las traducciones observe.action.reloadResources.tip=Recargar las traducciones i18n +observe.action.resetComment.tip=Supprimer le commentaire \#TODO observe.action.restart.application=Reiniciar observe.action.restart.application.tip=Reiniciar la aplicación observe.action.save=Grabar diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 24020c4..6c62400 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -105,6 +105,7 @@ observe.action.reloadDefaultConfiguration=Configuration par défaut observe.action.reloadDefaultConfiguration.tip=Rétablir la configuration par défaut observe.action.reloadResources=Resources par défaut observe.action.reloadResources.tip=Rétablir les ressources par défaut (toute modification sera perdue) +observe.action.resetComment.tip=Supprimer le commentaire observe.action.restart.application=Redémarrer observe.action.restart.application.tip=Redémarrer l'application observe.action.save=Enregistrer diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/WithComment.java b/services-dto/src/main/java/fr/ird/observe/services/dto/WithComment.java new file mode 100644 index 0000000..71dd8bd --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/WithComment.java @@ -0,0 +1,27 @@ +package fr.ird.observe.services.dto; + +import java.beans.PropertyChangeListener; + +/** + * Created on 21/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public interface WithComment { + + String PROPERTY_COMMENT = "comment"; + + String getComment(); + + void setComment(String comment); + + void addPropertyChangeListener(PropertyChangeListener listener); + + void removePropertyChangeListener(PropertyChangeListener listener); + + void addPropertyChangeListener(String propertyName, PropertyChangeListener listener); + + void removePropertyChangeListener(String propertyName, PropertyChangeListener listener); + +} diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java index 69461da..ddfe885 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java @@ -22,6 +22,8 @@ package fr.ird.observe.services.dto.referential; * #L% */ +import fr.ird.observe.services.dto.WithComment; + import java.util.Map; public class LengthLengthParameterDto extends GeneratedLengthLengthParameterDto implements FormulaHelper.FormulaSupport { @@ -31,6 +33,17 @@ public class LengthLengthParameterDto extends GeneratedLengthLengthParameterDto private Map<String, Double> coefficientsValues; @Override + public String getComment() { + return getSource(); + } + + @Override + public void setComment(String comment) { + setSource(comment); + firePropertyChange(WithComment.PROPERTY_COMMENT, comment); + } + + @Override public void setCoefficients(String coefficients) { super.setCoefficients(coefficients); this.coefficientsValues = null; diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java index e7bf3d2..41eb564 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java @@ -22,6 +22,8 @@ package fr.ird.observe.services.dto.referential; * #L% */ +import fr.ird.observe.services.dto.WithComment; + import java.util.Map; public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto implements FormulaHelper.FormulaSupport { @@ -31,6 +33,17 @@ public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto private Map<String, Double> coefficientsValues; @Override + public String getComment() { + return getSource(); + } + + @Override + public void setComment(String comment) { + setSource(comment); + firePropertyChange(WithComment.PROPERTY_COMMENT, comment); + } + + @Override public void setCoefficients(String coefficients) { super.setCoefficients(coefficients); this.coefficientsValues = null; diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo index 9a74931..9a28eff 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm