branch develop updated (eeb11ba -> afcb41b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from eeb11ba fixes #6636 new 41993fd fixes #6635 new afcb41b Merge branch 'develop' of https://git.codelutin.com/tutti into develop The 2 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 afcb41b3a798cdc5ac197cca85feddd9b4620f38 Merge: 41993fd eeb11ba Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 10 11:15:58 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/tutti into develop commit 41993fdb3e9095051c0051abb010b0cec0a93b26 Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 10 11:12:42 2015 +0100 fixes #6635 Summary of changes: .../operation/FishingOperationsUIHandler.java | 2 +- .../content/operation/catches/EditCatchesUI.jaxx | 388 ++++++++++----------- .../operation/catches/EditCatchesUIHandler.java | 33 +- 3 files changed, 211 insertions(+), 212 deletions(-) -- 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 41993fdb3e9095051c0051abb010b0cec0a93b26 Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 10 11:12:42 2015 +0100 fixes #6635 --- .../operation/FishingOperationsUIHandler.java | 2 +- .../content/operation/catches/EditCatchesUI.jaxx | 388 ++++++++++----------- .../operation/catches/EditCatchesUIHandler.java | 33 +- 3 files changed, 211 insertions(+), 212 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java index e11bf60..6c234c2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java @@ -174,7 +174,7 @@ public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandl efoUI.getGearUseFeatureTabPane().setTitle(fishingOperationText); EditCatchesUI ecUI = getUI().getCatchesTabContent(); - ecUI.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); + ecUI.getSvgTabPane().setTitle(fishingOperationText); ecUI.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); ecUI.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); ecUI.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx index 7a32a2a..fc1f918 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx @@ -69,7 +69,7 @@ public EditCatchesUI(FishingOperationsUI parentUI) { uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <!--FIXME Must find a way to validate, if no field, then no validation... --> <!--FIXME Must find a way to show validation results on svg canvas... --> - <field name='catchTotalWeight' component='catchTotalWeightField'/> + <!--<field name='catchTotalWeight' component='catchTotalWeightField'/>--> <!--<field name='catchTotalRejectedWeight'--> <!--component='catchTotalRejectedWeightField'/>--> @@ -122,199 +122,199 @@ public EditCatchesUI(FishingOperationsUI parentUI) { </JXTitledPanel> </tab> - <tab id='catchesCaracteristicsTab'> - <JXTitledPanel id='catchesCaracteristicsTabPane'> - <JScrollPane id='catchesCaracteristicsTabScrollPane'> - <JPanel layout='{new BorderLayout()}'> - <Table id="catchesForm" fill='both' weightx='1' - constraints='BorderLayout.NORTH'> - <row> - <cell> - <Table id='catchTable' fill='both'> - - <!-- Poids total capture --> - <row> - <cell anchor='west'> - <JLabel id='catchTotalWeightLabel'/> - </cell> - <cell columns='4' weightx='1.0'> - <ComputableDataEditor id='catchTotalWeightField' - genericType="Float" - constructorParams='this'/> - </cell> - </row> - <!-- Poids total trié balance tremie / caroussel--> - <row> - <cell anchor='west'> - <JLabel id='catchTotalSortedWeightLabel'/> - </cell> - <cell columns='4' weightx='1.0'> - <JTextField id='catchTotalSortedWeightField'/> - </cell> - </row> - <row> - <cell columns='5'> - <Table fill='both' id='tremieCarrouselRow'> - <row> - <cell anchor='west'> - <JLabel - id='catchTotalSortedCarousselWeightLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField - id='catchTotalSortedCarousselWeightField'/> - </cell> - <cell anchor='west'> - <JLabel id='catchTotalSortedTremisWeightLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField - id='catchTotalSortedTremisWeightField'/> - </cell> - </row> - </Table> - </cell> - </row> - <!--Poids total hors vrac--> - <row> - <cell> - <JLabel id='catchTotalUnsortedWeightLabel'/> - </cell> - <cell columns='4' weightx='1.0'> - <JTextField id='catchTotalUnsortedWeightField'/> - </cell> - </row> - <!-- Poids total NON TRIÉ (rejeté) --> - <row> - <cell> - <JLabel id='catchTotalRejectedWeightLabel'/> - </cell> - <cell columns='4' weightx='1.0'> - <ComputableDataEditor genericType="Float" - id='catchTotalRejectedWeightField' - constructorParams='this'/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell> - <Table id='speciesTable' fill='both'> - - <!-- Poids total capture --> - <row> - <cell anchor='west'> - <JLabel id='speciesTotalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='speciesTotalWeightField'/> - </cell> - </row> - <!-- Poids total vrac --> - <row> - <cell anchor='west'> - <JLabel id='speciesTotalSortedWeightLabel'/> - </cell> - <cell weightx='1.0'> - <ComputableDataEditor genericType="Float" - id='speciesTotalSortedWeightField' - constructorParams='this'/> - </cell> - </row> - - <!-- Poids total échantillonné vrac --> - <row> - <cell> - <JLabel id='speciesTotalSampleSortedWeightLabel'/> - </cell> - <cell> - <JTextField id='speciesTotalSampleSortedWeightField'/> - </cell> - </row> - <!-- Poids total hors vrac --> - <row> - <cell> - <JLabel id='speciesTotalUnsortedWeightLabel'/> - </cell> - <cell> - <JTextField id='speciesTotalUnsortedWeightField'/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell> - <Table id='benthosTable' fill='both'> - - <!-- Poids total capture --> - <row> - <cell anchor='west'> - <JLabel id='benthosTotalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='benthosTotalWeightField'/> - </cell> - </row> - <!-- Poids total vrac --> - <row> - <cell anchor='west'> - <JLabel id='benthosTotalSortedWeightLabel'/> - </cell> - <cell weightx='1.0'> - <ComputableDataEditor genericType="Float" - id='benthosTotalSortedWeightField' - constructorParams='this'/> - </cell> - </row> - - <!-- Poids total échantillonné vrac --> - <row> - <cell> - <JLabel id='benthosTotalSampleSortedWeightLabel'/> - </cell> - <cell> - <JTextField id='benthosTotalSampleSortedWeightField'/> - </cell> - </row> - <!-- Poids total hors vrac --> - <row> - <cell> - <JLabel id='benthosTotalUnsortedWeightLabel'/> - </cell> - <cell> - <JTextField id='benthosTotalUnsortedWeightField'/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell columns='2'> - <Table id='marineLitterTable' fill='both'> - - <!-- Poids total Macro dechet --> - <row> - <cell anchor='west'> - <JLabel id='marineLitterTotalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <ComputableDataEditor genericType="Float" - id='marineLitterTotalWeightField' - constructorParams='this'/> - </cell> - </row> - - - </Table> - </cell> - </row> - </Table> - </JPanel> - </JScrollPane> - </JXTitledPanel> - </tab> + <!--<tab id='catchesCaracteristicsTab'>--> + <!--<JXTitledPanel id='catchesCaracteristicsTabPane'>--> + <!--<JScrollPane id='catchesCaracteristicsTabScrollPane'>--> + <!--<JPanel layout='{new BorderLayout()}'>--> + <!--<Table id="catchesForm" fill='both' weightx='1'--> + <!--constraints='BorderLayout.NORTH'>--> + <!--<row>--> + <!--<cell>--> + <!--<Table id='catchTable' fill='both'>--> + + <!--<!– Poids total capture –>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='catchTotalWeightLabel'/>--> + <!--</cell>--> + <!--<cell columns='4' weightx='1.0'>--> + <!--<ComputableDataEditor id='catchTotalWeightField'--> + <!--genericType="Float"--> + <!--constructorParams='this'/>--> + <!--</cell>--> + <!--</row>--> + <!--<!– Poids total trié balance tremie / caroussel–>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='catchTotalSortedWeightLabel'/>--> + <!--</cell>--> + <!--<cell columns='4' weightx='1.0'>--> + <!--<JTextField id='catchTotalSortedWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--<row>--> + <!--<cell columns='5'>--> + <!--<Table fill='both' id='tremieCarrouselRow'>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel--> + <!--id='catchTotalSortedCarousselWeightLabel'/>--> + <!--</cell>--> + <!--<cell weightx='1.0'>--> + <!--<JTextField--> + <!--id='catchTotalSortedCarousselWeightField'/>--> + <!--</cell>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='catchTotalSortedTremisWeightLabel'/>--> + <!--</cell>--> + <!--<cell weightx='1.0'>--> + <!--<JTextField--> + <!--id='catchTotalSortedTremisWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--</Table>--> + <!--</cell>--> + <!--</row>--> + <!--<!–Poids total hors vrac–>--> + <!--<row>--> + <!--<cell>--> + <!--<JLabel id='catchTotalUnsortedWeightLabel'/>--> + <!--</cell>--> + <!--<cell columns='4' weightx='1.0'>--> + <!--<JTextField id='catchTotalUnsortedWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--<!– Poids total NON TRIÉ (rejeté) –>--> + <!--<row>--> + <!--<cell>--> + <!--<JLabel id='catchTotalRejectedWeightLabel'/>--> + <!--</cell>--> + <!--<cell columns='4' weightx='1.0'>--> + <!--<ComputableDataEditor genericType="Float"--> + <!--id='catchTotalRejectedWeightField'--> + <!--constructorParams='this'/>--> + <!--</cell>--> + <!--</row>--> + <!--</Table>--> + <!--</cell>--> + <!--</row>--> + <!--<row>--> + <!--<cell>--> + <!--<Table id='speciesTable' fill='both'>--> + + <!--<!– Poids total capture –>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='speciesTotalWeightLabel'/>--> + <!--</cell>--> + <!--<cell weightx='1.0'>--> + <!--<JTextField id='speciesTotalWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--<!– Poids total vrac –>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='speciesTotalSortedWeightLabel'/>--> + <!--</cell>--> + <!--<cell weightx='1.0'>--> + <!--<ComputableDataEditor genericType="Float"--> + <!--id='speciesTotalSortedWeightField'--> + <!--constructorParams='this'/>--> + <!--</cell>--> + <!--</row>--> + + <!--<!– Poids total échantillonné vrac –>--> + <!--<row>--> + <!--<cell>--> + <!--<JLabel id='speciesTotalSampleSortedWeightLabel'/>--> + <!--</cell>--> + <!--<cell>--> + <!--<JTextField id='speciesTotalSampleSortedWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--<!– Poids total hors vrac –>--> + <!--<row>--> + <!--<cell>--> + <!--<JLabel id='speciesTotalUnsortedWeightLabel'/>--> + <!--</cell>--> + <!--<cell>--> + <!--<JTextField id='speciesTotalUnsortedWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--</Table>--> + <!--</cell>--> + <!--</row>--> + <!--<row>--> + <!--<cell>--> + <!--<Table id='benthosTable' fill='both'>--> + + <!--<!– Poids total capture –>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='benthosTotalWeightLabel'/>--> + <!--</cell>--> + <!--<cell weightx='1.0'>--> + <!--<JTextField id='benthosTotalWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--<!– Poids total vrac –>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='benthosTotalSortedWeightLabel'/>--> + <!--</cell>--> + <!--<cell weightx='1.0'>--> + <!--<ComputableDataEditor genericType="Float"--> + <!--id='benthosTotalSortedWeightField'--> + <!--constructorParams='this'/>--> + <!--</cell>--> + <!--</row>--> + + <!--<!– Poids total échantillonné vrac –>--> + <!--<row>--> + <!--<cell>--> + <!--<JLabel id='benthosTotalSampleSortedWeightLabel'/>--> + <!--</cell>--> + <!--<cell>--> + <!--<JTextField id='benthosTotalSampleSortedWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--<!– Poids total hors vrac –>--> + <!--<row>--> + <!--<cell>--> + <!--<JLabel id='benthosTotalUnsortedWeightLabel'/>--> + <!--</cell>--> + <!--<cell>--> + <!--<JTextField id='benthosTotalUnsortedWeightField'/>--> + <!--</cell>--> + <!--</row>--> + <!--</Table>--> + <!--</cell>--> + <!--</row>--> + <!--<row>--> + <!--<cell columns='2'>--> + <!--<Table id='marineLitterTable' fill='both'>--> + + <!--<!– Poids total Macro dechet –>--> + <!--<row>--> + <!--<cell anchor='west'>--> + <!--<JLabel id='marineLitterTotalWeightLabel'/>--> + <!--</cell>--> + <!--<cell weightx='1.0'>--> + <!--<ComputableDataEditor genericType="Float"--> + <!--id='marineLitterTotalWeightField'--> + <!--constructorParams='this'/>--> + <!--</cell>--> + <!--</row>--> + + + <!--</Table>--> + <!--</cell>--> + <!--</row>--> + <!--</Table>--> + <!--</JPanel>--> + <!--</JScrollPane>--> + <!--</JXTitledPanel>--> + <!--</tab>--> <tab id='speciesTab'> <JPanel id='speciesTabPanel'> <JXTitledPanel id='speciesTabFishingOperationReminderLabel' diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index 1e1b92c..f2951b2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -228,12 +228,11 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi listenValidationTableHasNoFatalError(getValidator(), model); setCustomTab(0, model); - setCustomTab(1, model); - setCustomTab(2, ui.getSpeciesTabContent().getModel()); - setCustomTab(3, ui.getBenthosTabContent().getModel()); - setCustomTab(4, ui.getMarineLitterTabContent().getModel()); - setCustomTab(5, ui.getIndividualObservationTabContent().getModel()); - setCustomTab(6, ui.getAccidentalTabContent().getModel()); + setCustomTab(1, ui.getSpeciesTabContent().getModel()); + setCustomTab(2, ui.getBenthosTabContent().getModel()); + setCustomTab(3, ui.getMarineLitterTabContent().getModel()); + setCustomTab(4, ui.getIndividualObservationTabContent().getModel()); + setCustomTab(5, ui.getAccidentalTabContent().getModel()); getTabPanel().setSelectedIndex(1); // when internal tab change, close any attachments popup @@ -257,17 +256,17 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi @Override protected JComponent getComponentToFocus() { - JComponent result; - //TODO remove when svg resume is done? - if (getModel().getCatchTotalComputedWeight() != null) { - // if there is a computed value, never focus inside the component - // see http://forge.codelutin.com/issues/4151 - result = null; - } else { - - result = getUI().getCatchTotalWeightField(); - } - return result; +// JComponent result; +// //TODO remove when svg resume is done? +// if (getModel().getCatchTotalComputedWeight() != null) { +// // if there is a computed value, never focus inside the component +// // see http://forge.codelutin.com/issues/4151 +// result = null; +// } else { +// +// result = getUI().getCatchTotalWeightField(); +// } + return null; } @Override -- 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 afcb41b3a798cdc5ac197cca85feddd9b4620f38 Merge: 41993fd eeb11ba Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 10 11:15:58 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/tutti into develop .../content/referential/replace/AbstractReplaceTemporaryUIModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm