December 2012 - Tutti-commits - mailman.cloud.codelutin.com

r84 - tags
by tchemit＠users.forge.codelutin.com Dec. 17, 2012

Dec. 17, 2012

Author: tchemit Date: 2012-12-17 10:22:46 +0100 (Mon, 17 Dec 2012) New Revision: 84 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/84 Log: [maven-release-plugin] copy for tag tutti-0.2 Added: tags/tutti-0.2/

1 0

r83 - in trunk: . tutti-persistence tutti-persistence-dev tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com Dec. 17, 2012

Dec. 17, 2012

Author: tchemit Date: 2012-12-17 10:22:38 +0100 (Mon, 17 Dec 2012) New Revision: 83 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/83 Log: [maven-release-plugin] prepare release tutti-0.2 Modified: trunk/pom.xml trunk/tutti-persistence-dev/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-17 09:18:52 UTC (rev 82) +++ trunk/pom.xml 2012-12-17 09:22:38 UTC (rev 83) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> <modules> <module>tutti-persistence</module> @@ -58,12 +58,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-0.2 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2012-12-17 09:18:52 UTC (rev 82) +++ trunk/tutti-persistence/pom.xml 2012-12-17 09:22:38 UTC (rev 83) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-persistence-dev/pom.xml =================================================================== --- trunk/tutti-persistence-dev/pom.xml 2012-12-17 09:18:52 UTC (rev 82) +++ trunk/tutti-persistence-dev/pom.xml 2012-12-17 09:22:38 UTC (rev 83) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2012-12-17 09:18:52 UTC (rev 82) +++ trunk/tutti-service/pom.xml 2012-12-17 09:22:38 UTC (rev 83) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2012-12-17 09:18:52 UTC (rev 82) +++ trunk/tutti-ui-swing/pom.xml 2012-12-17 09:22:38 UTC (rev 83) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>0.2-SNAPSHOT</version> + <version>0.2</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r82 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation java/fr/ifremer/tutti/ui/swing/content/operation/accidental java/fr/ifremer/tutti/ui/swing/content/operation/benthos java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste java/fr/ifremer/tutti/ui/swing/content/operation/plankton java/fr/ifremer/tutti/ui/swing/content/operation/species resources/i18n resources/icons
by tchemit＠users.forge.codelutin.com Dec. 17, 2012

Dec. 17, 2012

Author: tchemit Date: 2012-12-17 10:18:52 +0100 (Mon, 17 Dec 2012) New Revision: 82 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/82 Log: ajout rappel du trait en haut de chaque onglet de batch Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties trunk/tutti-ui-swing/src/main/resources/icons/action-edit-comment.png Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -215,7 +215,7 @@  <row> - <cell columns="2"> + <cell> <JToolBar id='fishingOperationValidPanel' layout='{new BorderLayout()}'> <JButton id='resetValidStateButton' @@ -225,13 +225,16 @@ constraints='BorderLayout.EAST'/> </JToolBar> </cell> - <cell columns="2"> - <JRadioButton id='fishingOperationValidRadio' - onActionPerformed='model.setFishingOperationValid(Boolean.TRUE)'/> + <cell> + <HBox> + <JRadioButton id='fishingOperationValidRadio' + onActionPerformed='model.setFishingOperationValid(Boolean.TRUE)'/> + <JRadioButton id='fishingOperationInvalidRadio' + onActionPerformed='model.setFishingOperationValid(Boolean.FALSE)'/> + </HBox> </cell> - <cell columns="2"> - <JRadioButton id='fishingOperationInvalidRadio' - onActionPerformed='model.setFishingOperationValid(Boolean.FALSE)'/> + <cell columns="4"> + <JPanel/> </cell> </row> @@ -273,13 +276,13 @@  <row weighty='0.3'> <cell columns='6'> - +  <BeanDoubleList id='saisisseurList' genericType='Person'/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -65,7 +65,11 @@ <LongTextEditorUI id='longTextEditor'/> <AttachmentEditorUI id='attachmentEditor'/> - + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> + </JPanel> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event)'/> </JScrollPane> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -47,6 +47,7 @@ import javax.swing.table.TableColumnModel; import java.util.List; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -300,14 +301,24 @@ List<AccidentalBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText = ""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -327,6 +338,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -60,16 +60,16 @@ ]]></script> <BenthosBatchUIHandler id='handler' - initializer='getContextValue(BenthosBatchUIHandler.class)'/> + initializer='getContextValue(BenthosBatchUIHandler.class)'/> <BenthosBatchUIModel id='model' - initializer='getContextValue(BenthosBatchUIModel.class)'/> + initializer='getContextValue(BenthosBatchUIModel.class)'/> <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='totalWeight' component='totalWeightField'/> + <field name='totalWeight' component='totalWeightField'/> <field name='sampleTotalWeight' component='sampleTotalWeightField'/> </BeanValidator> @@ -77,31 +77,38 @@ <AttachmentEditorUI id='attachmentEditor'/> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> -  - <row> - <cell anchor='west'> - <JLabel id='totalWeightLabel'/> - </cell> - <cell weightx='1.0'> + <Table id='form' fill='both' constraints='BorderLayout.SOUTH'> + +  + <row> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> <NumberEditor id='totalWeightField' constructorParams='this'/> - </cell> - </row> + </cell> + </row> -  - <row> - <cell> - <JLabel id='sampleTotalWeightLabel'/> - </cell> - <cell> - <NumberEditor id='sampleTotalWeightField' constructorParams='this'/> - </cell> - </row> - </Table> +  + <row> + <cell> + <JLabel id='sampleTotalWeightLabel'/> + </cell> + <cell> + <NumberEditor id='sampleTotalWeightField' constructorParams='this'/> + </cell> + </row> + </Table> + </JPanel> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event);'/> + <JXTable id='table' + onFocusLost='handler.saveSelectedRowIfRequired(event);'/> </JScrollPane> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -46,6 +46,7 @@ import javax.swing.table.TableColumnModel; import java.util.List; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -331,14 +332,24 @@ List<BenthosBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText = ""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -358,6 +369,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -60,37 +60,43 @@ ]]></script> <MacroWasteBatchUIHandler id='handler' - initializer='getContextValue(MacroWasteBatchUIHandler.class)'/> + initializer='getContextValue(MacroWasteBatchUIHandler.class)'/> <MacroWasteBatchUIModel id='model' - initializer='getContextValue(MacroWasteBatchUIModel.class)'/> + initializer='getContextValue(MacroWasteBatchUIModel.class)'/> <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='totalWeight' component='totalWeightField'/> + <field name='totalWeight' component='totalWeightField'/> </BeanValidator> <LongTextEditorUI id='longTextEditor'/> <AttachmentEditorUI id='attachmentEditor'/> + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <Table id='form' fill='both' constraints='BorderLayout.SOUTH'> -  - <row> - <cell anchor='west'> - <JLabel id='totalWeightLabel'/> - </cell> - <cell weightx='1.0'> +  + <row> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> <NumberEditor id='totalWeightField' constructorParams='this'/> - </cell> - </row> - </Table> + </cell> + </row> + </Table> + </JPanel> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event);'/> + <JXTable id='table' + onFocusLost='handler.saveSelectedRowIfRequired(event);'/> </JScrollPane> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -45,6 +45,7 @@ import javax.swing.table.TableColumnModel; import java.util.List; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -285,14 +286,24 @@ List<MacroWasteBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText=""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -312,6 +323,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -60,48 +60,54 @@ ]]></script> <PlanktonBatchUIHandler id='handler' - initializer='getContextValue(PlanktonBatchUIHandler.class)'/> + initializer='getContextValue(PlanktonBatchUIHandler.class)'/> <PlanktonBatchUIModel id='model' - initializer='getContextValue(PlanktonBatchUIModel.class)'/> + initializer='getContextValue(PlanktonBatchUIModel.class)'/> <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='totalWeight' component='totalWeightField'/> + <field name='totalWeight' component='totalWeightField'/> <field name='sampleTotalWeight' component='sampleTotalWeightField'/> </BeanValidator> <LongTextEditorUI id='longTextEditor'/> <AttachmentEditorUI id='attachmentEditor'/> + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <Table id='form' fill='both' constraints='BorderLayout.SOUTH'> -  - <row> - <cell anchor='west'> - <JLabel id='totalWeightLabel'/> - </cell> - <cell weightx='1.0'> +  + <row> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> <NumberEditor id='totalWeightField' constructorParams='this'/> - </cell> - </row> + </cell> + </row> -  - <row> - <cell> - <JLabel id='sampleTotalWeightLabel'/> - </cell> - <cell> - <NumberEditor id='sampleTotalWeightField' constructorParams='this'/> - </cell> - </row> - </Table> +  + <row> + <cell> + <JLabel id='sampleTotalWeightLabel'/> + </cell> + <cell> + <NumberEditor id='sampleTotalWeightField' constructorParams='this'/> + </cell> + </row> + </Table> + </JPanel> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event);'/> + <JXTable id='table' + onFocusLost='handler.saveSelectedRowIfRequired(event);'/> </JScrollPane> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -46,6 +46,7 @@ import javax.swing.table.TableColumnModel; import java.util.List; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -327,14 +328,24 @@ List<PlanktonBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText = ""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -354,6 +365,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -62,61 +62,67 @@ ]]></script> <SpeciesBatchUIHandler id='handler' - initializer='getContextValue(SpeciesBatchUIHandler.class)'/> + initializer='getContextValue(SpeciesBatchUIHandler.class)'/> <SpeciesBatchUIModel id='model' - initializer='getContextValue(SpeciesBatchUIModel.class)'/> + initializer='getContextValue(SpeciesBatchUIModel.class)'/> <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='totalWeight' component='totalWeightField'/> - <field name='totalVracWeight' component='totalVracWeightField'/> - <field name='sampleVracWeight' component='sampleVracWeightField'/> + <field name='totalWeight' component='totalWeightField'/> + <field name='totalVracWeight' component='totalVracWeightField'/> + <field name='sampleVracWeight' component='sampleVracWeightField'/> <field name='totalHorsVracWeight' component='totalHorsVracWeightField'/> </BeanValidator> - <SpeciesFrequencyUI id='frequencyEditor' constructorParams='handler.getContext()'/> - + <SpeciesFrequencyUI id='frequencyEditor' + constructorParams='handler.getContext()'/> + <LongTextEditorUI id='longTextEditor'/> - + <AttachmentEditorUI id='attachmentEditor'/> + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> + <Table id='form' fill='both' constraints='BorderLayout.SOUTH'> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> +  + <row> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='totalWeightField' constructorParams='this'/> + </cell> + <cell anchor='west'> + <JLabel id='totalVracWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='totalVracWeightField' constructorParams='this'/> + </cell> + </row> -  - <row> - <cell anchor='west'> - <JLabel id='totalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='totalWeightField' constructorParams='this'/> - </cell> - <cell anchor='west'> - <JLabel id='totalVracWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='totalVracWeightField' constructorParams='this'/> - </cell> - </row> +  + <row> + <cell> + <JLabel id='sampleVracWeightLabel'/> + </cell> + <cell> + <NumberEditor id='sampleVracWeightField' constructorParams='this'/> + </cell> + <cell> + <JLabel id='totalHorsVracWeightLabel'/> + </cell> + <cell> + <JTextField id='totalHorsVracWeightField'/> + </cell> + </row> + </Table> + </JPanel> -  - <row> - <cell> - <JLabel id='sampleVracWeightLabel'/> - </cell> - <cell> - <NumberEditor id='sampleVracWeightField' constructorParams='this'/> - </cell> - <cell> - <JLabel id='totalHorsVracWeightLabel'/> - </cell> - <cell> - <JTextField id='totalHorsVracWeightField'/> - </cell> - </row> - </Table> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -53,6 +53,7 @@ import java.util.List; import java.util.Set; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -150,8 +151,6 @@ @Override protected TableColumnModel createTableColumnModel() { - List<String> samplingOrder = getModel().getSamplingOrder(); - DefaultTableColumnModelExt columnModel = new DefaultTableColumnModelExt(); @@ -188,7 +187,7 @@ } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY)) { + { // SortedUnsortedCategory column @@ -203,7 +202,7 @@ decorator, data); } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY)) { + { // WeightCategory column @@ -219,7 +218,7 @@ decorator, data); } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_SEX)) { + { // Sex column @@ -233,7 +232,7 @@ decorator, data); } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_MATURITY)) { + { // Maturity column @@ -242,7 +241,7 @@ TuttiUI.DECIMAL3_PATTERN); } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_AGE)) { + { // Age column @@ -530,14 +529,24 @@ List<SpeciesBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText = ""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -559,6 +568,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } //------------------------------------------------------------------------// @@ -592,7 +603,9 @@ SpeciesBatchRowModel.PROPERTY_SPECIES, SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY, - SpeciesBatchRowModel.PROPERTY_SEX + SpeciesBatchRowModel.PROPERTY_SEX, + SpeciesBatchRowModel.PROPERTY_MATURITY, + SpeciesBatchRowModel.PROPERTY_AGE ); getModel().setSamplingOrder(samplingOrder); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-17 09:18:52 UTC (rev 82) @@ -132,6 +132,7 @@ tutti.label.tab.observationIndividuel=Observations individuelles tutti.label.tab.plancton=Plancton tutti.label.tab.species=Espèces +tutti.label.traitReminder=Trait \: %s tutti.legend.frequencyConfiguration=Configuration tutti.menu.actions=Actions tutti.menu.actions.tip=Actions Modified: trunk/tutti-ui-swing/src/main/resources/icons/action-edit-comment.png =================================================================== (Binary files differ)

1 0

r81 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/species util/table
by tchemit＠users.forge.codelutin.com Dec. 17, 2012

Dec. 17, 2012

Author: tchemit Date: 2012-12-17 08:39:44 +0100 (Mon, 17 Dec 2012) New Revision: 81 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/81 Log: add null value in comboeditor in tables + can quit frequency dialog via espace stroke Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java 2012-12-17 07:36:36 UTC (rev 80) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/FrequencyCellComponent.java 2012-12-17 07:39:44 UTC (rev 81) @@ -32,6 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.AbstractAction; import javax.swing.AbstractCellEditor; import javax.swing.JButton; import javax.swing.JTable; @@ -41,6 +42,7 @@ import java.awt.Color; import java.awt.Component; import java.awt.Frame; +import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -143,8 +145,17 @@ ui.editBatch(editRow); // open frequency dialog - TuttiUIUtil.openInDialog(ui, frame, _("tutti.title.frequency"), true, null); + TuttiUIUtil.openInDialog( + ui, frame, _("tutti.title.frequency"), true, + new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + ui.getHandler().close(); + } + }); + // at close, synch back frequencies editRow.updateTotalFromFrequencies(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2012-12-17 07:36:36 UTC (rev 80) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) @@ -280,6 +280,11 @@ List<B> data) { JComboBox comboBox = new JComboBox(); comboBox.setRenderer(newListCellRender(decorator)); + + // add a null value at first position + if (!data.isEmpty() && data.get(0) != null) { + data.add(0, null); + } SwingUtil.fillComboBox(comboBox, data, null); ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator);

1 0

r80 - in trunk/tutti-persistence-adagio/src: main/java/fr/ifremer/tutti/persistence main/java/fr/ifremer/tutti/persistence/config test/resources
by tchemit＠users.forge.codelutin.com Dec. 17, 2012

Dec. 17, 2012

Author: tchemit Date: 2012-12-17 08:36:36 +0100 (Mon, 17 Dec 2012) New Revision: 80 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/80 Log: prepare configuration for the adagio persistence module Added: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioProvider.java trunk/tutti-persistence-adagio/src/test/resources/tutti-test.properties Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java trunk/tutti-persistence-adagio/src/test/resources/conf.properties Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2012-12-17 07:32:05 UTC (rev 79) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2012-12-17 07:36:36 UTC (rev 80) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.persistence.config.TuttiPersistenceAdagioConfig; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; @@ -46,6 +47,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.WeightCategory; import fr.ifremer.tutti.persistence.entities.referential.Zone; +import org.apache.commons.io.FileUtils; import org.nuiton.util.ApplicationConfig; import java.io.IOException; @@ -57,6 +59,13 @@ */ public class TuttiPersistenceAdagioImpl implements TuttiPersistence { + /** + * Persistence config. + * + * @since 0.2 + */ + protected TuttiPersistenceAdagioConfig config; + @Override public String getImplementationName() { return "Persistence Adagio implementation"; @@ -64,6 +73,12 @@ @Override public void open(ApplicationConfig config) throws IOException { + this.config = new TuttiPersistenceAdagioConfig(config); + try { + FileUtils.forceMkdir(this.config.getDbDirectory()); + } catch (IOException e) { + throw new RuntimeException("Could not create directory", e); + } } @Override Added: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java (rev 0) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java 2012-12-17 07:36:36 UTC (rev 80) @@ -0,0 +1,66 @@ +package fr.ifremer.tutti.persistence.config; + +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.nuiton.util.ApplicationConfig; + +import java.io.File; + +/** + * Configuration for the persistence driver. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class TuttiPersistenceAdagioConfig { + + protected final ApplicationConfig config; + + public TuttiPersistenceAdagioConfig(ApplicationConfig config) { + this.config = config; + config.loadDefaultOptions(TuttiPersistenceAdagioConfigOption.values()); + } + + public File getDbDirectory() { + return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_PATH.getKey()); + } + + public File getDbName() { + return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_NAME.getKey()); + } + + public File getDbConfigurationPath() { + return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.DB_CONFIGURATION_PATH.getKey()); + } + + public File getDbMappingPath() { + return config.getOptionAsFile(TuttiPersistenceAdagioConfigOption.BB_MAPPING_PATH.getKey()); + } + + public ApplicationConfig getConfig() { + return config; + } + +} \ No newline at end of file Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java (rev 0) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java 2012-12-17 07:36:36 UTC (rev 80) @@ -0,0 +1,141 @@ +package fr.ifremer.tutti.persistence.config; + +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.nuiton.util.ApplicationConfig; + +import java.io.File; + +/** + * Persistence configuration options. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public enum TuttiPersistenceAdagioConfigOption implements ApplicationConfig.OptionDef { + + DB_PATH("tutti.persistence.dbPath", + "Répertoire où est la base de données", + "${tutti.data.directory}/db", + File.class, + true, + true), + DB_NAME("tutti.persistence.dbName", + "Nom du fichier de la base de données", + "tutti", + String.class, + true, + true), + + DB_CONFIGURATION_PATH("tutti.persistence.dbConfigurationµPath", + "Chemin du fichier de configuration de la base", + "${tutti.data.directory}/dbConfiguration.properties", + File.class, + true, + true), + BB_MAPPING_PATH("tutti.persistence.dbMappingPath", + "Chemin du fichier de mapping des constantes de la base", + "${tutti.data.directory}/dbMapping.properties", + File.class, + true, + true); + + /** Configuration key. */ + private final String key; + + /** I18n key of option description */ + private final String description; + + /** Type of option */ + private final Class<?> type; + + /** Default value of option. */ + private String defaultValue; + + /** Flag to not keep option value on disk */ + private boolean isTransient; + + /** Flag to not allow option value modification */ + private boolean isFinal; + + TuttiPersistenceAdagioConfigOption(String key, + String description, + String defaultValue, + Class<?> type, + boolean isTransient, + boolean isFinal) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + this.isTransient = isTransient; + this.isFinal = isFinal; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public boolean isTransient() { + return isTransient; + } + + @Override + public boolean isFinal() { + return isFinal; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public void setTransient(boolean newValue) { + // not used + } + + @Override + public void setFinal(boolean newValue) { + // not used + } +} \ No newline at end of file Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioConfigOption.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioProvider.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioProvider.java (rev 0) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioProvider.java 2012-12-17 07:36:36 UTC (rev 80) @@ -0,0 +1,59 @@ +package fr.ifremer.tutti.persistence.config; + +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ApplicationConfigProvider; + +import java.util.Locale; + +/** + * Persistence config provider (for site generation). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class TuttiPersistenceAdagioProvider implements ApplicationConfigProvider { + + @Override + public String getName() { + return "tutti-adagio-persistence"; + } + + @Override + public String getDescription(Locale locale) { + return "Configuration de la persistence de Tutti (Adagio implantation)."; + } + + @Override + public ApplicationConfig.OptionDef[] getOptions() { + return TuttiPersistenceAdagioConfigOption.values(); + } + + @Override + public ApplicationConfig.ActionDef[] getActions() { + return new ApplicationConfig.ActionDef[0]; + } +} Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceAdagioProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-persistence-adagio/src/test/resources/conf.properties =================================================================== --- trunk/tutti-persistence-adagio/src/test/resources/conf.properties 2012-12-17 07:32:05 UTC (rev 79) +++ trunk/tutti-persistence-adagio/src/test/resources/conf.properties 2012-12-17 07:36:36 UTC (rev 80) @@ -21,21 +21,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -#-------------------------------------------------------------------------- -# -# WARNING : For UNIT TEST ONLY -# -------------- -# Configuration file for agadio-persistence -# -# project : ${pom.name} -# version : ${pom.version} for ${pom.env} -# env : ${pom.env} - ${pom.profil} -# date : ${pom.date.fr} -# -# Copyright INRH/Ifremer 2012 -# -# 25/11/12 BL Creation -#-------------------------------------------------------------------------- # dataSource : jndi ou local dataSource.type=local @@ -50,6 +35,7 @@ dataSource.jdbc.username=sa dataSource.jdbc.password= dataSource.jdbc.url=jdbc:hsqldb:file:src/test/db/allegro +#dataSource.jdbc.url=jdbc:hsqldb:file:${tutti.persistence.dbPath}/${tutti.persistence.dbName} #dataSource.jdbc.url=jdbc:hsqldb:hsql://localhost/toto # Hibernate configuration : Added: trunk/tutti-persistence-adagio/src/test/resources/tutti-test.properties =================================================================== --- trunk/tutti-persistence-adagio/src/test/resources/tutti-test.properties (rev 0) +++ trunk/tutti-persistence-adagio/src/test/resources/tutti-test.properties 2012-12-17 07:36:36 UTC (rev 80) @@ -0,0 +1,24 @@ +### +# #%L +# Tutti :: Persistence Adagio (impl) +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +tutti.data.directory=${testDirectory} Property changes on: trunk/tutti-persistence-adagio/src/test/resources/tutti-test.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r79 - trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence
by tchemit＠users.forge.codelutin.com Dec. 17, 2012

Dec. 17, 2012

Author: tchemit Date: 2012-12-17 08:32:05 +0100 (Mon, 17 Dec 2012) New Revision: 79 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/79 Log: remove too hard test for the moment on entity removal Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2012-12-15 16:15:44 UTC (rev 78) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2012-12-17 07:32:05 UTC (rev 79) @@ -769,7 +769,13 @@ protected <B extends IdAware> void remove(Class<B> type, String id) { Preconditions.checkNotNull(id, "Can't delete a null id"); B bean = getBean(type, id); - Preconditions.checkNotNull(bean, "Can't delete a null bean"); + //FIXME tchemit Should never happen! + if (bean == null) { + if (log.isWarnEnabled()) { + log.warn("No bean with id: " + id); + } + } +// Preconditions.checkNotNull(bean, "Can't delete a null bean"); cache.remove(type, bean); persistToFile(type); }

1 0

r78 - trunk/tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Dec. 15, 2012

Dec. 15, 2012

Author: tchemit Date: 2012-12-15 17:15:44 +0100 (Sat, 15 Dec 2012) New Revision: 78 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/78 Log: optimize i18n Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-15 16:05:45 UTC (rev 77) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-15 16:15:44 UTC (rev 78) @@ -163,8 +163,6 @@ tutti.table.macrowaste.batch.header.comment=Commentaire tutti.table.macrowaste.batch.header.file=Pièces jointes tutti.table.macrowaste.batch.header.macroWasteCategory=Catégorie -tutti.table.macrowaste.batch.header.speciesByCode=Espèce -tutti.table.macrowaste.batch.header.speciesByGenusCode=Espèce tutti.table.macrowaste.batch.header.weight=Poids tutti.table.plankton.batch.header.comment=Commentaire tutti.table.plankton.batch.header.elevationRate=Fraction d'élévation @@ -207,7 +205,6 @@ tutti.title.selectedCruise=Campagne %s tutti.title.selectedProgram=Série de campagne %s tutti.to.be.done=< A FAIRE > -tutti.tooltip.= tutti.tooltip.attachment.none=Pas de pièce-jointes tutti.tooltip.comment.none=Pas de commentaire tutti.validator.error.cruise.beginDate.required=La date de début est obligatoire

1 0

r77 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/resources/META-INF/services tutti-persistence/src/main/xmi tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/resources/i18n tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com Dec. 15, 2012

Dec. 15, 2012

Author: tchemit Date: 2012-12-15 17:05:45 +0100 (Sat, 15 Dec 2012) New Revision: 77 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/77 Log: add new entities (macroWasteCategory, SortedUnsortedCategory) improve batch handler design add filter on batch tables improve longtext editor improve attachment editor Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java trunk/tutti-ui-swing/src/main/resources/icons/action-edit-attachment.png trunk/tutti-ui-swing/src/main/resources/icons/action-edit-comment.png Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTreeModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2012-12-15 16:05:45 UTC (rev 77) @@ -36,9 +36,11 @@ import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.SeaState; import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Strata; import fr.ifremer.tutti.persistence.entities.referential.Vessel; @@ -72,6 +74,8 @@ //-- Referential methods --// //------------------------------------------------------------------------// + List<SortedUnsortedCategory> getAllSortedUnsortedCategory(); + List<WeightCategory> getAllWeightCategory(); List<Sex> getAllSex(); @@ -94,6 +98,8 @@ List<Person> getAllPerson(); + List<MacroWasteCategory> getAllMacroWasteCategory(); + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware =================================================================== --- trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware 2012-12-15 16:05:45 UTC (rev 77) @@ -1,3 +1,4 @@ +fr.ifremer.tutti.persistence.entities.data.Attachment fr.ifremer.tutti.persistence.entities.data.AccidentalBatch fr.ifremer.tutti.persistence.entities.data.BenthosBatch fr.ifremer.tutti.persistence.entities.data.FishingOperation @@ -10,9 +11,11 @@ fr.ifremer.tutti.persistence.entities.referential.BeaufortScale fr.ifremer.tutti.persistence.entities.referential.Country fr.ifremer.tutti.persistence.entities.referential.Gear +fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory fr.ifremer.tutti.persistence.entities.referential.Person fr.ifremer.tutti.persistence.entities.referential.SeaState fr.ifremer.tutti.persistence.entities.referential.Sex +fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory fr.ifremer.tutti.persistence.entities.referential.Species fr.ifremer.tutti.persistence.entities.referential.Strata fr.ifremer.tutti.persistence.entities.referential.Vessel Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2012-12-15 16:05:45 UTC (rev 77) @@ -36,9 +36,11 @@ import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.SeaState; import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Strata; import fr.ifremer.tutti.persistence.entities.referential.Vessel; @@ -69,6 +71,11 @@ } @Override + public List<SortedUnsortedCategory> getAllSortedUnsortedCategory() { + return null; + } + + @Override public List<WeightCategory> getAllWeightCategory() { return null; } @@ -124,6 +131,11 @@ } @Override + public List<MacroWasteCategory> getAllMacroWasteCategory() { + return null; + } + + @Override public List<Program> getAllProgram() { return null; } Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java 2012-12-15 16:05:45 UTC (rev 77) @@ -26,14 +26,16 @@ import com.google.common.collect.ArrayListMultimap; import fr.ifremer.tutti.persistence.entities.IdAware; -import fr.ifremer.tutti.persistence.entities.referential.Person; -import fr.ifremer.tutti.persistence.entities.referential.Strata; import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory; +import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.SeaState; import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.persistence.entities.referential.Strata; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.WeightCategory; import fr.ifremer.tutti.persistence.entities.referential.Zone; @@ -257,6 +259,39 @@ wc.setName("Gros"); cache.put(WeightCategory.class, wc); + SortedUnsortedCategory suc; + + suc = new SortedUnsortedCategory(); + suc.setId(UUID.randomUUID().toString()); + suc.setName("Vrac"); + cache.put(SortedUnsortedCategory.class, suc); + + suc = new SortedUnsortedCategory(); + suc.setId(UUID.randomUUID().toString()); + suc.setName("Hors Vrac"); + cache.put(SortedUnsortedCategory.class, suc); + + MacroWasteCategory mwc; + + mwc = new MacroWasteCategory(); + mwc.setId(UUID.randomUUID().toString()); + mwc.setName("Pneu"); + cache.put(MacroWasteCategory.class, mwc); + + mwc = new MacroWasteCategory(); + mwc.setId(UUID.randomUUID().toString()); + mwc.setName("Plastique"); + cache.put(MacroWasteCategory.class, mwc); + + mwc = new MacroWasteCategory(); + mwc.setId(UUID.randomUUID().toString()); + mwc.setName("Machine à laver"); + cache.put(MacroWasteCategory.class, mwc); + + mwc = new MacroWasteCategory(); + mwc.setId(UUID.randomUUID().toString()); + mwc.setName("Métal"); + cache.put(MacroWasteCategory.class, mwc); } public List<Zone> zone() { @@ -304,7 +339,15 @@ return getData(WeightCategory.class); } - protected <B extends IdAware> List<B> getData(Class<B> entityType) { + public List<SortedUnsortedCategory> sortedUnsortedCategory() { + return getData(SortedUnsortedCategory.class); + } + + public List<MacroWasteCategory> macroWasteCategory() { + return getData(MacroWasteCategory.class); + } + + public <B extends IdAware> List<B> getData(Class<B> entityType) { List<B> result = (List<B>) cache.get(entityType); return result; } Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2012-12-15 16:05:45 UTC (rev 77) @@ -48,9 +48,11 @@ import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.SeaState; import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Strata; import fr.ifremer.tutti.persistence.entities.referential.Vessel; @@ -171,6 +173,13 @@ //------------------------------------------------------------------------// @Override + public List<SortedUnsortedCategory> getAllSortedUnsortedCategory() { + List<SortedUnsortedCategory> result = + getDataInNewList(SortedUnsortedCategory.class); + return result; + } + + @Override public List<WeightCategory> getAllWeightCategory() { List<WeightCategory> result = getDataInNewList(WeightCategory.class); @@ -220,6 +229,13 @@ } @Override + public List<MacroWasteCategory> getAllMacroWasteCategory() { + List<MacroWasteCategory> result = + getDataInNewList(MacroWasteCategory.class); + return result; + } + + @Override public List<SeaState> getAllSeaState() { List<SeaState> result = getDataInNewList(SeaState.class); return result; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2012-12-15 16:05:45 UTC (rev 77) @@ -24,17 +24,20 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.referential.Person; -import fr.ifremer.tutti.persistence.entities.referential.Strata; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory; +import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.SeaState; import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.persistence.entities.referential.Strata; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.WeightCategory; import fr.ifremer.tutti.persistence.entities.referential.Zone; @@ -57,6 +60,8 @@ public static final String BY_NAME = "byName"; + public static final String SEPARATOR = "#"; + /** Delegate decorator provider. */ protected DecoratorProvider decoratorProvider; @@ -84,23 +89,26 @@ @Override protected void loadDecorators() { - registerMultiJXPathDecorator(Program.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(Cruise.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${date}$td/%3$tm/%3$tY", "#", " - "); - registerMultiJXPathDecorator(Zone.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(Vessel.class, "${name}$s#", "#", " - "); - registerMultiJXPathDecorator(Country.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(Gear.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(Person.class, "${firstName}$s#${lastName}$s", "#", " "); - registerMultiJXPathDecorator(BeaufortScale.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(SeaState.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(Strata.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(Sex.class, "${name}$s", "#", " - "); - registerMultiJXPathDecorator(Species.class, "${codeMemo}#${genusSpecies}$s", "#", " - "); - registerJXPathDecorator(Species.class, SPECIES_BY_CODE, "${codeMemo}$s"); - registerJXPathDecorator(Species.class, SPECIES_BY_GENUS, "${genusSpecies}$s"); - registerJXPathDecorator(WeightCategory.class, BY_NAME, "${name}$s"); - registerJXPathDecorator(Sex.class, BY_NAME, "${name}$s"); + registerMultiJXPathDecorator(Program.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Cruise.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${date}$td/%3$tm/%3$tY", SEPARATOR, " - "); + registerMultiJXPathDecorator(Zone.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Vessel.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Country.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Gear.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Person.class, "${firstName}$s#${lastName}$s", SEPARATOR, " "); + registerMultiJXPathDecorator(BeaufortScale.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(SeaState.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Strata.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Sex.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(SortedUnsortedCategory.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(MacroWasteCategory.class, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Species.class, "${codeMemo}$s#${genusSpecies}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Species.class, SPECIES_BY_CODE, "${codeMemo}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Species.class, SPECIES_BY_GENUS, "${genusSpecies}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(WeightCategory.class, BY_NAME, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Sex.class, BY_NAME, "${name}$s", SEPARATOR, " - "); + registerMultiJXPathDecorator(Attachment.class, "${name}$s", SEPARATOR, " - "); } }; } @@ -124,6 +132,9 @@ n_("tutti.property.strata"); n_("tutti.property.codeMemo"); n_("tutti.property.genusSpecies"); + n_("tutti.property.sortedUnsortedCategory"); + n_("tutti.property.macroWasteCategory"); + n_("tutti.property.attachment"); } } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2012-12-15 16:05:45 UTC (rev 77) @@ -38,9 +38,11 @@ import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale; import fr.ifremer.tutti.persistence.entities.referential.Country; import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.SeaState; import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Strata; import fr.ifremer.tutti.persistence.entities.referential.Vessel; @@ -133,6 +135,12 @@ //------------------------------------------------------------------------// @Override + public List<SortedUnsortedCategory> getAllSortedUnsortedCategory() { + checkDriverExists(); + return driver.getAllSortedUnsortedCategory(); + } + + @Override public List<WeightCategory> getAllWeightCategory() { checkDriverExists(); return driver.getAllWeightCategory(); @@ -181,6 +189,12 @@ } @Override + public List<MacroWasteCategory> getAllMacroWasteCategory() { + checkDriverExists(); + return driver.getAllMacroWasteCategory(); + } + + @Override public List<SeaState> getAllSeaState() { checkDriverExists(); return driver.getAllSeaState(); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2012-12-15 16:05:45 UTC (rev 77) @@ -3,6 +3,7 @@ tutti.config.data.directory=Répertoire de données de l'application. Vous pouvez utiliser l'expression ${tutti.data.directory} pour le référence dans d'autres propriétés de configuration (ex\: ${tutti.data.directory}/tmp). tutti.config.license.organizationName=Nom de l'organisation dans la licence tutti.config.tmp.directory=Répertoire temporaire utilisée par l'application (est nettoyé à chaque démarrage de l'application) +tutti.property.attachment=Pièce jointe tutti.property.beaufortScale=Vent beaufort tutti.property.codeMemo=Code Memo tutti.property.country=Pays @@ -13,9 +14,11 @@ tutti.property.gear=Engin tutti.property.genusSpecies=Nom scientifique tutti.property.lastName=Nom de Famille +tutti.property.macroWasteCategory=Type de macro déchet tutti.property.name=Nom tutti.property.program=Série de campagne tutti.property.seaState=État de la mer +tutti.property.sortedUnsortedCategory=Vrac / Hors Vrac tutti.property.stationNumber=Numéro de station tutti.property.strata=Strate d'association tutti.property.user=Utilisateur Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -33,10 +33,9 @@ import fr.ifremer.tutti.ui.swing.config.TuttiConfig; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.editor.SimpleTimeEditor; -import jaxx.runtime.swing.OneClicListSelectionModel; import jaxx.runtime.swing.editor.NumberEditor; import jaxx.runtime.swing.editor.bean.BeanComboBox; -import jaxx.runtime.swing.editor.bean.BeanListHeader; +import jaxx.runtime.swing.editor.bean.BeanDoubleList; import jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,7 +61,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import jaxx.runtime.swing.editor.bean.BeanDoubleList; /** * Contract of any UI handler. @@ -186,7 +184,9 @@ * Prépare un component de choix d'entités pour un type d'entité donné et * pour un service de persistance donné. * - * @param listHeader le component graphique à initialiser + * @param list le component graphique à initialiser + * @param data + * @param selectedData */ protected <E extends IdAware> void initBeanList( BeanDoubleList<E> list, @@ -206,7 +206,7 @@ // add data list to combo box list.init((JXPathDecorator<E>) decorator, data, selectedData); - + // OneClicListSelectionModel.installModel(listHeader.getList()); // updateIndices(listHeader.getList(), selectedData); Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -0,0 +1,197 @@ +package fr.ifremer.tutti.ui.swing.content.operation; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.ezware.oxbow.swingbits.table.filter.DistinctColumnItem; +import com.ezware.oxbow.swingbits.table.filter.IFilterChangeListener; +import com.ezware.oxbow.swingbits.table.filter.ITableFilter; +import com.ezware.oxbow.swingbits.table.filter.JTableFilter; +import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; +import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; +import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; +import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; +import fr.ifremer.tutti.ui.swing.util.table.TableRowModificationListener; +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; +import org.jdesktop.swingx.decorator.ComponentAdapter; +import org.jdesktop.swingx.decorator.HighlightPredicate; +import org.jdesktop.swingx.decorator.Highlighter; +import org.jdesktop.swingx.sort.TableSortController; + +import javax.swing.event.ListSelectionListener; +import javax.swing.table.TableColumnModel; +import javax.swing.table.TableModel; +import java.awt.Color; +import java.awt.Component; +import java.awt.event.FocusEvent; +import java.util.Collection; + +/** + * Abstract ui handler forbatch ui. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBeanUIModel, M extends AbstractTuttiTableUIModel<?, R, M>> extends AbstractTuttiTableUIHandler<R, M> { + + + /** Logger. */ + private static final Log log = + LogFactory.getLog(AbstractTuttiBatchTableUIHandler.class); + + protected abstract void saveSelectedRowIfRequired(); + + protected abstract boolean isRowValid(R row); + + protected abstract void saveRow(R row); + + protected abstract FishingOperation getFishingOperation(); + + public abstract void selectFishingOperation(FishingOperation bean); + + /** + * Persistence service. + * + * @since 0.2 + */ + protected final PersistenceService persistenceService; + + /** + * To monitor changes on the fishing operation. + * + * @since 0.2 + */ + protected final TuttiBeanMonitor<M> fishingOperationMonitor; + + protected AbstractTuttiBatchTableUIHandler(FishingOperationsUI parentUi, + String[] fishingProperties, + String... properties) { + super(parentUi.getHandler().getContext(), properties); + this.persistenceService = context.getService(PersistenceService.class); + this.fishingOperationMonitor = new TuttiBeanMonitor<M>( + fishingProperties); + } + + public final void saveSelectedRowIfRequired(FocusEvent event) { + + Component oppositeComponent = event.getOppositeComponent(); + + JXTable parentContainer = null; + + if (oppositeComponent != null) { + + // check out if still on table + parentContainer = SwingUtil.getParentContainer( + oppositeComponent, JXTable.class); + } + + if (parentContainer == null) { + + // out of the table can save + if (getFishingOperation() != null) { + saveSelectedRowIfRequired(); + } + } + } + + protected void initBatchTable(JXTable table, + TableColumnModel columnModel, + AbstractTuttiTableModel<R> tableModel) { + + installTableKeyListener(columnModel, table); + table.getTableHeader().setReorderingAllowed(false); + + JTableFilter tableFilter = new JTableFilter(table); + TableRowFilterSupport.forFilter(tableFilter).searchable(true).useTableRenderers(true).actions(true).apply(); + + tableFilter.addChangeListener(new IFilterChangeListener() { + @Override + public void filterChanged(ITableFilter<?> filter) { + if (log.isInfoEnabled()) { + log.info("Filter changed " + filter); + } + TableModel model = filter.getTable().getModel(); + int columnCount = model.getColumnCount(); + for (int i = 0; i < columnCount; i++) { + if (filter.isFiltered(i)) { + Collection<DistinctColumnItem> filterState = filter.getFilterState(i); + if (log.isInfoEnabled()) { + log.info("Column " + i + " is filtered: " + filterState); + } + } + } + } + }); + + TableSortController<TableModel> sorter = new TableSortController<TableModel>(tableModel); + sorter.setSortable(false); + + table.setRowSorter(sorter); + + Highlighter readOnlyHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( + HighlightPredicate.READ_ONLY, Color.LIGHT_GRAY); + + table.addHighlighter(readOnlyHighlighter); + Highlighter validHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( + new HighlightPredicate.AndHighlightPredicate(HighlightPredicate.EDITABLE, new HighlightPredicate() { + @Override + public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { + + boolean result = false; + if (adapter.isEditable()) { + int rowIndex = adapter.convertRowIndexToModel(adapter.row); + R row = getTableModel().getEntry(rowIndex); + result = !row.isValid(); + } + return result; + } + }), Color.RED); + table.addHighlighter(validHighlighter); + + // when model datas change let's propagate it table model + listenRowsFromModel(); + + // save when row chaged and was modified + ListSelectionListener listener = new TableRowModificationListener<R>( + tableModel, getRowMonitor()) { + @Override + protected void saveSelectedRow() { + saveSelectedRowIfRequired(); + } + }; + table.getSelectionModel().addListSelectionListener(listener); + + // always scroll to selected row + SwingUtil.scrollToTableSelection(table); + } + +} Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchTableUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchRowModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchRowModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -25,11 +25,14 @@ */ import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; +import java.util.List; + /** * Define a benthos batch row. * @@ -46,6 +49,8 @@ public static final String PROPERTY_COMMENT = "comment"; + public static final String PROPERTY_ATTACHMENTS = "attachments"; + /** * Species observed. * @@ -67,6 +72,13 @@ */ protected String comment; + /** + * Attachments + * + * @since 0.2 + */ + protected List<Attachment> attachments; + protected static final Binder<AccidentalBatch, AccidentalBatchRowModel> fromBeanBinder = BinderFactory.newBinder(AccidentalBatch.class, AccidentalBatchRowModel.class); @@ -113,4 +125,14 @@ this.comment = comment; firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + + public List<Attachment> getAttachments() { + return attachments; + } + + public void setAttachments(List<Attachment> attachments) { + Object oldValue = getAttachments(); + this.attachments = attachments; + firePropertyChange(PROPERTY_ATTACHMENTS, oldValue, attachments); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchTableModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchTableModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -42,36 +42,34 @@ public static final ColumnIdentifier<AccidentalBatchRowModel> SPECIES_BY_CODE = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.benthos.batch.header.speciesByCode"), - n_("tutti.table.benthos.batch.header.speciesByCode")); + n_("tutti.table.accidental.batch.header.speciesByCode"), + n_("tutti.table.accidental.batch.header.speciesByCode")); public static final ColumnIdentifier<AccidentalBatchRowModel> SPECIES_BY_GENUS_CODE = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.benthos.batch.header.speciesByGenusCode"), - n_("tutti.table.benthos.batch.header.speciesByGenusCode")); + n_("tutti.table.accidental.batch.header.speciesByGenusCode"), + n_("tutti.table.accidental.batch.header.speciesByGenusCode")); public static final ColumnIdentifier<AccidentalBatchRowModel> WEIGHT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_WEIGHT, - n_("tutti.table.benthos.batch.header.weight"), - n_("tutti.table.benthos.batch.header.weight")); + n_("tutti.table.accidental.batch.header.weight"), + n_("tutti.table.accidental.batch.header.weight")); public static final ColumnIdentifier<AccidentalBatchRowModel> COMMENT = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_COMMENT, - n_("tutti.table.benthos.batch.header.comment"), - n_("tutti.table.benthos.batch.header.comment")); + n_("tutti.table.accidental.batch.header.comment"), + n_("tutti.table.accidental.batch.header.comment")); - public static final ColumnIdentifier<AccidentalBatchRowModel> FILE = ColumnIdentifier.newId( - null, - n_("tutti.table.benthos.batch.header.file"), - n_("tutti.table.benthos.batch.header.file")); + public static final ColumnIdentifier<AccidentalBatchRowModel> ATTACHMENTS = ColumnIdentifier.newId( + AccidentalBatchRowModel.PROPERTY_ATTACHMENTS, + n_("tutti.table.accidental.batch.header.file"), + n_("tutti.table.accidental.batch.header.file")); public AccidentalBatchTableModel(TableColumnModel columnModel) { super(columnModel); - setNoneEditableCols( - FILE - ); + setNoneEditableCols(); } @Override @@ -94,14 +92,12 @@ if (propertyName == SPECIES_BY_CODE) { // update also other columns - fireTableCellUpdated(rowIndex, - SPECIES_BY_GENUS_CODE); + fireTableCellUpdated(rowIndex, SPECIES_BY_GENUS_CODE); } else if (propertyName == SPECIES_BY_GENUS_CODE) { // update also other columns - fireTableCellUpdated(rowIndex, - SPECIES_BY_CODE); + fireTableCellUpdated(rowIndex, SPECIES_BY_CODE); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx 2012-12-15 16:05:45 UTC (rev 77) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI fr.ifremer.tutti.ui.swing.util.editor.LongTextEditorUI + fr.ifremer.tutti.ui.swing.util.editor.AttachmentEditorUI jaxx.runtime.swing.editor.NumberEditor @@ -61,10 +62,12 @@ <AccidentalBatchUIModel id='model' initializer='getContextValue(AccidentalBatchUIModel.class)'/> - <LongTextEditorUI id='longTextEditorUI'/> + <LongTextEditorUI id='longTextEditor'/> + + <AttachmentEditorUI id='attachmentEditor'/> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event);'/> + <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event)'/> </JScrollPane> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -27,42 +27,37 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUI; +import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; -import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import fr.ifremer.tutti.ui.swing.util.table.TableRowModificationListener; -import jaxx.runtime.SwingUtil; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; -import javax.swing.event.ListSelectionListener; import javax.swing.table.TableColumnModel; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.FocusEvent; import java.util.List; +import static org.nuiton.i18n.I18n.n_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class AccidentalBatchUIHandler extends AbstractTuttiTableUIHandler<AccidentalBatchRowModel, AccidentalBatchUIModel> { +public class AccidentalBatchUIHandler extends AbstractTuttiBatchTableUIHandler<AccidentalBatchRowModel, AccidentalBatchUIModel> { /** Logger. */ - private static final Log log = LogFactory.getLog(AccidentalBatchUIHandler.class); + private static final Log log = + LogFactory.getLog(AccidentalBatchUIHandler.class); /** * UI. @@ -71,28 +66,13 @@ */ private final AccidentalBatchUI ui; - /** - * Persistence service. - * - * @since 0.2 - */ - private final PersistenceService persistenceService; - - /** - * To monitor changes on the fishing operation. - * - * @since 0.2 - */ - private final TuttiBeanMonitor<AccidentalBatchUIModel> fishingOperationMonitor; - - public AccidentalBatchUIHandler(FishingOperationsUI parentUi, AccidentalBatchUI ui) { - super(parentUi.getHandler().getContext(), + public AccidentalBatchUIHandler(FishingOperationsUI parentUi, + AccidentalBatchUI ui) { + super(parentUi, ArrayUtils.EMPTY_STRING_ARRAY, AccidentalBatchRowModel.PROPERTY_SPECIES, AccidentalBatchRowModel.PROPERTY_WEIGHT, AccidentalBatchRowModel.PROPERTY_COMMENT); this.ui = ui; - this.persistenceService = context.getService(PersistenceService.class); - this.fishingOperationMonitor = new TuttiBeanMonitor<AccidentalBatchUIModel>(); } //------------------------------------------------------------------------// @@ -115,6 +95,11 @@ } @Override + protected FishingOperation getFishingOperation() { + return getModel().getFishingOperation(); + } + + @Override protected TableColumnModel createTableColumnModel() { DefaultTableColumnModelExt columnModel = @@ -155,15 +140,19 @@ { // Comment column addColumnToModel(columnModel, - LongTextCellComponent.newEditor(ui.getLongTextEditorUI()), - LongTextCellComponent.newRender(), + LongTextCellComponent.newEditor(ui.getLongTextEditor()), + LongTextCellComponent.newRender(n_("tutti.tooltip.comment.none")), AccidentalBatchTableModel.COMMENT); } { // File column addColumnToModel(columnModel, - AccidentalBatchTableModel.FILE); + AttachmentCellComponent.newEditor(ui.getAttachmentEditor()), + AttachmentCellComponent.newRender( + getDecorator(Attachment.class, null), + n_("tutti.tooltip.attachment.none")), + AccidentalBatchTableModel.ATTACHMENTS); } return columnModel; } @@ -212,118 +201,71 @@ } } - //------------------------------------------------------------------------// - //-- AbstractTuttiUIHandler methods --// - //------------------------------------------------------------------------// - @Override - public void beforeInitUI() { + protected void saveSelectedRowIfRequired() { - if (log.isInfoEnabled()) { - log.info("beforeInit: " + ui); - } + TuttiBeanMonitor<AccidentalBatchRowModel> rowMonitor = getRowMonitor(); - AccidentalBatchUIModel model = new AccidentalBatchUIModel(); - ui.setContextValue(model); + AccidentalBatchRowModel bean = rowMonitor.getBean(); + if (bean != null) { - fishingOperationMonitor.setBean(model); - } + if (bean.isValid()) { + // there is a valid bean attached to the monitor - @Override - public void afterInitUI() { + if (rowMonitor.wasModified()) { - if (log.isInfoEnabled()) { - log.info("afterInit: " + ui); - } + // monitored bean was modified, save it + if (log.isInfoEnabled()) { + log.info("Row " + bean + " was modified, will save it"); + } - initUI(ui); + saveRow(bean); - JXTable table = getTable(); + // clear modified flag on the monitor + rowMonitor.clearModified(); + } + } else { - // create table column model - TableColumnModel columnModel = createTableColumnModel(); + // row is not valid can not save it - // create table model - AccidentalBatchTableModel tableModel = - new AccidentalBatchTableModel(columnModel); + AccidentalBatch catchBean = bean.toBean(); - table.setModel(tableModel); - table.setColumnModel(columnModel); - installTableKeyListener(columnModel, table); + if (!TuttiEntities.isNew(catchBean)) { - table.getTableHeader().setReorderingAllowed(false); - - - Highlighter readOnlyHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - HighlightPredicate.READ_ONLY, Color.LIGHT_GRAY); - - table.addHighlighter(readOnlyHighlighter); - Highlighter validHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - new HighlightPredicate.AndHighlightPredicate(HighlightPredicate.EDITABLE, new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - - boolean result = false; - if (adapter.isEditable()) { - int rowIndex = adapter.convertRowIndexToModel(adapter.row); - AccidentalBatchRowModel row = getTableModel().getEntry(rowIndex); - result = !row.isValid(); - } - return result; - } - }), Color.RED); - table.addHighlighter(validHighlighter); - - // when model datas change let's propagate it table model - listenRowsFromModel(); - - // save when row chaged and was modified - ListSelectionListener listener = new TableRowModificationListener<AccidentalBatchRowModel>( - getTableModel(), getRowMonitor()) { - @Override - protected void saveSelectedRow() { - saveSelectedRowIfRequired(); + // remove this + persistenceService.deleteAccidentalBatch(catchBean.getId()); + } } - }; - table.getSelectionModel().addListSelectionListener(listener); - - // always scroll to selected row - SwingUtil.scrollToTableSelection(getTable()); + } } @Override - public void onCloseUI() { - if (log.isInfoEnabled()) { - log.info("closing: " + ui); - } + protected boolean isRowValid(AccidentalBatchRowModel row) { + boolean result = row.getSpecies() != null && row.getWeight() != null; + return result; } - //------------------------------------------------------------------------// - //-- Public methods --// - //------------------------------------------------------------------------// + @Override + protected void saveRow(AccidentalBatchRowModel row) { - public void saveSelectedRowIfRequired(FocusEvent event) { + AccidentalBatch catchBean = row.toBean(); - Component oppositeComponent = event.getOppositeComponent(); - - JXTable parentContainer = null; - - if (oppositeComponent != null) { - - // check out if still on table - parentContainer = SwingUtil.getParentContainer( - oppositeComponent, JXTable.class); + FishingOperation fishingOperation = getModel().getFishingOperation(); + catchBean.setFishingOperation(fishingOperation); + if (log.isInfoEnabled()) { + log.info("Selected fishingOperation: " + fishingOperation.getId()); } - if (parentContainer == null) { + if (TuttiEntities.isNew(catchBean)) { - // out of the table can save - if (getModel().getFishingOperation() != null) { - saveSelectedRowIfRequired(); - } + catchBean = persistenceService.createAccidentalBatch(catchBean); + row.setId(catchBean.getId()); + } else { + persistenceService.saveAccidentalBatch(catchBean); } } + @Override public void selectFishingOperation(FishingOperation bean) { JXTable table = getTable(); @@ -387,81 +329,60 @@ fishingOperationMonitor.clearModified(); } - public void cancel() { + //------------------------------------------------------------------------// + //-- AbstractTuttiUIHandler methods --// + //------------------------------------------------------------------------// - if (log.isInfoEnabled()) { - log.info("Cancel edition"); - } - } + @Override + public void beforeInitUI() { - public void save() { if (log.isInfoEnabled()) { - log.info("Will save"); + log.info("beforeInit: " + ui); } - } - //------------------------------------------------------------------------// - //-- Internal methods --// - //------------------------------------------------------------------------// + AccidentalBatchUIModel model = new AccidentalBatchUIModel(); + ui.setContextValue(model); - protected boolean isRowValid(AccidentalBatchRowModel row) { - boolean result = row.getSpecies() != null && row.getWeight() != null; - return result; + fishingOperationMonitor.setBean(model); } - protected void saveSelectedRowIfRequired() { + @Override + public void afterInitUI() { - TuttiBeanMonitor<AccidentalBatchRowModel> rowMonitor = getRowMonitor(); + if (log.isInfoEnabled()) { + log.info("afterInit: " + ui); + } - AccidentalBatchRowModel bean = rowMonitor.getBean(); - if (bean != null) { + initUI(ui); - if (bean.isValid()) { - // there is a valid bean attached to the monitor + JXTable table = getTable(); - if (rowMonitor.wasModified()) { + // create table column model + TableColumnModel columnModel = createTableColumnModel(); - // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + bean + " was modified, will save it"); - } + // create table model + AccidentalBatchTableModel tableModel = + new AccidentalBatchTableModel(columnModel); - saveRow(bean); + table.setModel(tableModel); + table.setColumnModel(columnModel); - // clear modified flag on the monitor - rowMonitor.clearModified(); - } - } else { - - // row is not valid can not save it - - AccidentalBatch catchBean = bean.toBean(); - - if (!TuttiEntities.isNew(catchBean)) { - - // remove this - persistenceService.deleteAccidentalBatch(catchBean.getId()); - } - } - } + initBatchTable(table, columnModel, tableModel); } - protected void saveRow(AccidentalBatchRowModel row) { - - AccidentalBatch catchBean = row.toBean(); - - FishingOperation fishingOperation = getModel().getFishingOperation(); - catchBean.setFishingOperation(fishingOperation); + @Override + public void onCloseUI() { if (log.isInfoEnabled()) { - log.info("Selected fishingOperation: " + fishingOperation.getId()); + log.info("closing: " + ui); } + } - if (TuttiEntities.isNew(catchBean)) { + //------------------------------------------------------------------------// + //-- Public methods --// + //------------------------------------------------------------------------// - catchBean = persistenceService.createAccidentalBatch(catchBean); - row.setId(catchBean.getId()); - } else { - persistenceService.saveAccidentalBatch(catchBean); - } - } + //------------------------------------------------------------------------// + //-- Internal methods --// + //------------------------------------------------------------------------// + } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchRowModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchRowModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -24,12 +24,15 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; +import java.util.List; + /** * Define a benthos batch row. * @@ -52,6 +55,8 @@ public static final String PROPERTY_COMMENT = "comment"; + public static final String PROPERTY_ATTACHMENTS = "attachments"; + /** * Species observed. * @@ -94,6 +99,13 @@ */ protected String comment; + /** + * Attachments + * + * @since 0.2 + */ + protected List<Attachment> attachments; + protected static final Binder<BenthosBatch, BenthosBatchRowModel> fromBeanBinder = BinderFactory.newBinder(BenthosBatch.class, BenthosBatchRowModel.class); @@ -170,4 +182,15 @@ this.comment = comment; firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + + public List<Attachment> getAttachments() { + return attachments; + } + + public void setAttachments(List<Attachment> attachments) { + Object oldValue = getAttachments(); + this.attachments = attachments; + firePropertyChange(PROPERTY_ATTACHMENTS, oldValue, attachments); + } + } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchTableModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchTableModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -24,6 +24,7 @@ * #L% */ +import fr.ifremer.tutti.ui.swing.content.operation.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; @@ -75,8 +76,8 @@ n_("tutti.table.benthos.batch.header.comment"), n_("tutti.table.benthos.batch.header.comment")); - public static final ColumnIdentifier<BenthosBatchRowModel> FILE = ColumnIdentifier.newId( - null, + public static final ColumnIdentifier<BenthosBatchRowModel> ATTACHMENTS = ColumnIdentifier.newId( + SpeciesBatchRowModel.PROPERTY_ATTACHMENTS, n_("tutti.table.benthos.batch.header.file"), n_("tutti.table.benthos.batch.header.file")); @@ -84,11 +85,7 @@ public BenthosBatchTableModel(TableColumnModel columnModel) { super(columnModel); - setNoneEditableCols( - SAMPLE_WEIGHT, - SAMPLING_RATIO, - FILE - ); + setNoneEditableCols(SAMPLE_WEIGHT, SAMPLING_RATIO); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx 2012-12-15 16:05:45 UTC (rev 77) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI fr.ifremer.tutti.ui.swing.util.editor.LongTextEditorUI + fr.ifremer.tutti.ui.swing.util.editor.AttachmentEditorUI jaxx.runtime.swing.editor.NumberEditor @@ -72,8 +73,10 @@ <field name='sampleTotalWeight' component='sampleTotalWeightField'/> </BeanValidator> - <LongTextEditorUI id='longTextEditorUI'/> + <LongTextEditorUI id='longTextEditor'/> + <AttachmentEditorUI id='attachmentEditor'/> + <Table id='form' fill='both' constraints='BorderLayout.NORTH'>  Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -26,43 +26,37 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUI; +import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; -import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import fr.ifremer.tutti.ui.swing.util.table.TableRowModificationListener; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; -import javax.swing.event.ListSelectionListener; import javax.swing.table.TableColumnModel; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.FocusEvent; import java.util.List; +import static org.nuiton.i18n.I18n.n_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class BenthosBatchUIHandler extends AbstractTuttiTableUIHandler<BenthosBatchRowModel, BenthosBatchUIModel> { +public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<BenthosBatchRowModel, BenthosBatchUIModel> { /** Logger. */ - private static final Log log = LogFactory.getLog(BenthosBatchUIHandler.class); + private static final Log log = + LogFactory.getLog(BenthosBatchUIHandler.class); /** * UI. @@ -71,32 +65,17 @@ */ private final BenthosBatchUI ui; - /** - * Persistence service. - * - * @since 0.2 - */ - private final PersistenceService persistenceService; - - /** - * To monitor changes on the fishing operation. - * - * @since 0.2 - */ - private final TuttiBeanMonitor<BenthosBatchUIModel> fishingOperationMonitor; - - public BenthosBatchUIHandler(FishingOperationsUI parentUi, BenthosBatchUI ui) { - super(parentUi.getHandler().getContext(), + public BenthosBatchUIHandler(FishingOperationsUI parentUi, + BenthosBatchUI ui) { + super(parentUi, + new String[]{BenthosBatchUIModel.PROPERTY_TOTAL_WEIGHT, + BenthosBatchUIModel.PROPERTY_SAMPLE_TOTAL_WEIGHT}, BenthosBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, BenthosBatchRowModel.PROPERTY_SPECIES, BenthosBatchRowModel.PROPERTY_WEIGHT, BenthosBatchRowModel.PROPERTY_COMMENT); this.ui = ui; - this.persistenceService = context.getService(PersistenceService.class); - this.fishingOperationMonitor = new TuttiBeanMonitor<BenthosBatchUIModel>( - BenthosBatchUIModel.PROPERTY_TOTAL_WEIGHT, - BenthosBatchUIModel.PROPERTY_SAMPLE_TOTAL_WEIGHT - ); + } //------------------------------------------------------------------------// @@ -119,6 +98,11 @@ } @Override + protected FishingOperation getFishingOperation() { + return getModel().getFishingOperation(); + } + + @Override protected String[] getRowPropertiesToIgnore() { return new String[]{ BenthosBatchRowModel.PROPERTY_SAMPLE_WEIGHT, @@ -187,15 +171,19 @@ { // Comment column addColumnToModel(columnModel, - LongTextCellComponent.newEditor(ui.getLongTextEditorUI()), - LongTextCellComponent.newRender(), + LongTextCellComponent.newEditor(ui.getLongTextEditor()), + LongTextCellComponent.newRender(n_("tutti.tooltip.comment.none")), BenthosBatchTableModel.COMMENT); } { // File column addColumnToModel(columnModel, - BenthosBatchTableModel.FILE); + AttachmentCellComponent.newEditor(ui.getAttachmentEditor()), + AttachmentCellComponent.newRender( + getDecorator(Attachment.class, null), + n_("tutti.tooltip.attachment.none")), + BenthosBatchTableModel.ATTACHMENTS); } return columnModel; } @@ -244,118 +232,71 @@ } } - //------------------------------------------------------------------------// - //-- AbstractTuttiUIHandler methods --// - //------------------------------------------------------------------------// - @Override - public void beforeInitUI() { + protected void saveSelectedRowIfRequired() { - if (log.isInfoEnabled()) { - log.info("beforeInit: " + ui); - } + TuttiBeanMonitor<BenthosBatchRowModel> rowMonitor = getRowMonitor(); - BenthosBatchUIModel model = new BenthosBatchUIModel(); - ui.setContextValue(model); + BenthosBatchRowModel bean = rowMonitor.getBean(); + if (bean != null) { - fishingOperationMonitor.setBean(model); - } + if (bean.isValid()) { + // there is a valid bean attached to the monitor - @Override - public void afterInitUI() { + if (rowMonitor.wasModified()) { - if (log.isInfoEnabled()) { - log.info("afterInit: " + ui); - } + // monitored bean was modified, save it + if (log.isInfoEnabled()) { + log.info("Row " + bean + " was modified, will save it"); + } - initUI(ui); + saveRow(bean); - JXTable table = getTable(); + // clear modified flag on the monitor + rowMonitor.clearModified(); + } + } else { - // create table column model - TableColumnModel columnModel = createTableColumnModel(); + // row is not valid can not save it - // create table model - BenthosBatchTableModel tableModel = - new BenthosBatchTableModel(columnModel); + BenthosBatch catchBean = bean.toBean(); - table.setModel(tableModel); - table.setColumnModel(columnModel); - installTableKeyListener(columnModel, table); + if (!TuttiEntities.isNew(catchBean)) { - table.getTableHeader().setReorderingAllowed(false); - - - Highlighter readOnlyHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - HighlightPredicate.READ_ONLY, Color.LIGHT_GRAY); - - table.addHighlighter(readOnlyHighlighter); - Highlighter validHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - new HighlightPredicate.AndHighlightPredicate(HighlightPredicate.EDITABLE, new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - - boolean result = false; - if (adapter.isEditable()) { - int rowIndex = adapter.convertRowIndexToModel(adapter.row); - BenthosBatchRowModel row = getTableModel().getEntry(rowIndex); - result = !row.isValid(); - } - return result; - } - }), Color.RED); - table.addHighlighter(validHighlighter); - - // when model datas change let's propagate it table model - listenRowsFromModel(); - - // save when row chaged and was modified - ListSelectionListener listener = new TableRowModificationListener<BenthosBatchRowModel>( - getTableModel(), getRowMonitor()) { - @Override - protected void saveSelectedRow() { - saveSelectedRowIfRequired(); + // remove this + persistenceService.deleteBenthosBatch(catchBean.getId()); + } } - }; - table.getSelectionModel().addListSelectionListener(listener); - - // always scroll to selected row - SwingUtil.scrollToTableSelection(getTable()); + } } @Override - public void onCloseUI() { - if (log.isInfoEnabled()) { - log.info("closing: " + ui); - } + protected boolean isRowValid(BenthosBatchRowModel row) { + boolean result = row.getSpecies() != null && row.getWeight() != null; + return result; } - //------------------------------------------------------------------------// - //-- Public methods --// - //------------------------------------------------------------------------// + @Override + protected void saveRow(BenthosBatchRowModel row) { - public void saveSelectedRowIfRequired(FocusEvent event) { + BenthosBatch catchBean = row.toBean(); - Component oppositeComponent = event.getOppositeComponent(); - - JXTable parentContainer = null; - - if (oppositeComponent != null) { - - // check out if still on table - parentContainer = SwingUtil.getParentContainer( - oppositeComponent, JXTable.class); + FishingOperation fishingOperation = getModel().getFishingOperation(); + catchBean.setFishingOperation(fishingOperation); + if (log.isInfoEnabled()) { + log.info("Selected fishingOperation: " + fishingOperation.getId()); } - if (parentContainer == null) { + if (TuttiEntities.isNew(catchBean)) { - // out of the table can save - if (getModel().getFishingOperation() != null) { - saveSelectedRowIfRequired(); - } + catchBean = persistenceService.createBenthosBatch(catchBean); + row.setId(catchBean.getId()); + } else { + persistenceService.saveBenthosBatch(catchBean); } } + @Override public void selectFishingOperation(FishingOperation bean) { JXTable table = getTable(); @@ -419,81 +360,61 @@ fishingOperationMonitor.clearModified(); } - public void cancel() { - if (log.isInfoEnabled()) { - log.info("Cancel edition"); - } - } + //------------------------------------------------------------------------// + //-- AbstractTuttiUIHandler methods --// + //------------------------------------------------------------------------// - public void save() { + @Override + public void beforeInitUI() { + if (log.isInfoEnabled()) { - log.info("Will save"); + log.info("beforeInit: " + ui); } - } - //------------------------------------------------------------------------// - //-- Internal methods --// - //------------------------------------------------------------------------// + BenthosBatchUIModel model = new BenthosBatchUIModel(); + ui.setContextValue(model); - protected boolean isRowValid(BenthosBatchRowModel row) { - boolean result = row.getSpecies() != null && row.getWeight() != null; - return result; + fishingOperationMonitor.setBean(model); } - protected void saveSelectedRowIfRequired() { + @Override + public void afterInitUI() { - TuttiBeanMonitor<BenthosBatchRowModel> rowMonitor = getRowMonitor(); + if (log.isInfoEnabled()) { + log.info("afterInit: " + ui); + } - BenthosBatchRowModel bean = rowMonitor.getBean(); - if (bean != null) { + initUI(ui); - if (bean.isValid()) { - // there is a valid bean attached to the monitor + JXTable table = getTable(); - if (rowMonitor.wasModified()) { + // create table column model + TableColumnModel columnModel = createTableColumnModel(); - // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + bean + " was modified, will save it"); - } + // create table model + BenthosBatchTableModel tableModel = + new BenthosBatchTableModel(columnModel); - saveRow(bean); + table.setModel(tableModel); + table.setColumnModel(columnModel); - // clear modified flag on the monitor - rowMonitor.clearModified(); - } - } else { - - // row is not valid can not save it - - BenthosBatch catchBean = bean.toBean(); - - if (!TuttiEntities.isNew(catchBean)) { - - // remove this - persistenceService.deleteBenthosBatch(catchBean.getId()); - } - } - } + initBatchTable(table, columnModel, tableModel); } - protected void saveRow(BenthosBatchRowModel row) { - - BenthosBatch catchBean = row.toBean(); - - FishingOperation fishingOperation = getModel().getFishingOperation(); - catchBean.setFishingOperation(fishingOperation); + @Override + public void onCloseUI() { if (log.isInfoEnabled()) { - log.info("Selected fishingOperation: " + fishingOperation.getId()); + log.info("closing: " + ui); } + } - if (TuttiEntities.isNew(catchBean)) { + //------------------------------------------------------------------------// + //-- Public methods --// + //------------------------------------------------------------------------// - catchBean = persistenceService.createBenthosBatch(catchBean); - row.setId(catchBean.getId()); - } else { - persistenceService.saveBenthosBatch(catchBean); - } - } + //------------------------------------------------------------------------// + //-- Internal methods --// + //------------------------------------------------------------------------// + } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchRowModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchRowModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -24,12 +24,15 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch; -import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; +import java.util.List; + /** * Define a benthos batch row. * @@ -40,18 +43,20 @@ private static final long serialVersionUID = 1L; - public static final String PROPERTY_SPECIES = "species"; + public static final String PROPERTY_MACRO_WASTE_CATEGORY = "macroWasteCategory"; public static final String PROPERTY_WEIGHT = "weight"; public static final String PROPERTY_COMMENT = "comment"; + public static final String PROPERTY_ATTACHMENTS = "attachments"; + /** - * Species observed. + * macroWaste category. * * @since 0.2 */ - protected Species species; + protected MacroWasteCategory macroWasteCategory; /** * Observed weight. @@ -61,12 +66,19 @@ protected Float weight; /** - * Comment on this catches. + * Comment on this batch. * * @since 0.2 */ protected String comment; + /** + * Attachments. + * + * @since 0.2 + */ + protected List<Attachment> attachments; + protected static final Binder<MacroWasteBatch, MacroWasteBatchRowModel> fromBeanBinder = BinderFactory.newBinder(MacroWasteBatch.class, MacroWasteBatchRowModel.class); @@ -84,14 +96,14 @@ fromBean(aBatch); } - public Species getSpecies() { - return species; + public MacroWasteCategory getMacroWasteCategory() { + return macroWasteCategory; } - public void setSpecies(Species species) { - Object oldValue = getSpecies(); - this.species = species; - firePropertyChange(PROPERTY_SPECIES, oldValue, species); + public void setMacroWasteCategory(MacroWasteCategory macroWasteCategory) { + Object oldValue = getMacroWasteCategory(); + this.macroWasteCategory = macroWasteCategory; + firePropertyChange(PROPERTY_MACRO_WASTE_CATEGORY, oldValue, macroWasteCategory); } public Float getWeight() { @@ -113,4 +125,14 @@ this.comment = comment; firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + + public List<Attachment> getAttachments() { + return attachments; + } + + public void setAttachments(List<Attachment> attachments) { + Object oldValue = getAttachments(); + this.attachments = attachments; + firePropertyChange(PROPERTY_ATTACHMENTS, oldValue, attachments); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchTableModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchTableModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -39,16 +39,11 @@ private static final long serialVersionUID = 1L; - public static final ColumnIdentifier<MacroWasteBatchRowModel> SPECIES_BY_CODE = ColumnIdentifier.newId( - MacroWasteBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.macrowaste.batch.header.speciesByCode"), - n_("tutti.table.macrowaste.batch.header.speciesByCode")); + public static final ColumnIdentifier<MacroWasteBatchRowModel> MACRO_WASTE_CATEGORY = ColumnIdentifier.newId( + MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_CATEGORY, + n_("tutti.table.macrowaste.batch.header.macroWasteCategory"), + n_("tutti.table.macrowaste.batch.header.macroWasteCategory")); - public static final ColumnIdentifier<MacroWasteBatchRowModel> SPECIES_BY_GENUS_CODE = ColumnIdentifier.newId( - MacroWasteBatchRowModel.PROPERTY_SPECIES, - n_("tutti.table.macrowaste.batch.header.speciesByGenusCode"), - n_("tutti.table.macrowaste.batch.header.speciesByGenusCode")); - public static final ColumnIdentifier<MacroWasteBatchRowModel> WEIGHT = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_WEIGHT, n_("tutti.table.macrowaste.batch.header.weight"), @@ -59,16 +54,15 @@ n_("tutti.table.macrowaste.batch.header.comment"), n_("tutti.table.macrowaste.batch.header.comment")); - public static final ColumnIdentifier<MacroWasteBatchRowModel> FILE = ColumnIdentifier.newId( - null, + public static final ColumnIdentifier<MacroWasteBatchRowModel> ATTACHMENTS = ColumnIdentifier.newId( + MacroWasteBatchRowModel.PROPERTY_ATTACHMENTS, n_("tutti.table.macrowaste.batch.header.file"), n_("tutti.table.macrowaste.batch.header.file")); - public MacroWasteBatchTableModel(TableColumnModel columnModel) { super(columnModel); - setNoneEditableCols(FILE); + setNoneEditableCols(); } @Override @@ -80,25 +74,4 @@ return result; } - @Override - public void setValueAt(Object aValue, - int rowIndex, - int columnIndex, - ColumnIdentifier<MacroWasteBatchRowModel> propertyName, - MacroWasteBatchRowModel entry) { - super.setValueAt(aValue, rowIndex, columnIndex, propertyName, entry); - - if (propertyName == SPECIES_BY_CODE) { - - // update also other columns - fireTableCellUpdated(rowIndex, - SPECIES_BY_GENUS_CODE); - - } else if (propertyName == SPECIES_BY_GENUS_CODE) { - - // update also other columns - fireTableCellUpdated(rowIndex, - SPECIES_BY_CODE); - } - } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx 2012-12-15 16:05:45 UTC (rev 77) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI fr.ifremer.tutti.ui.swing.util.editor.LongTextEditorUI + fr.ifremer.tutti.ui.swing.util.editor.AttachmentEditorUI jaxx.runtime.swing.editor.NumberEditor @@ -71,8 +72,10 @@ <field name='totalWeight' component='totalWeightField'/> </BeanValidator> - <LongTextEditorUI id='longTextEditorUI'/> + <LongTextEditorUI id='longTextEditor'/> + <AttachmentEditorUI id='attachmentEditor'/> + <Table id='form' fill='both' constraints='BorderLayout.NORTH'>  Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -26,43 +26,36 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch; -import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.persistence.entities.referential.MacroWasteCategory; import fr.ifremer.tutti.ui.swing.TuttiUI; +import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; -import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import fr.ifremer.tutti.ui.swing.util.table.TableRowModificationListener; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; -import javax.swing.event.ListSelectionListener; import javax.swing.table.TableColumnModel; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.FocusEvent; import java.util.List; +import static org.nuiton.i18n.I18n.n_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class MacroWasteBatchUIHandler extends AbstractTuttiTableUIHandler<MacroWasteBatchRowModel, MacroWasteBatchUIModel> { +public class MacroWasteBatchUIHandler extends AbstractTuttiBatchTableUIHandler<MacroWasteBatchRowModel, MacroWasteBatchUIModel> { /** Logger. */ - private static final Log log = LogFactory.getLog(MacroWasteBatchUIHandler.class); + private static final Log log = + LogFactory.getLog(MacroWasteBatchUIHandler.class); /** * UI. @@ -71,31 +64,13 @@ */ private final MacroWasteBatchUI ui; - /** - * Persistence service. - * - * @since 0.2 - */ - private final PersistenceService persistenceService; - - /** - * To monitor changes on the fishing operation. - * - * @since 0.2 - */ - private final TuttiBeanMonitor<MacroWasteBatchUIModel> fishingOperationMonitor; - - public MacroWasteBatchUIHandler(FishingOperationsUI parentUi, MacroWasteBatchUI ui) { - super(parentUi.getHandler().getContext(), - MacroWasteBatchRowModel.PROPERTY_SPECIES, + super(parentUi, + new String[]{MacroWasteBatchUIModel.PROPERTY_TOTAL_WEIGHT}, + MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_CATEGORY, MacroWasteBatchRowModel.PROPERTY_WEIGHT, MacroWasteBatchRowModel.PROPERTY_COMMENT); this.ui = ui; - this.persistenceService = context.getService(PersistenceService.class); - this.fishingOperationMonitor = new TuttiBeanMonitor<MacroWasteBatchUIModel>( - MacroWasteBatchUIModel.PROPERTY_TOTAL_WEIGHT - ); } //------------------------------------------------------------------------// @@ -118,36 +93,27 @@ } @Override + protected FishingOperation getFishingOperation() { + return getModel().getFishingOperation(); + } + + @Override protected TableColumnModel createTableColumnModel() { DefaultTableColumnModelExt columnModel = new DefaultTableColumnModelExt(); - List<Species> allSpecies = persistenceService.getAllSpecies(); - { - // Species (by code) column + // MacroWaste Category column - Decorator<Species> decorator = getDecorator( - Species.class, DecoratorService.SPECIES_BY_CODE); + Decorator<MacroWasteCategory> decorator = getDecorator( + MacroWasteCategory.class, null); addComboDataColumnToModel(columnModel, - MacroWasteBatchTableModel.SPECIES_BY_CODE, - decorator, allSpecies); + MacroWasteBatchTableModel.MACRO_WASTE_CATEGORY, + decorator, persistenceService.getAllMacroWasteCategory()); } - { - // Species (by genusCode) column - - Decorator<Species> decorator = getDecorator( - Species.class, DecoratorService.SPECIES_BY_GENUS); - - addComboDataColumnToModel(columnModel, - MacroWasteBatchTableModel.SPECIES_BY_GENUS_CODE, - decorator, allSpecies); - - } - { // Weight column addFloatColumnToModel(columnModel, @@ -158,15 +124,19 @@ { // Comment column addColumnToModel(columnModel, - LongTextCellComponent.newEditor(ui.getLongTextEditorUI()), - LongTextCellComponent.newRender(), + LongTextCellComponent.newEditor(ui.getLongTextEditor()), + LongTextCellComponent.newRender(n_("tutti.tooltip.comment.none")), MacroWasteBatchTableModel.COMMENT); } { // File column addColumnToModel(columnModel, - MacroWasteBatchTableModel.FILE); + AttachmentCellComponent.newEditor(ui.getAttachmentEditor()), + AttachmentCellComponent.newRender( + getDecorator(Attachment.class, null), + n_("tutti.tooltip.attachment.none")), + MacroWasteBatchTableModel.ATTACHMENTS); } return columnModel; } @@ -215,118 +185,72 @@ } } - //------------------------------------------------------------------------// - //-- AbstractTuttiUIHandler methods --// - //------------------------------------------------------------------------// - @Override - public void beforeInitUI() { + protected void saveSelectedRowIfRequired() { - if (log.isInfoEnabled()) { - log.info("beforeInit: " + ui); - } + TuttiBeanMonitor<MacroWasteBatchRowModel> rowMonitor = getRowMonitor(); - MacroWasteBatchUIModel model = new MacroWasteBatchUIModel(); - ui.setContextValue(model); + MacroWasteBatchRowModel bean = rowMonitor.getBean(); + if (bean != null) { - fishingOperationMonitor.setBean(model); - } + if (bean.isValid()) { + // there is a valid bean attached to the monitor - @Override - public void afterInitUI() { + if (rowMonitor.wasModified()) { - if (log.isInfoEnabled()) { - log.info("afterInit: " + ui); - } + // monitored bean was modified, save it + if (log.isInfoEnabled()) { + log.info("Row " + bean + " was modified, will save it"); + } - initUI(ui); + saveRow(bean); - JXTable table = getTable(); + // clear modified flag on the monitor + rowMonitor.clearModified(); + } + } else { - // create table column model - TableColumnModel columnModel = createTableColumnModel(); + // row is not valid can not save it - // create table model - MacroWasteBatchTableModel tableModel = - new MacroWasteBatchTableModel(columnModel); + MacroWasteBatch catchBean = bean.toBean(); - table.setModel(tableModel); - table.setColumnModel(columnModel); - installTableKeyListener(columnModel, table); + if (!TuttiEntities.isNew(catchBean)) { - table.getTableHeader().setReorderingAllowed(false); - - - Highlighter readOnlyHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - HighlightPredicate.READ_ONLY, Color.LIGHT_GRAY); - - table.addHighlighter(readOnlyHighlighter); - Highlighter validHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - new HighlightPredicate.AndHighlightPredicate(HighlightPredicate.EDITABLE, new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - - boolean result = false; - if (adapter.isEditable()) { - int rowIndex = adapter.convertRowIndexToModel(adapter.row); - MacroWasteBatchRowModel row = getTableModel().getEntry(rowIndex); - result = !row.isValid(); - } - return result; - } - }), Color.RED); - table.addHighlighter(validHighlighter); - - // when model datas change let's propagate it table model - listenRowsFromModel(); - - // save when row chaged and was modified - ListSelectionListener listener = new TableRowModificationListener<MacroWasteBatchRowModel>( - getTableModel(), getRowMonitor()) { - @Override - protected void saveSelectedRow() { - saveSelectedRowIfRequired(); + // remove this + persistenceService.deleteMacroWasteBatch(catchBean.getId()); + } } - }; - table.getSelectionModel().addListSelectionListener(listener); - - // always scroll to selected row - SwingUtil.scrollToTableSelection(getTable()); + } } @Override - public void onCloseUI() { - if (log.isInfoEnabled()) { - log.info("closing: " + ui); - } + protected boolean isRowValid(MacroWasteBatchRowModel row) { + boolean result = row.getMacroWasteCategory() != null && + row.getWeight() != null; + return result; } - //------------------------------------------------------------------------// - //-- Public methods --// - //------------------------------------------------------------------------// + @Override + protected void saveRow(MacroWasteBatchRowModel row) { - public void saveSelectedRowIfRequired(FocusEvent event) { + MacroWasteBatch catchBean = row.toBean(); - Component oppositeComponent = event.getOppositeComponent(); - - JXTable parentContainer = null; - - if (oppositeComponent != null) { - - // check out if still on table - parentContainer = SwingUtil.getParentContainer( - oppositeComponent, JXTable.class); + FishingOperation fishingOperation = getModel().getFishingOperation(); + catchBean.setFishingOperation(fishingOperation); + if (log.isInfoEnabled()) { + log.info("Selected fishingOperation: " + fishingOperation.getId()); } - if (parentContainer == null) { + if (TuttiEntities.isNew(catchBean)) { - // out of the table can save - if (getModel().getFishingOperation() != null) { - saveSelectedRowIfRequired(); - } + catchBean = persistenceService.createMacroWasteBatch(catchBean); + row.setId(catchBean.getId()); + } else { + persistenceService.saveMacroWasteBatch(catchBean); } } + @Override public void selectFishingOperation(FishingOperation bean) { JXTable table = getTable(); @@ -390,81 +314,60 @@ fishingOperationMonitor.clearModified(); } - public void cancel() { + //------------------------------------------------------------------------// + //-- AbstractTuttiUIHandler methods --// + //------------------------------------------------------------------------// - if (log.isInfoEnabled()) { - log.info("Cancel edition"); - } - } + @Override + public void beforeInitUI() { - public void save() { if (log.isInfoEnabled()) { - log.info("Will save"); + log.info("beforeInit: " + ui); } - } - //------------------------------------------------------------------------// - //-- Internal methods --// - //------------------------------------------------------------------------// + MacroWasteBatchUIModel model = new MacroWasteBatchUIModel(); + ui.setContextValue(model); - protected boolean isRowValid(MacroWasteBatchRowModel row) { - boolean result = row.getSpecies() != null && row.getWeight() != null; - return result; + fishingOperationMonitor.setBean(model); } - protected void saveSelectedRowIfRequired() { + @Override + public void afterInitUI() { - TuttiBeanMonitor<MacroWasteBatchRowModel> rowMonitor = getRowMonitor(); + if (log.isInfoEnabled()) { + log.info("afterInit: " + ui); + } - MacroWasteBatchRowModel bean = rowMonitor.getBean(); - if (bean != null) { + initUI(ui); - if (bean.isValid()) { - // there is a valid bean attached to the monitor + JXTable table = getTable(); - if (rowMonitor.wasModified()) { + // create table column model + TableColumnModel columnModel = createTableColumnModel(); - // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + bean + " was modified, will save it"); - } + // create table model + MacroWasteBatchTableModel tableModel = + new MacroWasteBatchTableModel(columnModel); - saveRow(bean); + table.setModel(tableModel); + table.setColumnModel(columnModel); - // clear modified flag on the monitor - rowMonitor.clearModified(); - } - } else { - - // row is not valid can not save it - - MacroWasteBatch catchBean = bean.toBean(); - - if (!TuttiEntities.isNew(catchBean)) { - - // remove this - persistenceService.deleteMacroWasteBatch(catchBean.getId()); - } - } - } + initBatchTable(table, columnModel, tableModel); } - protected void saveRow(MacroWasteBatchRowModel row) { - - MacroWasteBatch catchBean = row.toBean(); - - FishingOperation fishingOperation = getModel().getFishingOperation(); - catchBean.setFishingOperation(fishingOperation); + @Override + public void onCloseUI() { if (log.isInfoEnabled()) { - log.info("Selected fishingOperation: " + fishingOperation.getId()); + log.info("closing: " + ui); } + } - if (TuttiEntities.isNew(catchBean)) { + //------------------------------------------------------------------------// + //-- Public methods --// + //------------------------------------------------------------------------// - catchBean = persistenceService.createMacroWasteBatch(catchBean); - row.setId(catchBean.getId()); - } else { - persistenceService.saveMacroWasteBatch(catchBean); - } - } + //------------------------------------------------------------------------// + //-- Internal methods --// + //------------------------------------------------------------------------// + } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchRowModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchRowModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -24,12 +24,15 @@ * #L% */ +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; +import java.util.List; + /** * Define a benthos batch row. * @@ -52,6 +55,8 @@ public static final String PROPERTY_COMMENT = "comment"; + public static final String PROPERTY_ATTACHMENTS = "attachments"; + /** * Species observed. * @@ -94,6 +99,13 @@ */ protected String comment; + /** + * Attachments + * + * @since 0.2 + */ + protected List<Attachment> attachments; + protected static final Binder<PlanktonBatch, PlanktonBatchRowModel> fromBeanBinder = BinderFactory.newBinder(PlanktonBatch.class, PlanktonBatchRowModel.class); @@ -170,4 +182,14 @@ this.comment = comment; firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + + public List<Attachment> getAttachments() { + return attachments; + } + + public void setAttachments(List<Attachment> attachments) { + Object oldValue = getAttachments(); + this.attachments = attachments; + firePropertyChange(PROPERTY_ATTACHMENTS, oldValue, attachments); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchTableModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchTableModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -74,20 +74,15 @@ n_("tutti.table.plankton.batch.header.comment"), n_("tutti.table.plankton.batch.header.comment")); - public static final ColumnIdentifier<PlanktonBatchRowModel> FILE = ColumnIdentifier.newId( - null, + public static final ColumnIdentifier<PlanktonBatchRowModel> ATTACHMENTS = ColumnIdentifier.newId( + PlanktonBatchRowModel.PROPERTY_ATTACHMENTS, n_("tutti.table.plankton.batch.header.file"), n_("tutti.table.plankton.batch.header.file")); - public PlanktonBatchTableModel(TableColumnModel columnModel) { super(columnModel); - setNoneEditableCols( - SAMPLE_WEIGHT, - SAMPLING_RATIO, - FILE - ); + setNoneEditableCols(SAMPLE_WEIGHT, SAMPLING_RATIO); } @Override @@ -110,14 +105,12 @@ if (propertyName == SPECIES_BY_CODE) { // update also other columns - fireTableCellUpdated(rowIndex, - SPECIES_BY_GENUS_CODE); + fireTableCellUpdated(rowIndex, SPECIES_BY_GENUS_CODE); } else if (propertyName == SPECIES_BY_GENUS_CODE) { // update also other columns - fireTableCellUpdated(rowIndex, - SPECIES_BY_CODE); + fireTableCellUpdated(rowIndex, SPECIES_BY_CODE); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx 2012-12-15 16:05:45 UTC (rev 77) @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.TuttiUIContext fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI fr.ifremer.tutti.ui.swing.util.editor.LongTextEditorUI + fr.ifremer.tutti.ui.swing.util.editor.AttachmentEditorUI jaxx.runtime.swing.editor.NumberEditor @@ -72,8 +73,10 @@ <field name='sampleTotalWeight' component='sampleTotalWeightField'/> </BeanValidator> - <LongTextEditorUI id='longTextEditorUI'/> + <LongTextEditorUI id='longTextEditor'/> + <AttachmentEditorUI id='attachmentEditor'/> + <Table id='form' fill='both' constraints='BorderLayout.NORTH'>  Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -26,40 +26,33 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUI; +import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; -import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import fr.ifremer.tutti.ui.swing.util.table.TableRowModificationListener; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; -import javax.swing.event.ListSelectionListener; import javax.swing.table.TableColumnModel; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.FocusEvent; import java.util.List; +import static org.nuiton.i18n.I18n.n_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class PlanktonBatchUIHandler extends AbstractTuttiTableUIHandler<PlanktonBatchRowModel, PlanktonBatchUIModel> { +public class PlanktonBatchUIHandler extends AbstractTuttiBatchTableUIHandler<PlanktonBatchRowModel, PlanktonBatchUIModel> { /** Logger. */ private static final Log log = LogFactory.getLog(PlanktonBatchUIHandler.class); @@ -71,32 +64,14 @@ */ private final PlanktonBatchUI ui; - /** - * Persistence service. - * - * @since 0.2 - */ - private final PersistenceService persistenceService; - - /** - * To monitor changes on the fishing operation. - * - * @since 0.2 - */ - private final TuttiBeanMonitor<PlanktonBatchUIModel> fishingOperationMonitor; - public PlanktonBatchUIHandler(FishingOperationsUI parentUi, PlanktonBatchUI ui) { - super(parentUi.getHandler().getContext(), + super(parentUi, new String[]{PlanktonBatchUIModel.PROPERTY_TOTAL_WEIGHT, + PlanktonBatchUIModel.PROPERTY_SAMPLE_TOTAL_WEIGHT}, PlanktonBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, PlanktonBatchRowModel.PROPERTY_SPECIES, PlanktonBatchRowModel.PROPERTY_WEIGHT, PlanktonBatchRowModel.PROPERTY_COMMENT); this.ui = ui; - this.persistenceService = context.getService(PersistenceService.class); - this.fishingOperationMonitor = new TuttiBeanMonitor<PlanktonBatchUIModel>( - PlanktonBatchUIModel.PROPERTY_TOTAL_WEIGHT, - PlanktonBatchUIModel.PROPERTY_SAMPLE_TOTAL_WEIGHT - ); } //------------------------------------------------------------------------// @@ -119,6 +94,11 @@ } @Override + protected FishingOperation getFishingOperation() { + return getModel().getFishingOperation(); + } + + @Override protected String[] getRowPropertiesToIgnore() { return new String[]{ PlanktonBatchRowModel.PROPERTY_SAMPLE_WEIGHT, @@ -187,15 +167,19 @@ { // Comment column addColumnToModel(columnModel, - LongTextCellComponent.newEditor(ui.getLongTextEditorUI()), - LongTextCellComponent.newRender(), + LongTextCellComponent.newEditor(ui.getLongTextEditor()), + LongTextCellComponent.newRender(n_("tutti.tooltip.comment.none")), PlanktonBatchTableModel.COMMENT); } { // File column addColumnToModel(columnModel, - PlanktonBatchTableModel.FILE); + AttachmentCellComponent.newEditor(ui.getAttachmentEditor()), + AttachmentCellComponent.newRender( + getDecorator(Attachment.class, null), + n_("tutti.tooltip.attachment.none")), + PlanktonBatchTableModel.ATTACHMENTS); } return columnModel; } @@ -244,118 +228,71 @@ } } - //------------------------------------------------------------------------// - //-- AbstractTuttiUIHandler methods --// - //------------------------------------------------------------------------// - @Override - public void beforeInitUI() { + protected void saveSelectedRowIfRequired() { - if (log.isInfoEnabled()) { - log.info("beforeInit: " + ui); - } + TuttiBeanMonitor<PlanktonBatchRowModel> rowMonitor = getRowMonitor(); - PlanktonBatchUIModel model = new PlanktonBatchUIModel(); - ui.setContextValue(model); + PlanktonBatchRowModel bean = rowMonitor.getBean(); + if (bean != null) { - fishingOperationMonitor.setBean(model); - } + if (bean.isValid()) { + // there is a valid bean attached to the monitor - @Override - public void afterInitUI() { + if (rowMonitor.wasModified()) { - if (log.isInfoEnabled()) { - log.info("afterInit: " + ui); - } + // monitored bean was modified, save it + if (log.isInfoEnabled()) { + log.info("Row " + bean + " was modified, will save it"); + } - initUI(ui); + saveRow(bean); - JXTable table = getTable(); + // clear modified flag on the monitor + rowMonitor.clearModified(); + } + } else { - // create table column model - TableColumnModel columnModel = createTableColumnModel(); + // row is not valid can not save it - // create table model - PlanktonBatchTableModel tableModel = - new PlanktonBatchTableModel(columnModel); + PlanktonBatch catchBean = bean.toBean(); - table.setModel(tableModel); - table.setColumnModel(columnModel); - installTableKeyListener(columnModel, table); + if (!TuttiEntities.isNew(catchBean)) { - table.getTableHeader().setReorderingAllowed(false); - - - Highlighter readOnlyHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - HighlightPredicate.READ_ONLY, Color.LIGHT_GRAY); - - table.addHighlighter(readOnlyHighlighter); - Highlighter validHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - new HighlightPredicate.AndHighlightPredicate(HighlightPredicate.EDITABLE, new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - - boolean result = false; - if (adapter.isEditable()) { - int rowIndex = adapter.convertRowIndexToModel(adapter.row); - PlanktonBatchRowModel row = getTableModel().getEntry(rowIndex); - result = !row.isValid(); - } - return result; - } - }), Color.RED); - table.addHighlighter(validHighlighter); - - // when model datas change let's propagate it table model - listenRowsFromModel(); - - // save when row chaged and was modified - ListSelectionListener listener = new TableRowModificationListener<PlanktonBatchRowModel>( - getTableModel(), getRowMonitor()) { - @Override - protected void saveSelectedRow() { - saveSelectedRowIfRequired(); + // remove this + persistenceService.deletePlanktonBatch(catchBean.getId()); + } } - }; - table.getSelectionModel().addListSelectionListener(listener); - - // always scroll to selected row - SwingUtil.scrollToTableSelection(getTable()); + } } @Override - public void onCloseUI() { - if (log.isInfoEnabled()) { - log.info("closing: " + ui); - } + protected boolean isRowValid(PlanktonBatchRowModel row) { + boolean result = row.getSpecies() != null && row.getWeight() != null; + return result; } - //------------------------------------------------------------------------// - //-- Public methods --// - //------------------------------------------------------------------------// + @Override + protected void saveRow(PlanktonBatchRowModel row) { - public void saveSelectedRowIfRequired(FocusEvent event) { + PlanktonBatch catchBean = row.toBean(); - Component oppositeComponent = event.getOppositeComponent(); - - JXTable parentContainer = null; - - if (oppositeComponent != null) { - - // check out if still on table - parentContainer = SwingUtil.getParentContainer( - oppositeComponent, JXTable.class); + FishingOperation fishingOperation = getModel().getFishingOperation(); + catchBean.setFishingOperation(fishingOperation); + if (log.isInfoEnabled()) { + log.info("Selected fishingOperation: " + fishingOperation.getId()); } - if (parentContainer == null) { + if (TuttiEntities.isNew(catchBean)) { - // out of the table can save - if (getModel().getFishingOperation() != null) { - saveSelectedRowIfRequired(); - } + catchBean = persistenceService.createPlanktonBatch(catchBean); + row.setId(catchBean.getId()); + } else { + persistenceService.savePlanktonBatch(catchBean); } } + @Override public void selectFishingOperation(FishingOperation bean) { JXTable table = getTable(); @@ -419,81 +356,60 @@ fishingOperationMonitor.clearModified(); } - public void cancel() { + //------------------------------------------------------------------------// + //-- AbstractTuttiUIHandler methods --// + //------------------------------------------------------------------------// - if (log.isInfoEnabled()) { - log.info("Cancel edition"); - } - } + @Override + public void beforeInitUI() { - public void save() { if (log.isInfoEnabled()) { - log.info("Will save"); + log.info("beforeInit: " + ui); } - } - //------------------------------------------------------------------------// - //-- Internal methods --// - //------------------------------------------------------------------------// + PlanktonBatchUIModel model = new PlanktonBatchUIModel(); + ui.setContextValue(model); - protected boolean isRowValid(PlanktonBatchRowModel row) { - boolean result = row.getSpecies() != null && row.getWeight() != null; - return result; + fishingOperationMonitor.setBean(model); } - protected void saveSelectedRowIfRequired() { + @Override + public void afterInitUI() { - TuttiBeanMonitor<PlanktonBatchRowModel> rowMonitor = getRowMonitor(); + if (log.isInfoEnabled()) { + log.info("afterInit: " + ui); + } - PlanktonBatchRowModel bean = rowMonitor.getBean(); - if (bean != null) { + initUI(ui); - if (bean.isValid()) { - // there is a valid bean attached to the monitor + JXTable table = getTable(); - if (rowMonitor.wasModified()) { + // create table column model + TableColumnModel columnModel = createTableColumnModel(); - // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + bean + " was modified, will save it"); - } + // create table model + PlanktonBatchTableModel tableModel = + new PlanktonBatchTableModel(columnModel); - saveRow(bean); + table.setModel(tableModel); + table.setColumnModel(columnModel); - // clear modified flag on the monitor - rowMonitor.clearModified(); - } - } else { - - // row is not valid can not save it - - PlanktonBatch catchBean = bean.toBean(); - - if (!TuttiEntities.isNew(catchBean)) { - - // remove this - persistenceService.deletePlanktonBatch(catchBean.getId()); - } - } - } + initBatchTable(table, columnModel, tableModel); } - protected void saveRow(PlanktonBatchRowModel row) { - - PlanktonBatch catchBean = row.toBean(); - - FishingOperation fishingOperation = getModel().getFishingOperation(); - catchBean.setFishingOperation(fishingOperation); + @Override + public void onCloseUI() { if (log.isInfoEnabled()) { - log.info("Selected fishingOperation: " + fishingOperation.getId()); + log.info("closing: " + ui); } + } - if (TuttiEntities.isNew(catchBean)) { + //------------------------------------------------------------------------// + //-- Public methods --// + //------------------------------------------------------------------------// - catchBean = persistenceService.createPlanktonBatch(catchBean); - row.setId(catchBean.getId()); - } else { - persistenceService.savePlanktonBatch(catchBean); - } - } + //------------------------------------------------------------------------// + //-- Internal methods --// + //------------------------------------------------------------------------// + } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchRowModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchRowModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -28,8 +28,8 @@ import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; -import fr.ifremer.tutti.persistence.entities.data.VracHorsVracEnum; import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.WeightCategory; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; @@ -54,7 +54,7 @@ public static final String PROPERTY_SPECIES_TO_CONFIRM = "speciesToConfirm"; - public static final String PROPERTY_VRAC_HORS_VRAC = "vracHorsVrac"; + public static final String PROPERTY_SORTED_UNSORTED_CATEGORY = "sortedUnsortedCategory"; public static final String PROPERTY_WEIGHT_CATEGORY = "weightCategory"; @@ -99,7 +99,7 @@ * * @since 0.2 */ - protected VracHorsVracEnum vracHorsVrac; + protected SortedUnsortedCategory sortedUnsortedCategory; /** * Weight category (can be null). @@ -254,14 +254,14 @@ firePropertyChange(PROPERTY_SPECIES_TO_CONFIRM, oldValue, speciesToConfirm); } - public VracHorsVracEnum getVracHorsVrac() { - return vracHorsVrac; + public SortedUnsortedCategory getSortedUnsortedCategory() { + return sortedUnsortedCategory; } - public void setVracHorsVrac(VracHorsVracEnum vracHorsVrac) { - Object oldValue = getVracHorsVrac(); - this.vracHorsVrac = vracHorsVrac; - firePropertyChange(PROPERTY_VRAC_HORS_VRAC, oldValue, vracHorsVrac); + public void setSortedUnsortedCategory(SortedUnsortedCategory sortedUnsortedCategory) { + Object oldValue = getSortedUnsortedCategory(); + this.sortedUnsortedCategory = sortedUnsortedCategory; + firePropertyChange(PROPERTY_SORTED_UNSORTED_CATEGORY, oldValue, sortedUnsortedCategory); } public WeightCategory getWeightCategory() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTableModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTableModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -56,10 +56,10 @@ n_("tutti.table.species.batch.header.speciesByGenusCode"), n_("tutti.table.species.batch.header.speciesByGenusCode")); - public static final ColumnIdentifier<SpeciesBatchRowModel> VRAC_HORS_VRAC = ColumnIdentifier.newId( - SpeciesBatchRowModel.PROPERTY_VRAC_HORS_VRAC, - n_("tutti.table.species.batch.header.vracHorsVrac"), - n_("tutti.table.species.batch.header.vracHorsVrac")); + public static final ColumnIdentifier<SpeciesBatchRowModel> SORTED_UNSORTED_CATEGORY = ColumnIdentifier.newId( + SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, + n_("tutti.table.species.batch.header.sortedUnsortedCategory"), + n_("tutti.table.species.batch.header.sortedUnsortedCategory")); public static final ColumnIdentifier<SpeciesBatchRowModel> WEIGHT_CATEGORY = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY, @@ -122,11 +122,7 @@ public SpeciesBatchTableModel(TableColumnModel columnModel) { super(columnModel); - setNoneEditableCols( - SAMPLE_WEIGHT, - SAMPLING_RATIO/*, - FILE*/ - ); + setNoneEditableCols(SAMPLE_WEIGHT, SAMPLING_RATIO); noneEditableColIfNoSpecies = Sets.newHashSet(); noneEditableColIfNoSpecies.add(COMPUTED_NUMBER); noneEditableColIfNoSpecies.add(COMPUTED_WEIGHT); @@ -167,23 +163,19 @@ } else if (propertyName == COMPUTED_NUMBER) { // update also other columns - fireTableCellUpdated(rowIndex, - COMPUTED_WEIGHT); + fireTableCellUpdated(rowIndex, COMPUTED_WEIGHT); } else if (propertyName == COMPUTED_WEIGHT) { // update also other columns - fireTableCellUpdated(rowIndex, - COMPUTED_NUMBER); + fireTableCellUpdated(rowIndex, COMPUTED_NUMBER); } } public void updateSamplingRatio(Set<SpeciesBatchRowModel> rows) { for (SpeciesBatchRowModel row : rows) { int rowIndex = getRows().indexOf(row); - fireTableCellUpdated(rowIndex, - SAMPLE_WEIGHT, - SAMPLING_RATIO); + fireTableCellUpdated(rowIndex, SAMPLE_WEIGHT, SAMPLING_RATIO); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTreeModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTreeModel.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTreeModel.java 2012-12-15 16:05:45 UTC (rev 77) @@ -28,7 +28,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; -import fr.ifremer.tutti.persistence.entities.data.VracHorsVracEnum; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import org.apache.commons.collections.CollectionUtils; @@ -197,8 +197,9 @@ SpeciesBatchRowModel row = getNodeToRow(node); if (row != null) { - VracHorsVracEnum vracHorsVrac = row.getVracHorsVrac(); - if (VracHorsVracEnum.HORS_VRAC.equals(vracHorsVrac)) { + SortedUnsortedCategory sortedUnsortedCategory = row.getSortedUnsortedCategory(); + if (sortedUnsortedCategory != null && + "unsorted".equals(sortedUnsortedCategory.getName())) { // never take account of a such child Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-15 16:05:45 UTC (rev 77) @@ -77,11 +77,11 @@ <field name='totalHorsVracWeight' component='totalHorsVracWeightField'/> </BeanValidator> - <SpeciesFrequencyUI id='frequencyUI' constructorParams='handler.getContext()'/> + <SpeciesFrequencyUI id='frequencyEditor' constructorParams='handler.getContext()'/> - <LongTextEditorUI id='longTextEditorUI'/> + <LongTextEditorUI id='longTextEditor'/> - <AttachmentEditorUI id='attachmentEditorUI'/> + <AttachmentEditorUI id='attachmentEditor'/> <Table id='form' fill='both' constraints='BorderLayout.NORTH'> @@ -119,7 +119,7 @@ </Table> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event);'/> + <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event)'/> </JScrollPane> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -28,64 +28,54 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; -import fr.ifremer.tutti.persistence.entities.data.VracHorsVracEnum; import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.SortedUnsortedCategory; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.WeightCategory; import fr.ifremer.tutti.service.DecoratorService; -import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUI; +import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; -import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; -import fr.ifremer.tutti.ui.swing.util.table.TableRowModificationListener; -import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ComponentAdapter; -import org.jdesktop.swingx.decorator.HighlightPredicate; -import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.util.decorator.Decorator; -import javax.swing.event.ListSelectionListener; import javax.swing.table.TableColumnModel; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.FocusEvent; import java.util.List; import java.util.Set; -import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; +import static org.nuiton.i18n.I18n.n_; + /** * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public class SpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<SpeciesBatchRowModel, SpeciesBatchUIModel> { +public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<SpeciesBatchRowModel, SpeciesBatchUIModel> { /** Logger. */ - private static final Log log = LogFactory.getLog(SpeciesBatchUIHandler.class); + private static final Log log = + LogFactory.getLog(SpeciesBatchUIHandler.class); public static final Set<String> RECOMPUTE_TOTAL_WEIGHT = Sets.newHashSet( - SpeciesBatchRowModel.PROPERTY_VRAC_HORS_VRAC, - SpeciesBatchRowModel.PROPERTY_WEIGHT - ); + SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, + SpeciesBatchRowModel.PROPERTY_WEIGHT); public static final Set<String> SAMPLING_PROPERTIES = Sets.newHashSet( SpeciesBatchRowModel.PROPERTY_SPECIES, - SpeciesBatchRowModel.PROPERTY_VRAC_HORS_VRAC, + SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY, SpeciesBatchRowModel.PROPERTY_SEX, SpeciesBatchRowModel.PROPERTY_MATURITY, - SpeciesBatchRowModel.PROPERTY_AGE - ); + SpeciesBatchRowModel.PROPERTY_AGE); /** * UI. @@ -94,25 +84,18 @@ */ private final SpeciesBatchUI ui; - /** - * Persistence service. - * - * @since 0.2 - */ - private final PersistenceService persistenceService; - - /** - * To monitor changes on the fishing operation. - * - * @since 0.2 - */ - private final TuttiBeanMonitor<SpeciesBatchUIModel> fishingOperationMonitor; - - public SpeciesBatchUIHandler(FishingOperationsUI parentUi, SpeciesBatchUI ui) { - super(parentUi.getHandler().getContext(), + public SpeciesBatchUIHandler(FishingOperationsUI parentUi, + SpeciesBatchUI ui) { + super(parentUi, + new String[]{ + SpeciesBatchUIModel.PROPERTY_SAMPLE_VRAC_WEIGHT, + SpeciesBatchUIModel.PROPERTY_TOTAL_HORS_VRAC_WEIGHT, + SpeciesBatchUIModel.PROPERTY_TOTAL_VRAC_WEIGHT, + SpeciesBatchUIModel.PROPERTY_TOTAL_WEIGHT + }, SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, SpeciesBatchRowModel.PROPERTY_SPECIES, - SpeciesBatchRowModel.PROPERTY_VRAC_HORS_VRAC, + SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY, SpeciesBatchRowModel.PROPERTY_SEX, SpeciesBatchRowModel.PROPERTY_MATURITY, @@ -122,13 +105,6 @@ SpeciesBatchRowModel.PROPERTY_ATTACHMENTS, SpeciesBatchRowModel.PROPERTY_FREQUENCY); this.ui = ui; - this.persistenceService = context.getService(PersistenceService.class); - this.fishingOperationMonitor = new TuttiBeanMonitor<SpeciesBatchUIModel>( - SpeciesBatchUIModel.PROPERTY_SAMPLE_VRAC_WEIGHT, - SpeciesBatchUIModel.PROPERTY_TOTAL_HORS_VRAC_WEIGHT, - SpeciesBatchUIModel.PROPERTY_TOTAL_VRAC_WEIGHT, - SpeciesBatchUIModel.PROPERTY_TOTAL_WEIGHT - ); } //------------------------------------------------------------------------// @@ -151,6 +127,11 @@ } @Override + protected FishingOperation getFishingOperation() { + return getModel().getFishingOperation(); + } + + @Override protected void onModelRowsChanged(List<SpeciesBatchRowModel> rows) { super.onModelRowsChanged(rows); @@ -163,8 +144,7 @@ return new String[]{ SpeciesBatchRowModel.PROPERTY_SAMPLE_WEIGHT, SpeciesBatchRowModel.PROPERTY_SAMPLING_RATIO, - SpeciesBatchRowModel.PROPERTY_FREQUENCY - }; + SpeciesBatchRowModel.PROPERTY_FREQUENCY}; } @Override @@ -208,13 +188,19 @@ } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_VRAC_HORS_VRAC)) { + if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY)) { - // Vrac / Hors vrac column + // SortedUnsortedCategory column - addComboEnumColumnToModel(columnModel, - SpeciesBatchTableModel.VRAC_HORS_VRAC, - VracHorsVracEnum.values()); + Decorator<SortedUnsortedCategory> decorator = + getDecorator(SortedUnsortedCategory.class, null); + + List<SortedUnsortedCategory> data = + persistenceService.getAllSortedUnsortedCategory(); + + addComboDataColumnToModel(columnModel, + SpeciesBatchTableModel.SORTED_UNSORTED_CATEGORY, + decorator, data); } if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY)) { @@ -275,7 +261,7 @@ { // Computed weight column (from frequencies) addColumnToModel(columnModel, - FrequencyCellComponent.newEditor(ui.getFrequencyUI()), + FrequencyCellComponent.newEditor(ui.getFrequencyEditor()), FrequencyCellComponent.newRender(), SpeciesBatchTableModel.COMPUTED_WEIGHT); } @@ -283,7 +269,7 @@ { // Computed number column (from frequencies) addColumnToModel(columnModel, - FrequencyCellComponent.newEditor(ui.getFrequencyUI()), + FrequencyCellComponent.newEditor(ui.getFrequencyEditor()), FrequencyCellComponent.newRender(), SpeciesBatchTableModel.COMPUTED_NUMBER); } @@ -303,16 +289,18 @@ { // Comment column addColumnToModel(columnModel, - LongTextCellComponent.newEditor(ui.getLongTextEditorUI()), - LongTextCellComponent.newRender(), + LongTextCellComponent.newEditor(ui.getLongTextEditor()), + LongTextCellComponent.newRender(n_("tutti.tooltip.comment.none")), SpeciesBatchTableModel.COMMENT); } { // File column addColumnToModel(columnModel, - AttachmentCellComponent.newEditor(ui.getAttachmentEditorUI()), - AttachmentCellComponent.newRender(), + AttachmentCellComponent.newEditor(ui.getAttachmentEditor()), + AttachmentCellComponent.newRender( + getDecorator(Attachment.class, null), + n_("tutti.tooltip.attachment.none")), SpeciesBatchTableModel.ATTACHMENTS); } return columnModel; @@ -423,130 +411,91 @@ Boolean newValue) { } - //------------------------------------------------------------------------// - //-- AbstractTuttiUIHandler methods --// - //------------------------------------------------------------------------// - @Override - public void beforeInitUI() { + protected void saveSelectedRowIfRequired() { - if (log.isInfoEnabled()) { - log.info("beforeInit: " + ui); - } + TuttiBeanMonitor<SpeciesBatchRowModel> rowMonitor = getRowMonitor(); - SpeciesBatchUIModel model = new SpeciesBatchUIModel(); - ui.setContextValue(model); + SpeciesBatchRowModel bean = rowMonitor.getBean(); + if (bean != null) { - fishingOperationMonitor.setBean(model); - } + if (bean.isValid()) { + // there is a valid bean attached to the monitor - @Override - public void afterInitUI() { + if (rowMonitor.wasModified()) { - if (log.isInfoEnabled()) { - log.info("afterInit: " + ui); - } + // monitored bean was modified, save it + if (log.isInfoEnabled()) { + log.info("Row " + bean + " was modified, will save it"); + } - initUI(ui); + saveRow(bean); - //TODO Will come from protocol - List<String> samplingOrder = Lists.newArrayList( - SpeciesBatchRowModel.PROPERTY_SPECIES, - SpeciesBatchRowModel.PROPERTY_VRAC_HORS_VRAC, - SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY, - SpeciesBatchRowModel.PROPERTY_SEX - ); + // clear modified flag on the monitor + rowMonitor.clearModified(); + } + } else { - getModel().setSamplingOrder(samplingOrder); + // row is not valid can not save it - JXTable table = getTable(); + SpeciesBatch catchBean = bean.toBean(); - TableRowFilterSupport.forTable(table).searchable(true).useTableRenderers(true).apply(); + if (!TuttiEntities.isNew(catchBean)) { - // create table column model - TableColumnModel columnModel = createTableColumnModel(); + // remove this + persistenceService.deleteSpeciesBatch(catchBean.getId()); + } + } + } + } - // create table model - SpeciesBatchTableModel tableModel = - new SpeciesBatchTableModel(columnModel); + @Override + protected boolean isRowValid(SpeciesBatchRowModel row) { - table.setModel(tableModel); - table.setColumnModel(columnModel); - installTableKeyListener(columnModel, table); + SpeciesBatchUIModel model = getModel(); - table.getTableHeader().setReorderingAllowed(false); - - - Highlighter readOnlyHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - HighlightPredicate.READ_ONLY, Color.LIGHT_GRAY); - - table.addHighlighter(readOnlyHighlighter); - Highlighter validHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( - new HighlightPredicate.AndHighlightPredicate(HighlightPredicate.EDITABLE, new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - - boolean result = false; - if (adapter.isEditable()) { - int rowIndex = adapter.convertRowIndexToModel(adapter.row); - SpeciesBatchRowModel row = getTableModel().getEntry(rowIndex); - result = !row.isValid(); - } - return result; - } - }), Color.RED); - table.addHighlighter(validHighlighter); - - // when model datas change let's propagate it table model - listenRowsFromModel(); - - // save when row chaged and was modified - ListSelectionListener listener = new TableRowModificationListener<SpeciesBatchRowModel>( - getTableModel(), getRowMonitor()) { - @Override - protected void saveSelectedRow() { - saveSelectedRowIfRequired(); - } - }; - table.getSelectionModel().addListSelectionListener(listener); - - // always scroll to selected row - SwingUtil.scrollToTableSelection(getTable()); + SpeciesBatchTreeModel samplingTreeModel = model.getSamplingTreeModel(); + SpeciesBatchTreeNode node = samplingTreeModel.getSamplingNode(row); + boolean rowValid = samplingTreeModel.isValid(row, node); + return rowValid; } @Override - public void onCloseUI() { + protected void saveRow(SpeciesBatchRowModel row) { + + SpeciesBatch catchBean = row.toBean(); + + FishingOperation fishingOperation = getModel().getFishingOperation(); + catchBean.setFishingOperation(fishingOperation); if (log.isInfoEnabled()) { - log.info("closing: " + ui); + log.info("Selected fishingOperation: " + fishingOperation.getId()); } - } - //------------------------------------------------------------------------// - //-- Public methods --// - //------------------------------------------------------------------------// + if (TuttiEntities.isNew(catchBean)) { - public void saveSelectedRowIfRequired(FocusEvent event) { + catchBean = persistenceService.createSpeciesBatch(catchBean); + row.setId(catchBean.getId()); + } else { + persistenceService.saveSpeciesBatch(catchBean); + } - Component oppositeComponent = event.getOppositeComponent(); + List<SpeciesFrequencyRowModel> frequencyRows = row.getFrequency(); - JXTable parentContainer = null; + List<SpeciesBatchFrequency> frequency = + SpeciesFrequencyRowModel.toBeans(frequencyRows, catchBean); - if (oppositeComponent != null) { - - // check out if still on table - parentContainer = SwingUtil.getParentContainer( - oppositeComponent, JXTable.class); + if (log.isInfoEnabled()) { + log.info("Will save " + frequency.size() + " frequencies."); } + frequency = persistenceService.saveSpeciesBatchFrequency( + catchBean.getId(), frequency); - if (parentContainer == null) { - - // out of the table can save - if (getModel().getFishingOperation() != null) { - saveSelectedRowIfRequired(); - } - } + // push it back to row model + frequencyRows = SpeciesFrequencyRowModel.fromBeans(frequency); + row.setFrequency(frequencyRows); } + @Override public void selectFishingOperation(FishingOperation bean) { JXTable table = ui.getTable(); @@ -613,6 +562,68 @@ } //------------------------------------------------------------------------// + //-- AbstractTuttiUIHandler methods --// + //------------------------------------------------------------------------// + + @Override + public void beforeInitUI() { + + if (log.isInfoEnabled()) { + log.info("beforeInit: " + ui); + } + + SpeciesBatchUIModel model = new SpeciesBatchUIModel(); + ui.setContextValue(model); + + fishingOperationMonitor.setBean(model); + } + + @Override + public void afterInitUI() { + + if (log.isInfoEnabled()) { + log.info("afterInit: " + ui); + } + + initUI(ui); + + //TODO Will come from protocol + List<String> samplingOrder = Lists.newArrayList( + SpeciesBatchRowModel.PROPERTY_SPECIES, + SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, + SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY, + SpeciesBatchRowModel.PROPERTY_SEX + ); + + getModel().setSamplingOrder(samplingOrder); + + JXTable table = getTable(); + + // create table column model + TableColumnModel columnModel = createTableColumnModel(); + + // create table model + SpeciesBatchTableModel tableModel = + new SpeciesBatchTableModel(columnModel); + + table.setModel(tableModel); + table.setColumnModel(columnModel); + + initBatchTable(table, columnModel, tableModel); + } + + @Override + public void onCloseUI() { + if (log.isInfoEnabled()) { + log.info("closing: " + ui); + } + } + + //------------------------------------------------------------------------// + //-- Public methods --// + //------------------------------------------------------------------------// + + //------------------------------------------------------------------------// //-- Internal methods --// //------------------------------------------------------------------------// @@ -660,7 +671,6 @@ getTableModel().updateSamplingRatio(samplingContext.getSamplingRows()); } - protected void recomputeTotalHorsVrac() { // recompute total hors vrac @@ -668,20 +678,24 @@ Float totalVrac = 0f; for (SpeciesBatchRowModel batch : getModel().getRows()) { - VracHorsVracEnum vracHorsVrac = batch.getVracHorsVrac(); + SortedUnsortedCategory vracHorsVrac = batch.getSortedUnsortedCategory(); + if (vracHorsVrac == null) { // can't sum anything - } else if (vracHorsVrac == VracHorsVracEnum.HORS_VRAC) { - Float weight = batch.getWeight(); - if (weight != null) { - totalHorsVrac += weight; + } else { + boolean unsorted = "unsorted".equals(vracHorsVrac.getName()); + if (unsorted) { + Float weight = batch.getWeight(); + if (weight != null) { + totalHorsVrac += weight; + } + } else { + Float weight = batch.getWeight(); + if (weight != null) { + totalVrac += weight; + } } - } else if (vracHorsVrac == VracHorsVracEnum.VRAC) { - Float weight = batch.getWeight(); - if (weight != null) { - totalVrac += weight; - } } } if (log.isInfoEnabled()) { @@ -692,75 +706,4 @@ //TODO Should we also set the total vrac weight ? // getModel().setTotalVracWeight(totalVrac); } - - protected void saveSelectedRowIfRequired() { - - TuttiBeanMonitor<SpeciesBatchRowModel> rowMonitor = getRowMonitor(); - - SpeciesBatchRowModel bean = rowMonitor.getBean(); - if (bean != null) { - - if (bean.isValid()) { - // there is a valid bean attached to the monitor - - if (rowMonitor.wasModified()) { - - // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + bean + " was modified, will save it"); - } - - saveRow(bean); - - // clear modified flag on the monitor - rowMonitor.clearModified(); - } - } else { - - // row is not valid can not save it - - SpeciesBatch catchBean = bean.toBean(); - - if (!TuttiEntities.isNew(catchBean)) { - - // remove this - persistenceService.deleteSpeciesBatch(catchBean.getId()); - } - } - } - } - - protected void saveRow(SpeciesBatchRowModel row) { - - SpeciesBatch catchBean = row.toBean(); - - FishingOperation fishingOperation = getModel().getFishingOperation(); - catchBean.setFishingOperation(fishingOperation); - if (log.isInfoEnabled()) { - log.info("Selected fishingOperation: " + fishingOperation.getId()); - } - - if (TuttiEntities.isNew(catchBean)) { - - catchBean = persistenceService.createSpeciesBatch(catchBean); - row.setId(catchBean.getId()); - } else { - persistenceService.saveSpeciesBatch(catchBean); - } - - List<SpeciesFrequencyRowModel> frequencyRows = row.getFrequency(); - - List<SpeciesBatchFrequency> frequency = - SpeciesFrequencyRowModel.toBeans(frequencyRows, catchBean); - - if (log.isInfoEnabled()) { - log.info("Will save " + frequency.size() + " frequencies."); - } - frequency = persistenceService.saveSpeciesBatchFrequency( - catchBean.getId(), frequency); - - // push it back to row model - frequencyRows = SpeciesFrequencyRowModel.fromBeans(frequency); - row.setFrequency(frequencyRows); - } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-15 16:05:45 UTC (rev 77) @@ -25,6 +25,7 @@ */ import com.google.common.base.Preconditions; +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.ComponentMover; import fr.ifremer.tutti.ui.swing.util.ComponentResizer; @@ -36,24 +37,31 @@ import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.decorator.Decorator; +import javax.swing.AbstractAction; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; import javax.swing.JButton; +import javax.swing.JComponent; import javax.swing.JDialog; +import javax.swing.JRootPane; import javax.swing.JTable; +import javax.swing.KeyStroke; import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; import java.awt.Frame; +import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.util.Collection; import static org.nuiton.i18n.I18n._; @@ -73,11 +81,11 @@ public AttachmentCellComponent() { setContentAreaFilled(false); setOpaque(false); - setIcon(SwingUtil.createActionIcon("edit")); + setIcon(SwingUtil.createActionIcon("edit-attachment")); } - public static TableCellRenderer newRender() { - return new AttachmentCellRenderer(); + public static TableCellRenderer newRender(Decorator<Attachment> decorator, String noneText) { + return new AttachmentCellRenderer(decorator, noneText); } public static TableCellEditor newEditor(AttachmentEditorUI ui) { @@ -145,6 +153,16 @@ editor.setUndecorated(true); editor.add(ui); editor.setResizable(true); + JRootPane rootPane = editor.getRootPane(); + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); + rootPane.getActionMap().put("close", new AbstractAction() { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + ui.getHandler().close(); + } + }); editor.pack(); ComponentResizer cr = new ComponentResizer(); @@ -250,10 +268,19 @@ protected final AttachmentCellComponent component; + public static final String TEXT_PATTERN = "<html><body>%s</body></html>"; + + private final String noneText; + + private final Decorator<Attachment> decorator; + protected String propertyName; - public AttachmentCellRenderer() { + public AttachmentCellRenderer(Decorator<Attachment> decorator, + String noneText) { component = new AttachmentCellComponent(); + this.noneText = noneText; + this.decorator = decorator; } @Override @@ -264,7 +291,8 @@ int row, int column) { - String text; + String textValue; + if (value == null) { if (propertyName == null) { AbstractTuttiTableModel tableModel = @@ -273,13 +301,18 @@ propertyName = columnIdentifier.getPropertyName(); } // use HTML to show the tooltip in italic - text = "<html><body><i>" + _("tutti.tooltip." + propertyName + ".none") + "</i></body></html>"; + textValue = "<i>" + _(noneText) + "</i>"; } else { + Collection<Attachment> attachments = (Collection<Attachment>) value; + StringBuilder sb = new StringBuilder(); + for (Attachment attachment : attachments) { + sb.append("<br/>").append(decorator.toString(attachment)); + } // use html to display the tooltip on several lines - text = "<html><body>" + String.valueOf(value).replace("\n", "<br/>") + "</body></html>"; + textValue = sb.substring(5); } - + String text = String.format(TEXT_PATTERN, textValue); boolean editable = table.isCellEditable(row, column); component.setEnabled(editable); component.setToolTipText(text); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-15 16:05:45 UTC (rev 77) @@ -34,20 +34,26 @@ import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.AbstractAction; import javax.swing.AbstractCellEditor; import javax.swing.BorderFactory; import javax.swing.JButton; +import javax.swing.JComponent; import javax.swing.JDialog; +import javax.swing.JRootPane; import javax.swing.JTable; +import javax.swing.KeyStroke; import javax.swing.border.LineBorder; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; import java.awt.Frame; +import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; @@ -73,11 +79,11 @@ public LongTextCellComponent() { setContentAreaFilled(false); setOpaque(false); - setIcon(SwingUtil.createActionIcon("edit")); + setIcon(SwingUtil.createActionIcon("edit-comment")); } - public static TableCellRenderer newRender() { - return new LongTextCellRenderer(); + public static TableCellRenderer newRender(String noneText) { + return new LongTextCellRenderer(noneText); } public static TableCellEditor newEditor(LongTextEditorUI ui) { @@ -150,7 +156,16 @@ editor.add(ui); editor.setSize(DEFAULT_EDITOR_WIDTH, DEFAULT_EDITOR_HEIGHT); editor.setResizable(true); + JRootPane rootPane = editor.getRootPane(); + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close"); + rootPane.getActionMap().put("close", new AbstractAction() { + private static final long serialVersionUID = 1L; + @Override + public void actionPerformed(ActionEvent e) { + ui.getHandler().close(); + } + }); ComponentResizer cr = new ComponentResizer(); cr.registerComponent(editor); ComponentMover cm = new ComponentMover(); @@ -256,8 +271,13 @@ protected String propertyName; - public LongTextCellRenderer() { + public static final String TEXT_PATTERN = "<html><body>%s</body></html>"; + + private final String noneText; + + public LongTextCellRenderer(String noneText) { component = new LongTextCellComponent(); + this.noneText = noneText; } @Override @@ -268,22 +288,26 @@ int row, int column) { - String text; - if (value == null) { +// String text; + String textValue; + if (StringUtils.isBlank((String)value)) { if (propertyName == null) { AbstractTuttiTableModel tableModel = (AbstractTuttiTableModel) table.getModel(); - ColumnIdentifier columnIdentifier = tableModel.getPropertyName(column); + ColumnIdentifier columnIdentifier = + tableModel.getPropertyName(column); propertyName = columnIdentifier.getPropertyName(); } // use HTML to show the tooltip in italic - text = "<html><body><i>" + _("tutti.tooltip." + propertyName + ".none") + "</i></body></html>"; + textValue = "<i>" + _(noneText) + "</i>"; } else { // use html to display the tooltip on several lines - text = "<html><body>" + String.valueOf(value).replace("\n", "<br/>") + "</body></html>"; + textValue = String.valueOf(value).replace("\n", "<br/>"); } + String text = String.format(TEXT_PATTERN, textValue); + boolean editable = table.isCellEditable(row, column); component.setEnabled(editable); component.setToolTipText(text); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.jaxx 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.jaxx 2012-12-15 16:05:45 UTC (rev 77) @@ -27,7 +27,7 @@ <String id='property' javaBean='""'/>  - <fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel id='bean' javaBean='null'/> + <Object id='bean' javaBean='null'/> <LongTextEditorUIHandler id='handler' constructorParams='this'/> @@ -35,7 +35,7 @@ <cell fill='both' weightx='1'> <JScrollPane> <JTextArea id='textContent' - onKeyReleased='handler.setText()'/> + onKeyReleased='handler.setText(((JTextArea)event.getSource()).getText())'/> </JScrollPane> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -24,7 +24,6 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import org.apache.commons.lang3.StringUtils; @@ -43,7 +42,8 @@ */ public class LongTextEditorUIHandler { - private static final Log log = LogFactory.getLog(LongTextEditorUIHandler.class); + private static final Log log = + LogFactory.getLog(LongTextEditorUIHandler.class); private final LongTextEditorUI ui; @@ -53,35 +53,23 @@ ui.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - AbstractTuttiBeanUIModel bean = ui.getBean(); + Object bean = ui.getBean(); String property = ui.getProperty(); if (bean != null && !StringUtils.isEmpty(property)) { Object value = TuttiUIUtil.getProperty(bean, property); - if (value == null) { - value = ""; - } - ui.getTextContent().setText(value.toString()); + ui.getTextContent().setText(SwingUtil.getStringValue(value)); } } }); } /** pushes the typed text in the property of the bean */ - public void setText() { - String value = ui.getTextContent().getText(); - AbstractTuttiBeanUIModel bean = ui.getBean(); + public void setText(String value) { + Object bean = ui.getBean(); String property = ui.getProperty(); TuttiUIUtil.setProperty(bean, property, value); } - public void resetText() { - AbstractTuttiBeanUIModel bean = ui.getBean(); - String property = ui.getProperty(); - TuttiUIUtil.setProperty(bean, property, null); - - ui.getTextContent().setText(""); - } - /** closes the editor */ public void close() { if (log.isInfoEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java 2012-12-15 16:05:45 UTC (rev 77) @@ -32,13 +32,13 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; -import jaxx.runtime.swing.editor.EnumEditor; import jaxx.runtime.swing.editor.bean.BeanUIUtil; import jaxx.runtime.swing.editor.cell.NumberCellEditor; import jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.jdesktop.swingx.autocomplete.ObjectToStringConverter; import org.jdesktop.swingx.table.TableColumnExt; @@ -82,7 +82,7 @@ */ private final TuttiBeanMonitor<R> rowMonitor; - protected abstract JTable getTable(); + protected abstract JXTable getTable(); protected abstract AbstractTuttiTableModel<R> getTableModel(); @@ -101,6 +101,7 @@ Boolean oldValue, Boolean newValue); + protected String[] getRowPropertiesToIgnore() { return ArrayUtils.EMPTY_STRING_ARRAY; } @@ -211,7 +212,6 @@ editor.getNumberEditor().getTextField().addKeyListener(keyAdapter); } } - return keyAdapter; } @@ -276,7 +276,8 @@ protected <B> void addComboDataColumnToModel(TableColumnModel model, ColumnIdentifier<R> identifier, - Decorator<B> decorator, List<B> data) { + Decorator<B> decorator, + List<B> data) { JComboBox comboBox = new JComboBox(); comboBox.setRenderer(newListCellRender(decorator)); SwingUtil.fillComboBox(comboBox, data, null); @@ -291,19 +292,6 @@ identifier); } - protected <B extends Enum<B>> void addComboEnumColumnToModel(TableColumnModel model, - ColumnIdentifier<R> identifier, - B[] data) { - EnumEditor<B> comboBox = EnumEditor.newEditor(data); - BeanUIUtil.decorate(comboBox, ObjectToStringConverter.DEFAULT_IMPLEMENTATION); - TableCellEditor editor = new ComboBoxCellEditor(comboBox); - - addColumnToModel(model, - editor, - null, - identifier); - } - protected void listenRowsFromModel() { getModel().addPropertyChangeListener(AbstractTuttiTableUIModel.PROPERTY_ROWS, new PropertyChangeListener() { @Override Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-15 00:14:45 UTC (rev 76) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-15 16:05:45 UTC (rev 77) @@ -108,6 +108,7 @@ tutti.label.list.gear=Engin(s) tutti.label.list.headOfMission=Chef(s) de mission tutti.label.list.headOfSortRoom=Reponsable(s) de salle de tri +tutti.label.list.saisisseur=Saisisseur(s) tutti.label.list.vessel=Navire(s) tutti.label.macroWaste.totalWeight=Poids total tutti.label.no.fishingOperation.selected=< Aucun trait sélectionné > @@ -146,6 +147,11 @@ tutti.menu.synchronisationImport.tip=Effectuer des imports tutti.menu.synchronisations=Synchronisation tutti.menu.synchronisations.tip=Import/Export +tutti.table.accidental.batch.header.comment=Commentaire +tutti.table.accidental.batch.header.file=Pièces-jointes +tutti.table.accidental.batch.header.speciesByCode=Espèce +tutti.table.accidental.batch.header.speciesByGenusCode=Espèce +tutti.table.accidental.batch.header.weight=Poids observé tutti.table.benthos.batch.header.comment=Commentaire tutti.table.benthos.batch.header.elevationRate=Fraction d'élévation tutti.table.benthos.batch.header.file=Pièces jointes @@ -156,6 +162,7 @@ tutti.table.benthos.batch.header.weight=Poids tutti.table.macrowaste.batch.header.comment=Commentaire tutti.table.macrowaste.batch.header.file=Pièces jointes +tutti.table.macrowaste.batch.header.macroWasteCategory=Catégorie tutti.table.macrowaste.batch.header.speciesByCode=Espèce tutti.table.macrowaste.batch.header.speciesByGenusCode=Espèce tutti.table.macrowaste.batch.header.weight=Poids @@ -176,10 +183,10 @@ tutti.table.species.batch.header.maturity=Maturité tutti.table.species.batch.header.sampleWeight=Poids échantillonné tutti.table.species.batch.header.sex=Sexe +tutti.table.species.batch.header.sortedUnsortedCategory=Vrac / Hors Vrac tutti.table.species.batch.header.speciesByCode=Espèce tutti.table.species.batch.header.speciesByGenusCode=Espèce tutti.table.species.batch.header.toConfirm=A Confirmer -tutti.table.species.batch.header.vracHorsVrac=Vrac / Hors Vrac tutti.table.species.batch.header.weight=Poids tutti.table.species.batch.header.weightCategory=Catégorie Poids tutti.table.species.frequency.header.computedWeight=Poids calculé @@ -200,7 +207,9 @@ tutti.title.selectedCruise=Campagne %s tutti.title.selectedProgram=Série de campagne %s tutti.to.be.done=< A FAIRE > -tutti.tooltip.comment.none=Aucun +tutti.tooltip.= +tutti.tooltip.attachment.none=Pas de pièce-jointes +tutti.tooltip.comment.none=Pas de commentaire tutti.validator.error.cruise.beginDate.required=La date de début est obligatoire tutti.validator.error.cruise.country.required=Le pays est obligatoire tutti.validator.error.cruise.endDate.required=La date de fin est obligatoire Added: trunk/tutti-ui-swing/src/main/resources/icons/action-edit-attachment.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-edit-attachment.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/tutti-ui-swing/src/main/resources/icons/action-edit-comment.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-edit-comment.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r76 - trunk
by tchemit＠users.forge.codelutin.com Dec. 15, 2012

Dec. 15, 2012

Author: tchemit Date: 2012-12-15 01:14:45 +0100 (Sat, 15 Dec 2012) New Revision: 76 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/76 Log: use last stable of jaxx Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-15 00:09:07 UTC (rev 75) +++ trunk/pom.xml 2012-12-15 00:14:45 UTC (rev 76) @@ -91,7 +91,7 @@ <h2Version>1.3.168</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> - <jaxxVersion>2.5.8-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.8</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

r75 - trunk
by tchemit＠users.forge.codelutin.com Dec. 15, 2012

Dec. 15, 2012

Author: tchemit Date: 2012-12-15 01:09:07 +0100 (Sat, 15 Dec 2012) New Revision: 75 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/75 Log: can not release with a snapshot Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-14 23:53:10 UTC (rev 74) +++ trunk/pom.xml 2012-12-15 00:09:07 UTC (rev 75) @@ -16,7 +16,7 @@ <modules> <module>tutti-persistence</module> <module>tutti-persistence-dev</module> - <module>tutti-persistence-adagio</module> +  <module>tutti-service</module> <module>tutti-ui-swing</module> </modules>

1 0

r74 - trunk/tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-15 00:53:10 +0100 (Sat, 15 Dec 2012) New Revision: 74 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/74 Log: fix i18n file (last time\! no now is lats time :D) Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-14 23:52:06 UTC (rev 73) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-14 23:53:10 UTC (rev 74) @@ -44,7 +44,7 @@ tutti.label.attachmentEditor.file=Fichier tutti.label.attachmentEditor.fileComment=Commentaire tutti.label.attachmentEditor.fileName=Nom -tutti.label.benthos.sampleTotalWeight=Poids total \u00c3\u00a9chantillonn\u00c3\u00a9 +tutti.label.benthos.sampleTotalWeight=Poids total échantillonné tutti.label.benthos.totalWeight=Poids total tutti.label.comment=Commentaire tutti.label.cruise=Campagne

1 0

r73 - trunk/tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-15 00:52:06 +0100 (Sat, 15 Dec 2012) New Revision: 73 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/73 Log: fix i18n file (last time\!) Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-14 23:44:19 UTC (rev 72) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-14 23:52:06 UTC (rev 73) @@ -1,7 +1,7 @@ tutti.about.bottomText=Copyright %s - %s - version %s -tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de donn\u00c3\u00a9es d'op\u00c3\u00a9rations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des donn\u00c3\u00a9es d'op\u00c3\u00a9ration de p\u00c3\u00aache (positions, environnement, engin, etc) et des captures associ\u00c3\u00a9es (composition de la capture en esp\u00c3\u00a8ces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques r\u00c3\u00a9alis\u00c3\u00a9es par l'Ifremer.</p><p>Ce projet a \u00c3\u00a9t\u00c3\u00a9 initi\u00c3\u00a9e en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et r\u00c3\u00a9alis\u00c3\u00a9 par la soci\u00c3\u00a9t\u00c3\u00a9 <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.</p><p>Projet h\u00c3\u00a9berg\u00c3\u00a9 sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>.</p> -tutti.action.about=\u00c3\u0080 propos -tutti.action.about.tip=\u00c3\u0080 Propos +tutti.about.message=<h3>Tutti</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en 2012 par l'<a href\="http\://www.ifremer.fr">Ifremer</a> et réalisé par la société <a href\="http\://codelutin.com">Codelutin</a>.</p><hr/><br/><p>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.forge.codelutin.com/tutti">site du projet</a>.</p><p>Projet hébergé sur la forge <a href\="http\://forge.codelutin.com/projects/tutti">Forge.codelutin.com</a>.</p> +tutti.action.about=À propos +tutti.action.about.tip=À Propos tutti.action.cancel=Annuler tutti.action.casino-import=Import Casino tutti.action.catches=Captures @@ -13,21 +13,21 @@ tutti.action.exit.tip=Quitter l'application tutti.action.fillCatches=Captures tutti.action.fillCatches.tip=Saisir des captures -tutti.action.generate=G\u00c3\u00a9n\u00c3\u00a9rer -tutti.action.generateCampaignName=G\u00c3\u00a9n\u00c3\u00a9rer le nom +tutti.action.generate=Générer +tutti.action.generateCampaignName=Générer le nom tutti.action.manageProtocol=Protocole -tutti.action.manageProtocol.tip=G\u00c3\u00a9rer les protocoles +tutti.action.manageProtocol.tip=Gérer les protocoles tutti.action.new=Nouveau tutti.action.pupitri-import=Import PUPITRI tutti.action.reload.actions=Recharger les actions tutti.action.reload.home=Reload home screen tutti.action.reload.ui=Recharger l'interface graphique -tutti.action.reset.fishingOperationValidState=R\u00c3\u00a9initialiser +tutti.action.reset.fishingOperationValidState=Réinitialiser tutti.action.save=Enregistrer tutti.action.selectCampaign=Campagne -tutti.action.selectCampaign.tip=S\u00c3\u00a9lectionner la campagne \u00c3\u00a0 utiliser +tutti.action.selectCampaign.tip=Sélectionner la campagne à utiliser tutti.action.site=Site -tutti.action.site.tip=Acc\u00c3\u00a9der au site du projet Tutti +tutti.action.site.tip=Accéder au site du projet Tutti tutti.application.config=Configuration de l'application Tutti tutti.application.name=Tutti tutti.config.category.applications=Application @@ -36,11 +36,11 @@ tutti.config.category.other.description=Autres options tutti.config.category.shortcuts=Raccourcis tutti.config.category.shortcuts.description=Liste des raccourcis clavier -tutti.config.cruiseId=Identifiant de la derni\u00c3\u00a8re campagne utilis\u00c3\u00a9e -tutti.config.programId=Identifiant de la derni\u00c3\u00a8re s\u00c3\u00a9rie de campagne utilis\u00c3\u00a9e -tutti.config.ui.autoPopupNumberEditor=Toujours afficher le pav\u00c3\u00a9 num\u00c3\u00a9rique lors de l'\u00c3\u00a9dition d'un nombre +tutti.config.cruiseId=Identifiant de la dernière campagne utilisée +tutti.config.programId=Identifiant de la dernière série de campagne utilisée +tutti.config.ui.autoPopupNumberEditor=Toujours afficher le pavé numérique lors de l'édition d'un nombre tutti.config.ui.config=Chemin du fichier de configuration des interfaces graphiques -tutti.config.ui.showNumberEditorButton=Afficher le pav\u00c3\u00a9 num\u00c3\u00a9rique de saisie +tutti.config.ui.showNumberEditorButton=Afficher le pavé numérique de saisie tutti.label.attachmentEditor.file=Fichier tutti.label.attachmentEditor.fileComment=Commentaire tutti.label.attachmentEditor.fileName=Nom @@ -48,75 +48,75 @@ tutti.label.benthos.totalWeight=Poids total tutti.label.comment=Commentaire tutti.label.cruise=Campagne -tutti.label.cruise.beginDate=Date de d\u00c3\u00a9but +tutti.label.cruise.beginDate=Date de début tutti.label.cruise.country=Pays tutti.label.cruise.endDate=Date de fin tutti.label.cruise.name=Nom tutti.label.cruise.poche=Nombre de poches -tutti.label.cruise.program=S\u00c3\u00a9rie -tutti.label.cruise.surveyPart=S\u00c3\u00a9rie partielle -tutti.label.cruise.year=Ann\u00c3\u00a9e -tutti.label.fishingOperation.averageBottomSalinity=Salinit\u00c3\u00a9 de fond moyenne -tutti.label.fishingOperation.averageBottomTemperature=Temp\u00c3\u00a9rature de fond moyenne +tutti.label.cruise.program=Série +tutti.label.cruise.surveyPart=Série partielle +tutti.label.cruise.year=Année +tutti.label.fishingOperation.averageBottomSalinity=Salinité de fond moyenne +tutti.label.fishingOperation.averageBottomTemperature=Température de fond moyenne tutti.label.fishingOperation.beaufortScale=Force du vent tutti.label.fishingOperation.date=Date -tutti.label.fishingOperation.distanceChalutee=Distance chalut\u00c3\u00a9e -tutti.label.fishingOperation.duree=Dur\u00c3\u00a9e +tutti.label.fishingOperation.distanceChalutee=Distance chalutée +tutti.label.fishingOperation.duree=Durée tutti.label.fishingOperation.fishingOperationInvalid=Trait invalide -tutti.label.fishingOperation.fishingOperationNumber=Num\u00c3\u00a9ro de Trait +tutti.label.fishingOperation.fishingOperationNumber=Numéro de Trait tutti.label.fishingOperation.fishingOperationRectiligne=Trait rectiligne tutti.label.fishingOperation.fishingOperationValid=Trait valide tutti.label.fishingOperation.gearDate=Date tutti.label.fishingOperation.gearLatitude=Latitude tutti.label.fishingOperation.gearLongitude=Longitude tutti.label.fishingOperation.gearShootingEnd=Fin de traine -tutti.label.fishingOperation.gearShootingEndBottomSalinity=Salinit\u00c3\u00a9 de fond fin de traine -tutti.label.fishingOperation.gearShootingEndBottomTemperature=Temp\u00c3\u00a9rature de fond fin de traine +tutti.label.fishingOperation.gearShootingEndBottomSalinity=Salinité de fond fin de traine +tutti.label.fishingOperation.gearShootingEndBottomTemperature=Température de fond fin de traine tutti.label.fishingOperation.gearShootingEndDepth=Profondeur fin de traine -tutti.label.fishingOperation.gearShootingEndSurfaceSalinity=Salinit\u00c3\u00a9 de surface fin de traine +tutti.label.fishingOperation.gearShootingEndSurfaceSalinity=Salinité de surface fin de traine tutti.label.fishingOperation.gearShootingEndSurfaceTemperature=Temperature de surface fin de traine -tutti.label.fishingOperation.gearShootingStart=D\u00c3\u00a9but de traine -tutti.label.fishingOperation.gearShootingStartBottomSalinity=Salinit\u00c3\u00a9 de fond d\u00c3\u00a9but de traine -tutti.label.fishingOperation.gearShootingStartBottomTemperature=Temp\u00c3\u00a9rature de fond d\u00c3\u00a9but de traine -tutti.label.fishingOperation.gearShootingStartDepth=Profondeur d\u00c3\u00a9but de traine -tutti.label.fishingOperation.gearShootingStartSurfaceSalinity=Salinit\u00c3\u00a9 de surface d\u00c3\u00a9but de traine -tutti.label.fishingOperation.gearShootingStartSurfaceTemperature=Temperature de surface d\u00c3\u00a9but de traine +tutti.label.fishingOperation.gearShootingStart=Début de traine +tutti.label.fishingOperation.gearShootingStartBottomSalinity=Salinité de fond début de traine +tutti.label.fishingOperation.gearShootingStartBottomTemperature=Température de fond début de traine +tutti.label.fishingOperation.gearShootingStartDepth=Profondeur début de traine +tutti.label.fishingOperation.gearShootingStartSurfaceSalinity=Salinité de surface début de traine +tutti.label.fishingOperation.gearShootingStartSurfaceTemperature=Temperature de surface début de traine tutti.label.fishingOperation.gearTime=Heure -tutti.label.fishingOperation.geometrieMesuree=G\u00c3\u00a9om\u00c3\u00a9trie mesur\u00c3\u00a9e -tutti.label.fishingOperation.localite=Localit\u00c3\u00a9 +tutti.label.fishingOperation.geometrieMesuree=Géométrie mesurée +tutti.label.fishingOperation.localite=Localité tutti.label.fishingOperation.longueurBras=Longueur des funes tutti.label.fishingOperation.longueurFunes=Longueur des bras tutti.label.fishingOperation.ouvertureHorizontale=Ouverture horizontale tutti.label.fishingOperation.ouvertureVerticale=Ouverture verticale tutti.label.fishingOperation.seaState=Etat de la mer -tutti.label.fishingOperation.stationNumber=Num\u00c3\u00a9ro de la station +tutti.label.fishingOperation.stationNumber=Numéro de la station tutti.label.fishingOperation.strata=Strate tutti.label.fishingOperation.subStrata=Sous strate -tutti.label.fishingOperation.systemeFermetureCul=Syst\u00c3\u00a8me de fermeture de cul +tutti.label.fishingOperation.systemeFermetureCul=Système de fermeture de cul tutti.label.fishingOperation.windDirection=Direction du vent tutti.label.frequencyConfiguration.maxStep=Classe max tutti.label.frequencyConfiguration.minStep=Classe min -tutti.label.frequencyConfiguration.mode.autoGen=G\u00c3\u00a9n\u00c3\u00a9ration des classes -tutti.label.frequencyConfiguration.mode.autoGen.tip=Mode o\u00c3\u00b9 toutes les classes de taille sont g\u00c3\u00a9n\u00c3\u00a9r\u00c3\u00a9es +tutti.label.frequencyConfiguration.mode.autoGen=Génération des classes +tutti.label.frequencyConfiguration.mode.autoGen.tip=Mode où toutes les classes de taille sont générées tutti.label.frequencyConfiguration.mode.rafale=Mode "rafale" -tutti.label.frequencyConfiguration.mode.rafale.tip=Mode o\u00c3\u00b9 on ne saisit uniquement la classe de taille (les nombres seront alors incr\u00c3\u00a9ment\u00c3\u00a9s...) +tutti.label.frequencyConfiguration.mode.rafale.tip=Mode où on ne saisit uniquement la classe de taille (les nombres seront alors incrémentés...) tutti.label.frequencyConfiguration.mode.simple=Mode simple -tutti.label.frequencyConfiguration.mode.simple.tip=Mode par d\u00c3\u00a9faut on on doit tout saisir (les classes de tailles et les nombres) +tutti.label.frequencyConfiguration.mode.simple.tip=Mode par défaut on on doit tout saisir (les classes de tailles et les nombres) tutti.label.frequencyConfiguration.no.configuration=< Pas de configuration > -tutti.label.frequencyConfiguration.rafaleStep=Classe de taille \u00c3\u00a0 incr\u00c3\u00a9menter +tutti.label.frequencyConfiguration.rafaleStep=Classe de taille à incrémenter tutti.label.frequencyConfiguration.step=Pas de la classe de taille tutti.label.list.gear=Engin(s) tutti.label.list.headOfMission=Chef(s) de mission tutti.label.list.headOfSortRoom=Reponsable(s) de salle de tri tutti.label.list.vessel=Navire(s) tutti.label.macroWaste.totalWeight=Poids total -tutti.label.no.fishingOperation.selected=< Aucun trait s\u00c3\u00a9lectionn\u00c3\u00a9 > -tutti.label.plankton.sampleTotalWeight=Poids total \u00c3\u00a9chantillonn\u00c3\u00a9 +tutti.label.no.fishingOperation.selected=< Aucun trait sélectionné > +tutti.label.plankton.sampleTotalWeight=Poids total échantillonné tutti.label.plankton.totalWeight=Poids total -tutti.label.program=S\u00c3\u00a9rie de campagne +tutti.label.program=Série de campagne tutti.label.program.name=Nom tutti.label.program.zone=Zone -tutti.label.species.sampleVracWeight=Poids total vrac \u00c3\u00a9chant. +tutti.label.species.sampleVracWeight=Poids total vrac échant. tutti.label.species.totalHorsVracWeight=Poids total hors vrac tutti.label.species.totalVracWeight=Poids total vrac tutti.label.species.totalWeight=Poids total @@ -125,12 +125,12 @@ tutti.label.tab.fishingOperation=Trait tutti.label.tab.fishingOperation.environment=Environnement tutti.label.tab.fishingOperation.gearShooting=Mise en oeuvre de l'engin -tutti.label.tab.fishingOperation.general=Caract\u00c3\u00a9ristiques g\u00c3\u00a9n\u00c3\u00a9rales -tutti.label.tab.fishingOperation.hydrology=Param\u00c3\u00a8tres hydrologiques -tutti.label.tab.macroDechet=Macro d\u00c3\u00a9chets +tutti.label.tab.fishingOperation.general=Caractéristiques générales +tutti.label.tab.fishingOperation.hydrology=Paramètres hydrologiques +tutti.label.tab.macroDechet=Macro déchets tutti.label.tab.observationIndividuel=Observations individuelles tutti.label.tab.plancton=Plancton -tutti.label.tab.species=Esp\u00c3\u00a8ces +tutti.label.tab.species=Espèces tutti.legend.frequencyConfiguration=Configuration tutti.menu.actions=Actions tutti.menu.actions.tip=Actions @@ -138,8 +138,8 @@ tutti.menu.file.tip=Fichier tutti.menu.help=Aide tutti.menu.help.tip=Aide -tutti.menu.synchronisationAllegro=All\u00c3\u00a9gro -tutti.menu.synchronisationAllegro.tip=Synchronisation All\u00c3\u00a9gro +tutti.menu.synchronisationAllegro=Allégro +tutti.menu.synchronisationAllegro.tip=Synchronisation Allégro tutti.menu.synchronisationExport=Export tutti.menu.synchronisationExport.tip=Effectuer des exports tutti.menu.synchronisationImport=Import @@ -147,72 +147,72 @@ tutti.menu.synchronisations=Synchronisation tutti.menu.synchronisations.tip=Import/Export tutti.table.benthos.batch.header.comment=Commentaire -tutti.table.benthos.batch.header.elevationRate=Fraction d'\u00c3\u00a9l\u00c3\u00a9vation -tutti.table.benthos.batch.header.file=Pi\u00c3\u00a8ces jointes -tutti.table.benthos.batch.header.sampleWeight=Poids \u00c3\u00a9chantillonn\u00c3\u00a9 -tutti.table.benthos.batch.header.speciesByCode=Esp\u00c3\u00a8ce -tutti.table.benthos.batch.header.speciesByGenusCode=Esp\u00c3\u00a8ce +tutti.table.benthos.batch.header.elevationRate=Fraction d'élévation +tutti.table.benthos.batch.header.file=Pièces jointes +tutti.table.benthos.batch.header.sampleWeight=Poids échantillonné +tutti.table.benthos.batch.header.speciesByCode=Espèce +tutti.table.benthos.batch.header.speciesByGenusCode=Espèce tutti.table.benthos.batch.header.toConfirm=A Confirmer tutti.table.benthos.batch.header.weight=Poids tutti.table.macrowaste.batch.header.comment=Commentaire -tutti.table.macrowaste.batch.header.file=Pi\u00c3\u00a8ces jointes -tutti.table.macrowaste.batch.header.speciesByCode=Esp\u00c3\u00a8ce -tutti.table.macrowaste.batch.header.speciesByGenusCode=Esp\u00c3\u00a8ce +tutti.table.macrowaste.batch.header.file=Pièces jointes +tutti.table.macrowaste.batch.header.speciesByCode=Espèce +tutti.table.macrowaste.batch.header.speciesByGenusCode=Espèce tutti.table.macrowaste.batch.header.weight=Poids tutti.table.plankton.batch.header.comment=Commentaire -tutti.table.plankton.batch.header.elevationRate=Fraction d'\u00c3\u00a9l\u00c3\u00a9vation -tutti.table.plankton.batch.header.file=Pi\u00c3\u00a8ces jointes -tutti.table.plankton.batch.header.sampleWeight=Poids \u00c3\u00a9chantillonn\u00c3\u00a9 -tutti.table.plankton.batch.header.speciesByCode=Esp\u00c3\u00a8ce -tutti.table.plankton.batch.header.speciesByGenusCode=Esp\u00c3\u00a8ce +tutti.table.plankton.batch.header.elevationRate=Fraction d'élévation +tutti.table.plankton.batch.header.file=Pièces jointes +tutti.table.plankton.batch.header.sampleWeight=Poids échantillonné +tutti.table.plankton.batch.header.speciesByCode=Espèce +tutti.table.plankton.batch.header.speciesByGenusCode=Espèce tutti.table.plankton.batch.header.toConfirm=A Confirmer tutti.table.plankton.batch.header.weight=Poids tutti.table.species.batch.header.age=Age tutti.table.species.batch.header.comment=Commentaire -tutti.table.species.batch.header.computedNumber=Nombre calcul\u00c3\u00a9 -tutti.table.species.batch.header.computedWeight=Poids calcul\u00c3\u00a9 -tutti.table.species.batch.header.elevationRate=Fraction d'\u00c3\u00a9l\u00c3\u00a9vation -tutti.table.species.batch.header.file=Pi\u00c3\u00a8ces jointes -tutti.table.species.batch.header.maturity=Maturit\u00c3\u00a9 -tutti.table.species.batch.header.sampleWeight=Poids \u00c3\u00a9chantillonn\u00c3\u00a9 +tutti.table.species.batch.header.computedNumber=Nombre calculé +tutti.table.species.batch.header.computedWeight=Poids calculé +tutti.table.species.batch.header.elevationRate=Fraction d'élévation +tutti.table.species.batch.header.file=Pièces jointes +tutti.table.species.batch.header.maturity=Maturité +tutti.table.species.batch.header.sampleWeight=Poids échantillonné tutti.table.species.batch.header.sex=Sexe -tutti.table.species.batch.header.speciesByCode=Esp\u00c3\u00a8ce -tutti.table.species.batch.header.speciesByGenusCode=Esp\u00c3\u00a8ce +tutti.table.species.batch.header.speciesByCode=Espèce +tutti.table.species.batch.header.speciesByGenusCode=Espèce tutti.table.species.batch.header.toConfirm=A Confirmer tutti.table.species.batch.header.vracHorsVrac=Vrac / Hors Vrac tutti.table.species.batch.header.weight=Poids -tutti.table.species.batch.header.weightCategory=Cat\u00c3\u00a9gorie Poids -tutti.table.species.frequency.header.computedWeight=Poids calcul\u00c3\u00a9 +tutti.table.species.batch.header.weightCategory=Catégorie Poids +tutti.table.species.frequency.header.computedWeight=Poids calculé tutti.table.species.frequency.header.lengthStep=Classe de taille tutti.table.species.frequency.header.number=Nombre -tutti.table.species.frequency.header.weight=Poids observ\u00c3\u00a9 +tutti.table.species.frequency.header.weight=Poids observé tutti.timeeditor.H=H -tutti.title.about=\u00c3\u0080 propos de Tutti -tutti.title.create.cruise=Cr\u00c3\u00a9er une nouvelle campagne -tutti.title.create.program=Cr\u00c3\u00a9er une nouvelle s\u00c3\u00a9rie de campagne +tutti.title.about=À propos de Tutti +tutti.title.create.cruise=Créer une nouvelle campagne +tutti.title.create.program=Créer une nouvelle série de campagne tutti.title.edit.cruise=Editer une campagne existante -tutti.title.edit.operations=Saisie des op\u00c3\u00a9rations de p\u00c3\u00aaches (%s) -tutti.title.edit.program=Editer une s\u00c3\u00a9rie de campagne existante +tutti.title.edit.operations=Saisie des opérations de pêches (%s) +tutti.title.edit.program=Editer une série de campagne existante tutti.title.frequency=Saisie des mensurations -tutti.title.home=S\u00c3\u00a9lection de la campagne -tutti.title.noSelectedCruise=Pas de campagne s\u00c3\u00a9lectionn\u00c3\u00a9 -tutti.title.noSelectedProgram=Pas de s\u00c3\u00a9rie de campagne s\u00c3\u00a9lectionn\u00c3\u00a9 +tutti.title.home=Sélection de la campagne +tutti.title.noSelectedCruise=Pas de campagne sélectionné +tutti.title.noSelectedProgram=Pas de série de campagne sélectionné tutti.title.selectedCruise=Campagne %s -tutti.title.selectedProgram=S\u00c3\u00a9rie de campagne %s +tutti.title.selectedProgram=Série de campagne %s tutti.to.be.done=< A FAIRE > tutti.tooltip.comment.none=Aucun -tutti.validator.error.cruise.beginDate.required=La date de d\u00c3\u00a9but est obligatoire +tutti.validator.error.cruise.beginDate.required=La date de début est obligatoire tutti.validator.error.cruise.country.required=Le pays est obligatoire tutti.validator.error.cruise.endDate.required=La date de fin est obligatoire -tutti.validator.error.cruise.gear.required=Au moins un engin doit \u00c3\u00aatre s\u00c3\u00a9lectionn\u00c3\u00a9 -tutti.validator.error.cruise.headOfMission.required=Au moins un chef de mission doit \u00c3\u00aatre s\u00c3\u00a9lectionn\u00c3\u00a9 -tutti.validator.error.cruise.headOfSortRoom.required=Au moins un responsable de salle de tri doit \u00c3\u00aatre s\u00c3\u00a9lectionn\u00c3\u00a9 +tutti.validator.error.cruise.gear.required=Au moins un engin doit être sélectionné +tutti.validator.error.cruise.headOfMission.required=Au moins un chef de mission doit être sélectionné +tutti.validator.error.cruise.headOfSortRoom.required=Au moins un responsable de salle de tri doit être sélectionné tutti.validator.error.cruise.name.required=Le nom de la campagne est obligatoire tutti.validator.error.cruise.poche.required=Le nombre de poche est obligatoire -tutti.validator.error.cruise.program.required=La s\u00c3\u00a9rie est obligatoire -tutti.validator.error.cruise.vessel.required=Au moins un bateau doit \u00c3\u00aatre s\u00c3\u00a9lectionn\u00c3\u00a9 -tutti.validator.error.cruise.year.required=L'ann\u00c3\u00a9e est obligatoire +tutti.validator.error.cruise.program.required=La série est obligatoire +tutti.validator.error.cruise.vessel.required=Au moins un bateau doit être sélectionné +tutti.validator.error.cruise.year.required=L'année est obligatoire tutti.validator.error.fishingOperation.date.required=La date du fishingOperation est obligatoire -tutti.validator.error.fishingOperation.stationNumber.required=Le num\u00c3\u00a9ro de station est obligatoire -tutti.validator.error.program.name.required=Le nom de la s\u00c3\u00a9rie est obligatoire -tutti.validator.error.program.zone.required=La zone de la s\u00c3\u00a9rie est obligatoire +tutti.validator.error.fishingOperation.stationNumber.required=Le numéro de station est obligatoire +tutti.validator.error.program.name.required=Le nom de la série est obligatoire +tutti.validator.error.program.zone.required=La zone de la série est obligatoire

1 0

r72 - in trunk: . tutti-persistence-adagio tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-15 00:44:19 +0100 (Sat, 15 Dec 2012) New Revision: 72 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/72 Log: fix dependencies + use commons.lang3 Modified: trunk/pom.xml trunk/tutti-persistence-adagio/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/pom.xml 2012-12-14 23:44:19 UTC (rev 72) @@ -301,6 +301,11 @@ <artifactId>spring-orm</artifactId> <version>${spring.version}</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${spring.version}</version> + </dependency>  <dependency> <groupId>org.springframework</groupId> Modified: trunk/tutti-persistence-adagio/pom.xml =================================================================== --- trunk/tutti-persistence-adagio/pom.xml 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/tutti-persistence-adagio/pom.xml 2012-12-14 23:44:19 UTC (rev 72) @@ -35,7 +35,7 @@ <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> +  <dependency> <groupId>commons-logging</groupId> @@ -58,6 +58,10 @@  <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + </dependency> +   - <dependency> +  <dependency> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2012-12-14 23:44:19 UTC (rev 72) @@ -30,7 +30,7 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 23:44:19 UTC (rev 72) @@ -30,7 +30,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.HBox; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 23:16:31 UTC (rev 71) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 23:44:19 UTC (rev 72) @@ -27,7 +27,7 @@ import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r71 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-15 00:16:31 +0100 (Sat, 15 Dec 2012) New Revision: 71 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/71 Log: reformat some codes Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-14 23:13:54 UTC (rev 70) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-14 23:16:31 UTC (rev 71) @@ -24,15 +24,27 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.util.ComponentResizer; import com.google.common.base.Preconditions; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.ComponentMover; +import fr.ifremer.tutti.ui.swing.util.ComponentResizer; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; -import java.awt.event.WindowAdapter; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.AbstractCellEditor; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JTable; +import javax.swing.border.LineBorder; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; import java.awt.Frame; @@ -40,33 +52,24 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.swing.AbstractCellEditor; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JTable; -import javax.swing.border.LineBorder; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n._; /** * Component to edit a cell containing attachments - * + * * @author kmorin * @since 0.2 */ public class AttachmentCellComponent extends JButton { - + /** Logger. */ private static final Log log = LogFactory.getLog(AttachmentCellComponent.class); + private static final long serialVersionUID = 1L; + public AttachmentCellComponent() { setContentAreaFilled(false); setOpaque(false); @@ -80,16 +83,18 @@ public static TableCellEditor newEditor(AttachmentEditorUI ui) { return new AttachmentCellEditor(ui); } - - + + public static class AttachmentCellEditor extends AbstractCellEditor implements TableCellEditor { + private static final long serialVersionUID = 1L; + protected final AttachmentCellComponent component; protected final AttachmentEditorUI ui; protected Frame frame; - + protected JTable table; protected AbstractTuttiTableModel<AbstractTuttiBeanUIModel> tableModel; @@ -101,10 +106,10 @@ protected Integer rowIndex; protected Integer columnIndex; - + public AttachmentCellEditor(AttachmentEditorUI ui) { this.ui = ui; - + component = new AttachmentCellComponent(); component.setBorder(new LineBorder(Color.BLACK)); component.addKeyListener(new KeyAdapter() { @@ -131,23 +136,23 @@ if (frame == null) { frame = SwingUtil.getParentContainer(ui, Frame.class); } - + ui.setBorder(BorderFactory.createTitledBorder(_(columnIdentifier.getHeaderI18nKey()))); ui.setBean(editRow); ui.setProperty(columnIdentifier.getPropertyName()); - + JDialog editor = new JDialog(frame, true); editor.setUndecorated(true); editor.add(ui); editor.setResizable(true); editor.pack(); - + ComponentResizer cr = new ComponentResizer(); cr.registerComponent(editor); ComponentMover cm = new ComponentMover(); cm.setDragInsets(cr.getDragInsets()); cm.registerComponent(editor); - + editor.addWindowListener(new WindowAdapter() { @Override @@ -159,7 +164,7 @@ JAXXUtil.destroy(ui); } }); - + // Computes the location of bottom left corner of the cell Component comp = component; int x = 0; @@ -176,7 +181,7 @@ } editor.setLocation(x, y); editor.setVisible(true); - + int r = rowIndex; int c = columnIndex; @@ -186,7 +191,7 @@ // reselect this cell AbstractSelectTableAction.doSelectCell(table, r, c); } - + @Override public Component getTableCellEditorComponent(JTable table, Object value, @@ -194,7 +199,7 @@ int row, int column) { if (tableModel == null) { - tableModel = (AbstractTuttiTableModel<AbstractTuttiBeanUIModel>) table.getModel(); + tableModel = (AbstractTuttiTableModel<AbstractTuttiBeanUIModel>) table.getModel(); this.table = table; columnIdentifier = tableModel.getPropertyName(column); } @@ -240,11 +245,11 @@ editRow = null; } } - + public static class AttachmentCellRenderer implements TableCellRenderer { protected final AttachmentCellComponent component; - + protected String propertyName; public AttachmentCellRenderer() { @@ -262,19 +267,19 @@ String text; if (value == null) { if (propertyName == null) { - AbstractTuttiTableModel tableModel = + AbstractTuttiTableModel tableModel = (AbstractTuttiTableModel) table.getModel(); ColumnIdentifier columnIdentifier = tableModel.getPropertyName(column); propertyName = columnIdentifier.getPropertyName(); } // use HTML to show the tooltip in italic text = "<html><body><i>" + _("tutti.tooltip." + propertyName + ".none") + "</i></body></html>"; - + } else { // use html to display the tooltip on several lines text = "<html><body>" + String.valueOf(value).replace("\n", "<br/>") + "</body></html>"; } - + boolean editable = table.isCellEditable(row, column); component.setEnabled(editable); component.setToolTipText(text); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 23:13:54 UTC (rev 70) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 23:16:31 UTC (rev 71) @@ -28,8 +28,18 @@ import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.HBox; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.SwingConstants; import java.awt.Cursor; -import java.awt.Desktop; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -38,45 +48,34 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; import java.util.List; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFileChooser; -import javax.swing.JLabel; -import javax.swing.SwingConstants; -import jaxx.runtime.SwingUtil; -import jaxx.runtime.swing.HBox; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Handler of the LongTextEditorUI + * * @author kmorin * @since 0.2 */ public class AttachmentEditorUIHandler { - + private static final Log log = LogFactory.getLog(AttachmentEditorUIHandler.class); - + private final AttachmentEditorUI ui; - + private JFileChooser fileChooser = new JFileChooser(); public AttachmentEditorUIHandler(AttachmentEditorUI attachmentEditorUI) { ui = attachmentEditorUI; - + ui.addPropertyChangeListener(new PropertyChangeListener() { + @Override public void propertyChange(PropertyChangeEvent evt) { init(); } }); } - + public void init() { resetFields(); ui.getAttachments().removeAll(); @@ -91,14 +90,15 @@ } } } - + protected void addAttachment(final Attachment attachment) { final HBox hbox = new HBox(); hbox.setVerticalAlignment(SwingConstants.CENTER); - + JButton deleteButton = new JButton(SwingUtil.createActionIcon("delete")); deleteButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { AbstractTuttiBeanUIModel bean = ui.getBean(); String property = ui.getProperty(); @@ -107,17 +107,17 @@ list.remove(attachment); TuttiUIUtil.setProperty(bean, property, list); } - + ui.getAttachments().remove(hbox); - + JDialog parent = SwingUtil.getParentContainer(ui, JDialog.class); parent.pack(); } }); hbox.add(deleteButton); - + final JLabel label = new JLabel("<html><body><a href=''>" - + attachment.getName() + "</a></body></html>"); + + attachment.getName() + "</a></body></html>"); label.setToolTipText(attachment.getComment()); label.addMouseListener(new MouseAdapter() { @@ -135,23 +135,21 @@ public void mouseExited(MouseEvent e) { label.setCursor(Cursor.getDefaultCursor()); } - + }); hbox.add(label); - + ui.getAttachments().add(hbox); } - - /** - * closes the editor - */ + + /** closes the editor */ public void close() { if (log.isInfoEnabled()) { log.info("Will close UI " + ui); } SwingUtil.getParentContainer(ui, Window.class).dispose(); } - + public void chooseFile() { if (fileChooser.showOpenDialog(ui) == JFileChooser.APPROVE_OPTION) { File file = fileChooser.getSelectedFile(); @@ -159,7 +157,7 @@ ui.getFile().setText(file.getAbsolutePath()); } } - + public void addAttachment() { AbstractTuttiBeanUIModel bean = ui.getBean(); String property = ui.getProperty(); @@ -186,7 +184,7 @@ parent.pack(); } } - + protected void resetFields() { ui.setModel(new Attachment()); fileChooser.setSelectedFile(null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-14 23:13:54 UTC (rev 70) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-14 23:16:31 UTC (rev 71) @@ -24,50 +24,52 @@ * #L% */ -import fr.ifremer.tutti.ui.swing.util.ComponentResizer; import com.google.common.base.Preconditions; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.ComponentMover; +import fr.ifremer.tutti.ui.swing.util.ComponentResizer; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; -import java.awt.event.WindowAdapter; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.AbstractCellEditor; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JTable; +import javax.swing.border.LineBorder; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; import java.awt.Color; import java.awt.Component; import java.awt.Frame; -import java.awt.Insets; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.swing.AbstractCellEditor; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JTable; -import javax.swing.border.LineBorder; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; -import jaxx.runtime.JAXXUtil; -import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import static org.nuiton.i18n.I18n._; /** * Component to edit a cell in a popup with a text area - * + * * @author kmorin * @since 0.2 */ -public class LongTextCellComponent extends JButton{ - +public class LongTextCellComponent extends JButton { + /** Logger. */ private static final Log log = LogFactory.getLog(LongTextCellComponent.class); + private static final long serialVersionUID = 1L; + public LongTextCellComponent() { setContentAreaFilled(false); setOpaque(false); @@ -81,19 +83,22 @@ public static TableCellEditor newEditor(LongTextEditorUI ui) { return new LongTextCellEditor(ui); } - - + + public static class LongTextCellEditor extends AbstractCellEditor implements TableCellEditor { public static final int DEFAULT_EDITOR_WIDTH = 400; + public static final int DEFAULT_EDITOR_HEIGHT = 200; - + + private static final long serialVersionUID = 1L; + protected final LongTextCellComponent component; protected final LongTextEditorUI ui; protected Frame frame; - + protected JTable table; protected AbstractTuttiTableModel<AbstractTuttiBeanUIModel> tableModel; @@ -105,10 +110,10 @@ protected Integer rowIndex; protected Integer columnIndex; - + public LongTextCellEditor(LongTextEditorUI ui) { this.ui = ui; - + component = new LongTextCellComponent(); component.setBorder(new LineBorder(Color.BLACK)); component.addKeyListener(new KeyAdapter() { @@ -135,23 +140,23 @@ if (frame == null) { frame = SwingUtil.getParentContainer(ui, Frame.class); } - + ui.setBorder(BorderFactory.createTitledBorder(_(columnIdentifier.getHeaderI18nKey()))); ui.setBean(editRow); ui.setProperty(columnIdentifier.getPropertyName()); - + JDialog editor = new JDialog(frame, true); editor.setUndecorated(true); editor.add(ui); editor.setSize(DEFAULT_EDITOR_WIDTH, DEFAULT_EDITOR_HEIGHT); editor.setResizable(true); - + ComponentResizer cr = new ComponentResizer(); cr.registerComponent(editor); ComponentMover cm = new ComponentMover(); cm.setDragInsets(cr.getDragInsets()); cm.registerComponent(editor); - + editor.addWindowListener(new WindowAdapter() { @Override @@ -163,7 +168,7 @@ JAXXUtil.destroy(ui); } }); - + // Computes the location of bottom left corner of the cell Component comp = component; int x = 0; @@ -180,7 +185,7 @@ } editor.setLocation(x, y); editor.setVisible(true); - + int r = rowIndex; int c = columnIndex; @@ -190,7 +195,7 @@ // reselect this cell AbstractSelectTableAction.doSelectCell(table, r, c); } - + @Override public Component getTableCellEditorComponent(JTable table, Object value, @@ -198,7 +203,7 @@ int row, int column) { if (tableModel == null) { - tableModel = (AbstractTuttiTableModel<AbstractTuttiBeanUIModel>) table.getModel(); + tableModel = (AbstractTuttiTableModel<AbstractTuttiBeanUIModel>) table.getModel(); this.table = table; columnIdentifier = tableModel.getPropertyName(column); } @@ -244,11 +249,11 @@ editRow = null; } } - + public static class LongTextCellRenderer implements TableCellRenderer { protected final LongTextCellComponent component; - + protected String propertyName; public LongTextCellRenderer() { @@ -266,19 +271,19 @@ String text; if (value == null) { if (propertyName == null) { - AbstractTuttiTableModel tableModel = + AbstractTuttiTableModel tableModel = (AbstractTuttiTableModel) table.getModel(); ColumnIdentifier columnIdentifier = tableModel.getPropertyName(column); propertyName = columnIdentifier.getPropertyName(); } // use HTML to show the tooltip in italic text = "<html><body><i>" + _("tutti.tooltip." + propertyName + ".none") + "</i></body></html>"; - + } else { // use html to display the tooltip on several lines text = "<html><body>" + String.valueOf(value).replace("\n", "<br/>") + "</body></html>"; } - + boolean editable = table.isCellEditable(row, column); component.setEnabled(editable); component.setToolTipText(text); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 23:13:54 UTC (rev 70) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 23:16:31 UTC (rev 71) @@ -26,28 +26,30 @@ import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; -import java.awt.Window; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import jaxx.runtime.SwingUtil; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.awt.Window; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; + /** * Handler of the LongTextEditorUI + * * @author kmorin * @since 0.2 */ public class LongTextEditorUIHandler { - + private static final Log log = LogFactory.getLog(LongTextEditorUIHandler.class); - + private final LongTextEditorUI ui; public LongTextEditorUIHandler(LongTextEditorUI longTextEditorUI) { ui = longTextEditorUI; - + ui.addPropertyChangeListener(new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { @@ -63,28 +65,24 @@ } }); } - - /** - * pushes the typed text in the property of the bean - */ + + /** pushes the typed text in the property of the bean */ public void setText() { String value = ui.getTextContent().getText(); AbstractTuttiBeanUIModel bean = ui.getBean(); String property = ui.getProperty(); TuttiUIUtil.setProperty(bean, property, value); } - + public void resetText() { AbstractTuttiBeanUIModel bean = ui.getBean(); String property = ui.getProperty(); TuttiUIUtil.setProperty(bean, property, null); - + ui.getTextContent().setText(""); } - - /** - * closes the editor - */ + + /** closes the editor */ public void close() { if (log.isInfoEnabled()) { log.info("Will close UI " + ui);

1 0

r70 - in trunk: tutti-persistence-adagio tutti-persistence-adagio/src/license tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence tutti-persistence-adagio/src/main/resources tutti-persistence-adagio/src/main/resources/META-INF/services tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence tutti-persistence-adagio/src/test/resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor tutti
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-15 00:13:54 +0100 (Sat, 15 Dec 2012) New Revision: 70 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/70 Log: add svn properties and file headers Modified: trunk/tutti-persistence-adagio/LICENSE.txt trunk/tutti-persistence-adagio/README.txt trunk/tutti-persistence-adagio/changelog.txt trunk/tutti-persistence-adagio/pom.xml trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java trunk/tutti-persistence-adagio/src/test/resources/conf.properties trunk/tutti-persistence-adagio/src/test/resources/log4j.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentMover.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentResizer.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java trunk/tutti-ui-swing/src/main/resources/icons/action-delete.png Property changes on: trunk/tutti-persistence-adagio/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-persistence-adagio/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-persistence-adagio/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-persistence-adagio/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml 2012-12-14 23:13:54 UTC (rev 70) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" Property changes on: trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml 2012-12-14 23:13:54 UTC (rev 70) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" Property changes on: trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2012-12-14 23:13:54 UTC (rev 70) @@ -1,4 +1,28 @@ <?xml version="1.0"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping> Property changes on: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; Property changes on: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.Search; import fr.ifremer.adagio.core.dao.SearchParameter; import fr.ifremer.adagio.core.dao.referential.gear.Gear; Property changes on: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.administration.programStrategy.Program; import fr.ifremer.adagio.core.dao.administration.programStrategy.ProgramDao; import org.apache.commons.logging.Log; Property changes on: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence; +/* + * #%L + * Tutti :: Persistence Adagio (impl) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Query; Property changes on: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/test/resources/conf.properties =================================================================== --- trunk/tutti-persistence-adagio/src/test/resources/conf.properties 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/test/resources/conf.properties 2012-12-14 23:13:54 UTC (rev 70) @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: Persistence Adagio (impl) +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### #-------------------------------------------------------------------------- # # WARNING : For UNIT TEST ONLY Property changes on: trunk/tutti-persistence-adagio/src/test/resources/conf.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-persistence-adagio/src/test/resources/log4j.properties =================================================================== --- trunk/tutti-persistence-adagio/src/test/resources/log4j.properties 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-persistence-adagio/src/test/resources/log4j.properties 2012-12-14 23:13:54 UTC (rev 70) @@ -2,7 +2,7 @@ # #%L # Tutti :: Persistence Dev (impl) # $Id$ -# $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/tutti-persistence-dev/src/te… $ +# $HeadURL$ # %% # Copyright (C) 2012 Ifremer # %% Property changes on: trunk/tutti-persistence-adagio/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentMover.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentMover.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentMover.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,375 +1,380 @@ -package fr.ifremer.tutti.ui.swing.util; - -import java.awt.*; -import java.awt.event.*; -import javax.swing.JComponent; -import javax.swing.SwingUtilities; - -/** - * This class allows you to move a Component by using a mouse. The Component - * moved can be a high level Window (ie. Window, Frame, Dialog) in which case - * the Window is moved within the desktop. Or the Component can belong to a - * Container in which case the Component is moved within the Container. - * - * When moving a Window, the listener can be added to a child Component of - * the Window. In this case attempting to move the child will result in the - * Window moving. For example, you might create a custom "Title Bar" for an - * undecorated Window and moving of the Window is accomplished by moving the - * title bar only. Multiple components can be registered as "window movers". - * - * Components can be registered when the class is created. Additional - * components can be added at any time using the registerComponent() method. - */ -public class ComponentMover extends MouseAdapter -{ - private Insets dragInsets = new Insets(0, 0, 0, 0); - private Dimension snapSize = new Dimension(1, 1); - private Insets edgeInsets = new Insets(0, 0, 0, 0); - private boolean changeCursor = true; - private boolean autoLayout = false; - - private Class destinationClass; - private Component destinationComponent; - private Component destination; - private Component source; - - private Point pressed; - private Point location; - - private Cursor originalCursor; - private boolean autoscrolls; - private boolean potentialDrag; - - - /** - * Constructor for moving individual components. The components must be - * regisetered using the registerComponent() method. - */ - public ComponentMover() - { - } - - /** - * Constructor to specify a Class of Component that will be moved when - * drag events are generated on a registered child component. The events - * will be passed to the first ancestor of this specified class. - * - * @param destinationClass the Class of the ancestor component - * @param component the Components to be registered for forwarding - * drag events to the ancestor Component. - */ - public ComponentMover(Class destinationClass, Component... components) - { - this.destinationClass = destinationClass; - registerComponent( components ); - } - - /** - * Constructor to specify a parent component that will be moved when drag - * events are generated on a registered child component. - * - * @param destinationComponent the component drage events should be forwareded to - * @param components the Components to be registered for forwarding drag - * events to the parent component to be moved - */ - public ComponentMover(Component destinationComponent, Component... components) - { - this.destinationComponent = destinationComponent; - registerComponent( components ); - } - - /** - * Get the auto layout property - * - * @return the auto layout property - */ - public boolean isAutoLayout() - { - return autoLayout; - } - - /** - * Set the auto layout property - * - * @param autoLayout when true layout will be invoked on the parent container - */ - public void setAutoLayout(boolean autoLayout) - { - this.autoLayout = autoLayout; - } - - /** - * Get the change cursor property - * - * @return the change cursor property - */ - public boolean isChangeCursor() - { - return changeCursor; - } - - /** - * Set the change cursor property - * - * @param changeCursor when true the cursor will be changed to the - * Cursor.MOVE_CURSOR while the mouse is pressed - */ - public void setChangeCursor(boolean changeCursor) - { - this.changeCursor = changeCursor; - } - - /** - * Get the drag insets - * - * @return the drag insets - */ - public Insets getDragInsets() - { - return dragInsets; - } - - /** - * Set the drag insets. The insets specify an area where mouseDragged - * events should be ignored and therefore the component will not be moved. - * This will prevent these events from being confused with a - * MouseMotionListener that supports component resizing. - * - * @param dragInsets - */ - public void setDragInsets(Insets dragInsets) - { - this.dragInsets = dragInsets; - } - - /** - * Get the bounds insets - * - * @return the bounds insets - */ - public Insets getEdgeInsets() - { - return edgeInsets; - } - - /** - * Set the edge insets. The insets specify how close to each edge of the parent - * component that the child component can be moved. Positive values means the - * component must be contained within the parent. Negative values means the - * component can be moved outside the parent. - * - * @param edgeInsets - */ - public void setEdgeInsets(Insets edgeInsets) - { - this.edgeInsets = edgeInsets; - } - - /** - * Remove listeners from the specified component - * - * @param component the component the listeners are removed from - */ - public void deregisterComponent(Component... components) - { - for (Component component : components) - component.removeMouseListener( this ); - } - - /** - * Add the required listeners to the specified component - * - * @param component the component the listeners are added to - */ - public void registerComponent(Component... components) - { - for (Component component : components) - component.addMouseListener( this ); - } - - /** - * Get the snap size - * - * @return the snap size - */ - public Dimension getSnapSize() - { - return snapSize; - } - - /** - * Set the snap size. Forces the component to be snapped to - * the closest grid position. Snapping will occur when the mouse is - * dragged half way. - */ - public void setSnapSize(Dimension snapSize) - { - if (snapSize.width < 1 - || snapSize.height < 1) - throw new IllegalArgumentException("Snap sizes must be greater than 0"); - - this.snapSize = snapSize; - } - - /** - * Setup the variables used to control the moving of the component: - * - * source - the source component of the mouse event - * destination - the component that will ultimately be moved - * pressed - the Point where the mouse was pressed in the destination - * component coordinates. - */ - @Override - public void mousePressed(MouseEvent e) - { - source = e.getComponent(); - int width = source.getSize().width - dragInsets.left - dragInsets.right; - int height = source.getSize().height - dragInsets.top - dragInsets.bottom; - Rectangle r = new Rectangle(dragInsets.left, dragInsets.top, width, height); - - if (r.contains(e.getPoint())) - setupForDragging(e); - } - - private void setupForDragging(MouseEvent e) - { - source.addMouseMotionListener( this ); - potentialDrag = true; - - // Determine the component that will ultimately be moved - - if (destinationComponent != null) - { - destination = destinationComponent; - } - else if (destinationClass == null) - { - destination = source; - } - else // forward events to destination component - { - destination = SwingUtilities.getAncestorOfClass(destinationClass, source); - } - - pressed = e.getLocationOnScreen(); - location = destination.getLocation(); - - if (changeCursor) - { - originalCursor = source.getCursor(); - source.setCursor( Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR) ); - } - - // Making sure autoscrolls is false will allow for smoother dragging of - // individual components - - if (destination instanceof JComponent) - { - JComponent jc = (JComponent)destination; - autoscrolls = jc.getAutoscrolls(); - jc.setAutoscrolls( false ); - } - } - - /** - * Move the component to its new location. The dragged Point must be in - * the destination coordinates. - */ - @Override - public void mouseDragged(MouseEvent e) - { - Point dragged = e.getLocationOnScreen(); - int dragX = getDragDistance(dragged.x, pressed.x, snapSize.width); - int dragY = getDragDistance(dragged.y, pressed.y, snapSize.height); - - int locationX = location.x + dragX; - int locationY = location.y + dragY; - - // Mouse dragged events are not generated for every pixel the mouse - // is moved. Adjust the location to make sure we are still on a - // snap value. - - while (locationX < edgeInsets.left) - locationX += snapSize.width; - - while (locationY < edgeInsets.top) - locationY += snapSize.height; - - Dimension d = getBoundingSize( destination ); - - while (locationX + destination.getSize().width + edgeInsets.right > d.width) - locationX -= snapSize.width; - - while (locationY + destination.getSize().height + edgeInsets.bottom > d.height) - locationY -= snapSize.height; - - // Adjustments are finished, move the component - - destination.setLocation(locationX, locationY); - } - - /* - * Determine how far the mouse has moved from where dragging started - * (Assume drag direction is down and right for positive drag distance) - */ - private int getDragDistance(int larger, int smaller, int snapSize) - { - int halfway = snapSize / 2; - int drag = larger - smaller; - drag += (drag < 0) ? -halfway : halfway; - drag = (drag / snapSize) * snapSize; - - return drag; - } - - /* - * Get the bounds of the parent of the dragged component. - */ - private Dimension getBoundingSize(Component source) - { - if (source instanceof Window) - { - GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); - Rectangle bounds = env.getMaximumWindowBounds(); - return new Dimension(bounds.width, bounds.height); - } - else - { - return source.getParent().getSize(); - } - } - - /** - * Restore the original state of the Component - */ - @Override - public void mouseReleased(MouseEvent e) - { - if (!potentialDrag) return; - - source.removeMouseMotionListener( this ); - potentialDrag = false; - - if (changeCursor) - source.setCursor( originalCursor ); - - if (destination instanceof JComponent) - { - ((JComponent)destination).setAutoscrolls( autoscrolls ); - } - - // Layout the components on the parent container - - if (autoLayout) - { - if (destination instanceof JComponent) - { - ((JComponent)destination).revalidate(); - } - else - { - destination.validate(); - } - } - } -} +package fr.ifremer.tutti.ui.swing.util; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + + +import javax.swing.JComponent; +import javax.swing.SwingUtilities; +import java.awt.Component; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.GraphicsEnvironment; +import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Window; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +/** + * This class allows you to move a Component by using a mouse. The Component + * moved can be a high level Window (ie. Window, Frame, Dialog) in which case + * the Window is moved within the desktop. Or the Component can belong to a + * Container in which case the Component is moved within the Container. + * <p/> + * When moving a Window, the listener can be added to a child Component of + * the Window. In this case attempting to move the child will result in the + * Window moving. For example, you might create a custom "Title Bar" for an + * undecorated Window and moving of the Window is accomplished by moving the + * title bar only. Multiple components can be registered as "window movers". + * <p/> + * Components can be registered when the class is created. Additional + * components can be added at any time using the registerComponent() method. + */ +public class ComponentMover extends MouseAdapter { + private Insets dragInsets = new Insets(0, 0, 0, 0); + + private Dimension snapSize = new Dimension(1, 1); + + private Insets edgeInsets = new Insets(0, 0, 0, 0); + + private boolean changeCursor = true; + + private boolean autoLayout = false; + + private Class destinationClass; + + private Component destinationComponent; + + private Component destination; + + private Component source; + + private Point pressed; + + private Point location; + + private Cursor originalCursor; + + private boolean autoscrolls; + + private boolean potentialDrag; + + + /** + * Constructor for moving individual components. The components must be + * regisetered using the registerComponent() method. + */ + public ComponentMover() { + } + + /** + * Constructor to specify a Class of Component that will be moved when + * drag events are generated on a registered child component. The events + * will be passed to the first ancestor of this specified class. + * + * @param destinationClass the Class of the ancestor component + * @param components the Components to be registered for forwarding + * drag events to the ancestor Component. + */ + public ComponentMover(Class destinationClass, Component... components) { + this.destinationClass = destinationClass; + registerComponent(components); + } + + /** + * Constructor to specify a parent component that will be moved when drag + * events are generated on a registered child component. + * + * @param destinationComponent the component drage events should be forwareded to + * @param components the Components to be registered for forwarding drag + * events to the parent component to be moved + */ + public ComponentMover(Component destinationComponent, Component... components) { + this.destinationComponent = destinationComponent; + registerComponent(components); + } + + /** + * Get the auto layout property + * + * @return the auto layout property + */ + public boolean isAutoLayout() { + return autoLayout; + } + + /** + * Set the auto layout property + * + * @param autoLayout when true layout will be invoked on the parent container + */ + public void setAutoLayout(boolean autoLayout) { + this.autoLayout = autoLayout; + } + + /** + * Get the change cursor property + * + * @return the change cursor property + */ + public boolean isChangeCursor() { + return changeCursor; + } + + /** + * Set the change cursor property + * + * @param changeCursor when true the cursor will be changed to the + * Cursor.MOVE_CURSOR while the mouse is pressed + */ + public void setChangeCursor(boolean changeCursor) { + this.changeCursor = changeCursor; + } + + /** + * Get the drag insets + * + * @return the drag insets + */ + public Insets getDragInsets() { + return dragInsets; + } + + /** + * Set the drag insets. The insets specify an area where mouseDragged + * events should be ignored and therefore the component will not be moved. + * This will prevent these events from being confused with a + * MouseMotionListener that supports component resizing. + * + * @param dragInsets + */ + public void setDragInsets(Insets dragInsets) { + this.dragInsets = dragInsets; + } + + /** + * Get the bounds insets + * + * @return the bounds insets + */ + public Insets getEdgeInsets() { + return edgeInsets; + } + + /** + * Set the edge insets. The insets specify how close to each edge of the parent + * component that the child component can be moved. Positive values means the + * component must be contained within the parent. Negative values means the + * component can be moved outside the parent. + * + * @param edgeInsets + */ + public void setEdgeInsets(Insets edgeInsets) { + this.edgeInsets = edgeInsets; + } + + /** + * Remove listeners from the specified component + * + * @param components the component the listeners are removed from + */ + public void deregisterComponent(Component... components) { + for (Component component : components) + component.removeMouseListener(this); + } + + /** + * Add the required listeners to the specified component + * + * @param components the component the listeners are added to + */ + public void registerComponent(Component... components) { + for (Component component : components) + component.addMouseListener(this); + } + + /** + * Get the snap size + * + * @return the snap size + */ + public Dimension getSnapSize() { + return snapSize; + } + + /** + * Set the snap size. Forces the component to be snapped to + * the closest grid position. Snapping will occur when the mouse is + * dragged half way. + */ + public void setSnapSize(Dimension snapSize) { + if (snapSize.width < 1 + || snapSize.height < 1) + throw new IllegalArgumentException("Snap sizes must be greater than 0"); + + this.snapSize = snapSize; + } + + /** + * Setup the variables used to control the moving of the component: + * <p/> + * source - the source component of the mouse event + * destination - the component that will ultimately be moved + * pressed - the Point where the mouse was pressed in the destination + * component coordinates. + */ + @Override + public void mousePressed(MouseEvent e) { + source = e.getComponent(); + int width = source.getSize().width - dragInsets.left - dragInsets.right; + int height = source.getSize().height - dragInsets.top - dragInsets.bottom; + Rectangle r = new Rectangle(dragInsets.left, dragInsets.top, width, height); + + if (r.contains(e.getPoint())) + setupForDragging(e); + } + + private void setupForDragging(MouseEvent e) { + source.addMouseMotionListener(this); + potentialDrag = true; + + // Determine the component that will ultimately be moved + + if (destinationComponent != null) { + destination = destinationComponent; + } else if (destinationClass == null) { + destination = source; + } else // forward events to destination component + { + destination = SwingUtilities.getAncestorOfClass(destinationClass, source); + } + + pressed = e.getLocationOnScreen(); + location = destination.getLocation(); + + if (changeCursor) { + originalCursor = source.getCursor(); + source.setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); + } + + // Making sure autoscrolls is false will allow for smoother dragging of + // individual components + + if (destination instanceof JComponent) { + JComponent jc = (JComponent) destination; + autoscrolls = jc.getAutoscrolls(); + jc.setAutoscrolls(false); + } + } + + /** + * Move the component to its new location. The dragged Point must be in + * the destination coordinates. + */ + @Override + public void mouseDragged(MouseEvent e) { + Point dragged = e.getLocationOnScreen(); + int dragX = getDragDistance(dragged.x, pressed.x, snapSize.width); + int dragY = getDragDistance(dragged.y, pressed.y, snapSize.height); + + int locationX = location.x + dragX; + int locationY = location.y + dragY; + + // Mouse dragged events are not generated for every pixel the mouse + // is moved. Adjust the location to make sure we are still on a + // snap value. + + while (locationX < edgeInsets.left) + locationX += snapSize.width; + + while (locationY < edgeInsets.top) + locationY += snapSize.height; + + Dimension d = getBoundingSize(destination); + + while (locationX + destination.getSize().width + edgeInsets.right > d.width) + locationX -= snapSize.width; + + while (locationY + destination.getSize().height + edgeInsets.bottom > d.height) + locationY -= snapSize.height; + + // Adjustments are finished, move the component + + destination.setLocation(locationX, locationY); + } + + /* + * Determine how far the mouse has moved from where dragging started + * (Assume drag direction is down and right for positive drag distance) + */ + private int getDragDistance(int larger, int smaller, int snapSize) { + int halfway = snapSize / 2; + int drag = larger - smaller; + drag += (drag < 0) ? -halfway : halfway; + drag = (drag / snapSize) * snapSize; + + return drag; + } + + /* + * Get the bounds of the parent of the dragged component. + */ + private Dimension getBoundingSize(Component source) { + if (source instanceof Window) { + GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); + Rectangle bounds = env.getMaximumWindowBounds(); + return new Dimension(bounds.width, bounds.height); + } else { + return source.getParent().getSize(); + } + } + + /** Restore the original state of the Component */ + @Override + public void mouseReleased(MouseEvent e) { + if (!potentialDrag) return; + + source.removeMouseMotionListener(this); + potentialDrag = false; + + if (changeCursor) + source.setCursor(originalCursor); + + if (destination instanceof JComponent) { + ((JComponent) destination).setAutoscrolls(autoscrolls); + } + + // Layout the components on the parent container + + if (autoLayout) { + if (destination instanceof JComponent) { + ((JComponent) destination).revalidate(); + } else { + destination.validate(); + } + } + } +} \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentMover.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentResizer.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentResizer.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentResizer.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,458 +1,460 @@ -package fr.ifremer.tutti.ui.swing.util; - -import java.awt.*; -import java.awt.event.*; -import java.util.*; -import javax.swing.JComponent; -import javax.swing.SwingUtilities; - -/** - * The ComponentResizer allows you to resize a component by dragging a border - * of the component. - */ -public class ComponentResizer extends MouseAdapter -{ - private final static Dimension MINIMUM_SIZE = new Dimension(10, 10); - private final static Dimension MAXIMUM_SIZE = - new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); - - private static Map<Integer, Integer> cursors = new HashMap<Integer, Integer>(); - { - cursors.put(1, Cursor.N_RESIZE_CURSOR); - cursors.put(2, Cursor.W_RESIZE_CURSOR); - cursors.put(4, Cursor.S_RESIZE_CURSOR); - cursors.put(8, Cursor.E_RESIZE_CURSOR); - cursors.put(3, Cursor.NW_RESIZE_CURSOR); - cursors.put(9, Cursor.NE_RESIZE_CURSOR); - cursors.put(6, Cursor.SW_RESIZE_CURSOR); - cursors.put(12, Cursor.SE_RESIZE_CURSOR); - } - - private Insets dragInsets; - private Dimension snapSize; - - private int direction; - protected static final int NORTH = 1; - protected static final int WEST = 2; - protected static final int SOUTH = 4; - protected static final int EAST = 8; - - private Cursor sourceCursor; - private boolean resizing; - private Rectangle bounds; - private Point pressed; - private boolean autoscrolls; - - private Dimension minimumSize = MINIMUM_SIZE; - private Dimension maximumSize = MAXIMUM_SIZE; - - /** - * Convenience contructor. All borders are resizable in increments of - * a single pixel. Components must be registered separately. - */ - public ComponentResizer() - { - this(new Insets(5, 5, 5, 5), new Dimension(1, 1)); - } - - /** - * Convenience contructor. All borders are resizable in increments of - * a single pixel. Components can be registered when the class is created - * or they can be registered separately afterwards. - * - * @param components components to be automatically registered - */ - public ComponentResizer(Component... components) - { - this(new Insets(5, 5, 5, 5), new Dimension(1, 1), components); - } - - /** - * Convenience contructor. Eligible borders are resisable in increments of - * a single pixel. Components can be registered when the class is created - * or they can be registered separately afterwards. - * - * @param dragInsets Insets specifying which borders are eligible to be - * resized. - * @param components components to be automatically registered - */ - public ComponentResizer(Insets dragInsets, Component... components) - { - this(dragInsets, new Dimension(1, 1), components); - } - - /** - * Create a ComponentResizer. - * - * @param dragInsets Insets specifying which borders are eligible to be - * resized. - * @param snapSize Specify the dimension to which the border will snap to - * when being dragged. Snapping occurs at the halfway mark. - * @param components components to be automatically registered - */ - public ComponentResizer(Insets dragInsets, Dimension snapSize, Component... components) - { - setDragInsets( dragInsets ); - setSnapSize( snapSize ); - registerComponent( components ); - } - - /** - * Get the drag insets - * - * @return the drag insets - */ - public Insets getDragInsets() - { - return dragInsets; - } - - /** - * Set the drag dragInsets. The insets specify an area where mouseDragged - * events are recognized from the edge of the border inwards. A value of - * 0 for any size will imply that the border is not resizable. Otherwise - * the appropriate drag cursor will appear when the mouse is inside the - * resizable border area. - * - * @param dragInsets Insets to control which borders are resizeable. - */ - public void setDragInsets(Insets dragInsets) - { - validateMinimumAndInsets(minimumSize, dragInsets); - - this.dragInsets = dragInsets; - } - - /** - * Get the components maximum size. - * - * @return the maximum size - */ - public Dimension getMaximumSize() - { - return maximumSize; - } - - /** - * Specify the maximum size for the component. The component will still - * be constrained by the size of its parent. - * - * @param maximumSize the maximum size for a component. - */ - public void setMaximumSize(Dimension maximumSize) - { - this.maximumSize = maximumSize; - } - - /** - * Get the components minimum size. - * - * @return the minimum size - */ - public Dimension getMinimumSize() - { - return minimumSize; - } - - /** - * Specify the minimum size for the component. The minimum size is - * constrained by the drag insets. - * - * @param minimumSize the minimum size for a component. - */ - public void setMinimumSize(Dimension minimumSize) - { - validateMinimumAndInsets(minimumSize, dragInsets); - - this.minimumSize = minimumSize; - } - - /** - * Remove listeners from the specified component - * - * @param component the component the listeners are removed from - */ - public void deregisterComponent(Component... components) - { - for (Component component : components) - { - component.removeMouseListener( this ); - component.removeMouseMotionListener( this ); - } - } - - /** - * Add the required listeners to the specified component - * - * @param component the component the listeners are added to - */ - public void registerComponent(Component... components) - { - for (Component component : components) - { - component.addMouseListener( this ); - component.addMouseMotionListener( this ); - } - } - - /** - * Get the snap size. - * - * @return the snap size. - */ - public Dimension getSnapSize() - { - return snapSize; - } - - /** - * Control how many pixels a border must be dragged before the size of - * the component is changed. The border will snap to the size once - * dragging has passed the halfway mark. - * - * @param snapSize Dimension object allows you to separately spcify a - * horizontal and vertical snap size. - */ - public void setSnapSize(Dimension snapSize) - { - this.snapSize = snapSize; - } - - /** - * When the components minimum size is less than the drag insets then - * we can't determine which border should be resized so we need to - * prevent this from happening. - */ - private void validateMinimumAndInsets(Dimension minimum, Insets drag) - { - int minimumWidth = drag.left + drag.right; - int minimumHeight = drag.top + drag.bottom; - - if (minimum.width < minimumWidth - || minimum.height < minimumHeight) - { - String message = "Minimum size cannot be less than drag insets"; - throw new IllegalArgumentException( message ); - } - } - - /** - */ - @Override - public void mouseMoved(MouseEvent e) - { - Component source = e.getComponent(); - Point location = e.getPoint(); - direction = 0; - - if (location.x < dragInsets.left) - direction += WEST; - - if (location.x > source.getWidth() - dragInsets.right - 1) - direction += EAST; - - if (location.y < dragInsets.top) - direction += NORTH; - - if (location.y > source.getHeight() - dragInsets.bottom - 1) - direction += SOUTH; - - // Mouse is no longer over a resizable border - - if (direction == 0) - { - source.setCursor( sourceCursor ); - } - else // use the appropriate resizable cursor - { - int cursorType = cursors.get( direction ); - Cursor cursor = Cursor.getPredefinedCursor( cursorType ); - source.setCursor( cursor ); - } - } - - @Override - public void mouseEntered(MouseEvent e) - { - if (! resizing) - { - Component source = e.getComponent(); - sourceCursor = source.getCursor(); - } - } - - @Override - public void mouseExited(MouseEvent e) - { - if (! resizing) - { - Component source = e.getComponent(); - source.setCursor( sourceCursor ); - } - } - - @Override - public void mousePressed(MouseEvent e) - { - // The mouseMoved event continually updates this variable - - if (direction == 0) return; - - // Setup for resizing. All future dragging calculations are done based - // on the original bounds of the component and mouse pressed location. - - resizing = true; - - Component source = e.getComponent(); - pressed = e.getPoint(); - SwingUtilities.convertPointToScreen(pressed, source); - bounds = source.getBounds(); - - // Making sure autoscrolls is false will allow for smoother resizing - // of components - - if (source instanceof JComponent) - { - JComponent jc = (JComponent)source; - autoscrolls = jc.getAutoscrolls(); - jc.setAutoscrolls( false ); - } - } - - /** - * Restore the original state of the Component - */ - @Override - public void mouseReleased(MouseEvent e) - { - resizing = false; - - Component source = e.getComponent(); - source.setCursor( sourceCursor ); - - if (source instanceof JComponent) - { - ((JComponent)source).setAutoscrolls( autoscrolls ); - } - } - - /** - * Resize the component ensuring location and size is within the bounds - * of the parent container and that the size is within the minimum and - * maximum constraints. - * - * All calculations are done using the bounds of the component when the - * resizing started. - */ - @Override - public void mouseDragged(MouseEvent e) - { - if (resizing == false) return; - - Component source = e.getComponent(); - Point dragged = e.getPoint(); - SwingUtilities.convertPointToScreen(dragged, source); - - changeBounds(source, direction, bounds, pressed, dragged); - } - - protected void changeBounds(Component source, int direction, Rectangle bounds, Point pressed, Point current) - { - // Start with original locaton and size - - int x = bounds.x; - int y = bounds.y; - int width = bounds.width; - int height = bounds.height; - - // Resizing the West or North border affects the size and location - - if (WEST == (direction & WEST)) - { - int drag = getDragDistance(pressed.x, current.x, snapSize.width); - int maximum = Math.min(width + x, maximumSize.width); - drag = getDragBounded(drag, snapSize.width, width, minimumSize.width, maximum); - - x -= drag; - width += drag; - } - - if (NORTH == (direction & NORTH)) - { - int drag = getDragDistance(pressed.y, current.y, snapSize.height); - int maximum = Math.min(height + y, maximumSize.height); - drag = getDragBounded(drag, snapSize.height, height, minimumSize.height, maximum); - - y -= drag; - height += drag; - } - - // Resizing the East or South border only affects the size - - if (EAST == (direction & EAST)) - { - int drag = getDragDistance(current.x, pressed.x, snapSize.width); - Dimension boundingSize = getBoundingSize( source ); - int maximum = Math.min(boundingSize.width - x, maximumSize.width); - drag = getDragBounded(drag, snapSize.width, width, minimumSize.width, maximum); - width += drag; - } - - if (SOUTH == (direction & SOUTH)) - { - int drag = getDragDistance(current.y, pressed.y, snapSize.height); - Dimension boundingSize = getBoundingSize( source ); - int maximum = Math.min(boundingSize.height - y, maximumSize.height); - drag = getDragBounded(drag, snapSize.height, height, minimumSize.height, maximum); - height += drag; - } - - source.setBounds(x, y, width, height); - source.validate(); - } - - /* - * Determine how far the mouse has moved from where dragging started - */ - private int getDragDistance(int larger, int smaller, int snapSize) - { - int halfway = snapSize / 2; - int drag = larger - smaller; - drag += (drag < 0) ? -halfway : halfway; - drag = (drag / snapSize) * snapSize; - - return drag; - } - - /* - * Adjust the drag value to be within the minimum and maximum range. - */ - private int getDragBounded(int drag, int snapSize, int dimension, int minimum, int maximum) - { - while (dimension + drag < minimum) - drag += snapSize; - - while (dimension + drag > maximum) - drag -= snapSize; - - - return drag; - } - - /* - * Keep the size of the component within the bounds of its parent. - */ - private Dimension getBoundingSize(Component source) - { - if (source instanceof Window) - { - GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); - Rectangle bounds = env.getMaximumWindowBounds(); - return new Dimension(bounds.width, bounds.height); - } - else - { - return source.getParent().getSize(); - } - } -} +package fr.ifremer.tutti.ui.swing.util; + +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + + +import javax.swing.JComponent; +import javax.swing.SwingUtilities; +import java.awt.Component; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.GraphicsEnvironment; +import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Window; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.HashMap; +import java.util.Map; + +/** + * The ComponentResizer allows you to resize a component by dragging a border + * of the component. + */ +public class ComponentResizer extends MouseAdapter { + private final static Dimension MINIMUM_SIZE = new Dimension(10, 10); + + private final static Dimension MAXIMUM_SIZE = + new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE); + + private static Map<Integer, Integer> cursors = new HashMap<Integer, Integer>(); + + { + cursors.put(1, Cursor.N_RESIZE_CURSOR); + cursors.put(2, Cursor.W_RESIZE_CURSOR); + cursors.put(4, Cursor.S_RESIZE_CURSOR); + cursors.put(8, Cursor.E_RESIZE_CURSOR); + cursors.put(3, Cursor.NW_RESIZE_CURSOR); + cursors.put(9, Cursor.NE_RESIZE_CURSOR); + cursors.put(6, Cursor.SW_RESIZE_CURSOR); + cursors.put(12, Cursor.SE_RESIZE_CURSOR); + } + + private Insets dragInsets; + + private Dimension snapSize; + + private int direction; + + protected static final int NORTH = 1; + + protected static final int WEST = 2; + + protected static final int SOUTH = 4; + + protected static final int EAST = 8; + + private Cursor sourceCursor; + + private boolean resizing; + + private Rectangle bounds; + + private Point pressed; + + private boolean autoscrolls; + + private Dimension minimumSize = MINIMUM_SIZE; + + private Dimension maximumSize = MAXIMUM_SIZE; + + /** + * Convenience contructor. All borders are resizable in increments of + * a single pixel. Components must be registered separately. + */ + public ComponentResizer() { + this(new Insets(5, 5, 5, 5), new Dimension(1, 1)); + } + + /** + * Convenience contructor. All borders are resizable in increments of + * a single pixel. Components can be registered when the class is created + * or they can be registered separately afterwards. + * + * @param components components to be automatically registered + */ + public ComponentResizer(Component... components) { + this(new Insets(5, 5, 5, 5), new Dimension(1, 1), components); + } + + /** + * Convenience contructor. Eligible borders are resisable in increments of + * a single pixel. Components can be registered when the class is created + * or they can be registered separately afterwards. + * + * @param dragInsets Insets specifying which borders are eligible to be + * resized. + * @param components components to be automatically registered + */ + public ComponentResizer(Insets dragInsets, Component... components) { + this(dragInsets, new Dimension(1, 1), components); + } + + /** + * Create a ComponentResizer. + * + * @param dragInsets Insets specifying which borders are eligible to be + * resized. + * @param snapSize Specify the dimension to which the border will snap to + * when being dragged. Snapping occurs at the halfway mark. + * @param components components to be automatically registered + */ + public ComponentResizer(Insets dragInsets, Dimension snapSize, Component... components) { + setDragInsets(dragInsets); + setSnapSize(snapSize); + registerComponent(components); + } + + /** + * Get the drag insets + * + * @return the drag insets + */ + public Insets getDragInsets() { + return dragInsets; + } + + /** + * Set the drag dragInsets. The insets specify an area where mouseDragged + * events are recognized from the edge of the border inwards. A value of + * 0 for any size will imply that the border is not resizable. Otherwise + * the appropriate drag cursor will appear when the mouse is inside the + * resizable border area. + * + * @param dragInsets Insets to control which borders are resizeable. + */ + public void setDragInsets(Insets dragInsets) { + validateMinimumAndInsets(minimumSize, dragInsets); + + this.dragInsets = dragInsets; + } + + /** + * Get the components maximum size. + * + * @return the maximum size + */ + public Dimension getMaximumSize() { + return maximumSize; + } + + /** + * Specify the maximum size for the component. The component will still + * be constrained by the size of its parent. + * + * @param maximumSize the maximum size for a component. + */ + public void setMaximumSize(Dimension maximumSize) { + this.maximumSize = maximumSize; + } + + /** + * Get the components minimum size. + * + * @return the minimum size + */ + public Dimension getMinimumSize() { + return minimumSize; + } + + /** + * Specify the minimum size for the component. The minimum size is + * constrained by the drag insets. + * + * @param minimumSize the minimum size for a component. + */ + public void setMinimumSize(Dimension minimumSize) { + validateMinimumAndInsets(minimumSize, dragInsets); + + this.minimumSize = minimumSize; + } + + /** + * Remove listeners from the specified component + * + * @param components the component the listeners are removed from + */ + public void deregisterComponent(Component... components) { + for (Component component : components) { + component.removeMouseListener(this); + component.removeMouseMotionListener(this); + } + } + + /** + * Add the required listeners to the specified component + * + * @param components the component the listeners are added to + */ + public void registerComponent(Component... components) { + for (Component component : components) { + component.addMouseListener(this); + component.addMouseMotionListener(this); + } + } + + /** + * Get the snap size. + * + * @return the snap size. + */ + public Dimension getSnapSize() { + return snapSize; + } + + /** + * Control how many pixels a border must be dragged before the size of + * the component is changed. The border will snap to the size once + * dragging has passed the halfway mark. + * + * @param snapSize Dimension object allows you to separately spcify a + * horizontal and vertical snap size. + */ + public void setSnapSize(Dimension snapSize) { + this.snapSize = snapSize; + } + + /** + * When the components minimum size is less than the drag insets then + * we can't determine which border should be resized so we need to + * prevent this from happening. + */ + private void validateMinimumAndInsets(Dimension minimum, Insets drag) { + int minimumWidth = drag.left + drag.right; + int minimumHeight = drag.top + drag.bottom; + + if (minimum.width < minimumWidth + || minimum.height < minimumHeight) { + String message = "Minimum size cannot be less than drag insets"; + throw new IllegalArgumentException(message); + } + } + + /** + */ + @Override + public void mouseMoved(MouseEvent e) { + Component source = e.getComponent(); + Point location = e.getPoint(); + direction = 0; + + if (location.x < dragInsets.left) + direction += WEST; + + if (location.x > source.getWidth() - dragInsets.right - 1) + direction += EAST; + + if (location.y < dragInsets.top) + direction += NORTH; + + if (location.y > source.getHeight() - dragInsets.bottom - 1) + direction += SOUTH; + + // Mouse is no longer over a resizable border + + if (direction == 0) { + source.setCursor(sourceCursor); + } else // use the appropriate resizable cursor + { + int cursorType = cursors.get(direction); + Cursor cursor = Cursor.getPredefinedCursor(cursorType); + source.setCursor(cursor); + } + } + + @Override + public void mouseEntered(MouseEvent e) { + if (!resizing) { + Component source = e.getComponent(); + sourceCursor = source.getCursor(); + } + } + + @Override + public void mouseExited(MouseEvent e) { + if (!resizing) { + Component source = e.getComponent(); + source.setCursor(sourceCursor); + } + } + + @Override + public void mousePressed(MouseEvent e) { + // The mouseMoved event continually updates this variable + + if (direction == 0) return; + + // Setup for resizing. All future dragging calculations are done based + // on the original bounds of the component and mouse pressed location. + + resizing = true; + + Component source = e.getComponent(); + pressed = e.getPoint(); + SwingUtilities.convertPointToScreen(pressed, source); + bounds = source.getBounds(); + + // Making sure autoscrolls is false will allow for smoother resizing + // of components + + if (source instanceof JComponent) { + JComponent jc = (JComponent) source; + autoscrolls = jc.getAutoscrolls(); + jc.setAutoscrolls(false); + } + } + + /** Restore the original state of the Component */ + @Override + public void mouseReleased(MouseEvent e) { + resizing = false; + + Component source = e.getComponent(); + source.setCursor(sourceCursor); + + if (source instanceof JComponent) { + ((JComponent) source).setAutoscrolls(autoscrolls); + } + } + + /** + * Resize the component ensuring location and size is within the bounds + * of the parent container and that the size is within the minimum and + * maximum constraints. + * <p/> + * All calculations are done using the bounds of the component when the + * resizing started. + */ + @Override + public void mouseDragged(MouseEvent e) { + if (resizing == false) return; + + Component source = e.getComponent(); + Point dragged = e.getPoint(); + SwingUtilities.convertPointToScreen(dragged, source); + + changeBounds(source, direction, bounds, pressed, dragged); + } + + protected void changeBounds(Component source, int direction, Rectangle bounds, Point pressed, Point current) { + // Start with original locaton and size + + int x = bounds.x; + int y = bounds.y; + int width = bounds.width; + int height = bounds.height; + + // Resizing the West or North border affects the size and location + + if (WEST == (direction & WEST)) { + int drag = getDragDistance(pressed.x, current.x, snapSize.width); + int maximum = Math.min(width + x, maximumSize.width); + drag = getDragBounded(drag, snapSize.width, width, minimumSize.width, maximum); + + x -= drag; + width += drag; + } + + if (NORTH == (direction & NORTH)) { + int drag = getDragDistance(pressed.y, current.y, snapSize.height); + int maximum = Math.min(height + y, maximumSize.height); + drag = getDragBounded(drag, snapSize.height, height, minimumSize.height, maximum); + + y -= drag; + height += drag; + } + + // Resizing the East or South border only affects the size + + if (EAST == (direction & EAST)) { + int drag = getDragDistance(current.x, pressed.x, snapSize.width); + Dimension boundingSize = getBoundingSize(source); + int maximum = Math.min(boundingSize.width - x, maximumSize.width); + drag = getDragBounded(drag, snapSize.width, width, minimumSize.width, maximum); + width += drag; + } + + if (SOUTH == (direction & SOUTH)) { + int drag = getDragDistance(current.y, pressed.y, snapSize.height); + Dimension boundingSize = getBoundingSize(source); + int maximum = Math.min(boundingSize.height - y, maximumSize.height); + drag = getDragBounded(drag, snapSize.height, height, minimumSize.height, maximum); + height += drag; + } + + source.setBounds(x, y, width, height); + source.validate(); + } + + /* + * Determine how far the mouse has moved from where dragging started + */ + private int getDragDistance(int larger, int smaller, int snapSize) { + int halfway = snapSize / 2; + int drag = larger - smaller; + drag += (drag < 0) ? -halfway : halfway; + drag = (drag / snapSize) * snapSize; + + return drag; + } + + /* + * Adjust the drag value to be within the minimum and maximum range. + */ + private int getDragBounded(int drag, int snapSize, int dimension, int minimum, int maximum) { + while (dimension + drag < minimum) + drag += snapSize; + + while (dimension + drag > maximum) + drag -= snapSize; + + + return drag; + } + + /* + * Keep the size of the component within the bounds of its parent. + */ + private Dimension getBoundingSize(Component source) { + if (source instanceof Window) { + GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); + Rectangle bounds = env.getMaximumWindowBounds(); + return new Dimension(bounds.width, bounds.height); + } else { + return source.getParent().getSize(); + } + } +} \ No newline at end of file Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/ComponentResizer.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.editor; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.util.ComponentResizer; import com.google.common.base.Preconditions; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css 2012-12-14 23:13:54 UTC (rev 70) @@ -1,3 +1,26 @@ +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #fileLabel { text: "tutti.label.attachmentEditor.file"; labelFor: {file}; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.jaxx 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.jaxx 2012-12-14 23:13:54 UTC (rev 70) @@ -1,3 +1,26 @@ + <Table id='mainPanel'> <import> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.editor; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.editor; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.util.ComponentResizer; import com.google.common.base.Preconditions; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css 2012-12-14 23:13:54 UTC (rev 70) @@ -1,3 +1,26 @@ +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ #closeButton { actionIcon: "close"; text: "tutti.action.close"; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 23:11:08 UTC (rev 69) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 23:13:54 UTC (rev 70) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.editor; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import java.awt.Window; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-delete.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r69 - trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-15 00:11:08 +0100 (Sat, 15 Dec 2012) New Revision: 69 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/69 Log: ignore one test (dao load toomuch stuff and it does not work at the end for fishing vessels) Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java 2012-12-14 23:10:04 UTC (rev 68) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java 2012-12-14 23:11:08 UTC (rev 69) @@ -7,6 +7,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import java.util.List; @@ -40,6 +41,7 @@ Assert.assertNotNull(vessels); } + @Ignore @Test public void getFishingVessel() {

1 0

r68 - trunk/tutti-persistence-adagio/src/license
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-15 00:10:04 +0100 (Sat, 15 Dec 2012) New Revision: 68 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/68 Log: add third parties Modified: trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties Modified: trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties 2012-12-14 22:34:42 UTC (rev 67) +++ trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties 2012-12-14 23:10:04 UTC (rev 68) @@ -4,18 +4,26 @@ # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 +# - Eclipse Public License - v 1.0 # - General Public License (GPL) +# - HSQLDB License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Nov 22 17:23:30 CET 2012 +#Fri Dec 14 23:47:18 CET 2012 +antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +fr.ifremer.adagio--adagio-core--3.3.1-SNAPSHOT=TODO +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0

r67 - trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-14 23:34:42 +0100 (Fri, 14 Dec 2012) New Revision: 67 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/67 Log: fix test Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java Modified: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java 2012-12-14 21:18:01 UTC (rev 66) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java 2012-12-14 22:34:42 UTC (rev 67) @@ -1,7 +1,5 @@ package fr.ifremer.tutti.persistence; -import fr.ifremer.adagio.core.dao.Search; -import fr.ifremer.adagio.core.dao.SearchParameter; import fr.ifremer.adagio.core.dao.administration.programStrategy.Program; import fr.ifremer.adagio.core.dao.administration.programStrategy.ProgramDao; import org.apache.commons.logging.Log; @@ -12,7 +10,6 @@ import org.junit.Test; import javax.annotation.Resource; -import java.util.Collection; import java.util.List; @@ -37,10 +34,7 @@ } public void getProgram() { - Search search = new Search(); - SearchParameter parameter = new SearchParameter("label", "OTB"); - search.addSearchParameter(parameter); - String programCode = ""; + String programCode = "OTB"; Program actual = dao.load(programCode); Assert.assertNotNull(actual); Assert.assertEquals(programCode, actual.getCode());

1 0

r66 - trunk
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-14 22:18:01 +0100 (Fri, 14 Dec 2012) New Revision: 66 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/66 Log: fix pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-14 21:15:42 UTC (rev 65) +++ trunk/pom.xml 2012-12-14 21:18:01 UTC (rev 66) @@ -76,31 +76,6 @@ <packaging>pom</packaging> - <repositories> - <repository> - <id>tutti-repository</id> - <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>tutti-plugin-repository</id> - <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> <properties> <platform>forge.codelutin.com</platform>

1 0

Dec. 14, 2012

Author: tchemit Date: 2012-12-14 22:15:42 +0100 (Fri, 14 Dec 2012) New Revision: 65 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/65 Log: add adagio persistence module Added: trunk/tutti-persistence-adagio/ trunk/tutti-persistence-adagio/LICENSE.txt trunk/tutti-persistence-adagio/README.txt trunk/tutti-persistence-adagio/changelog.txt trunk/tutti-persistence-adagio/pom.xml trunk/tutti-persistence-adagio/src/ trunk/tutti-persistence-adagio/src/license/ trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties trunk/tutti-persistence-adagio/src/main/ trunk/tutti-persistence-adagio/src/main/java/ trunk/tutti-persistence-adagio/src/main/java/fr/ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java trunk/tutti-persistence-adagio/src/main/resources/ trunk/tutti-persistence-adagio/src/main/resources/META-INF/ trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/ trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml trunk/tutti-persistence-adagio/src/test/ trunk/tutti-persistence-adagio/src/test/java/ trunk/tutti-persistence-adagio/src/test/java/fr/ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java trunk/tutti-persistence-adagio/src/test/resources/ trunk/tutti-persistence-adagio/src/test/resources/conf.properties trunk/tutti-persistence-adagio/src/test/resources/log4j.properties Property changes on: trunk/tutti-persistence-adagio ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iml *.iws .idea Added: trunk/tutti-persistence-adagio/LICENSE.txt =================================================================== --- trunk/tutti-persistence-adagio/LICENSE.txt (rev 0) +++ trunk/tutti-persistence-adagio/LICENSE.txt 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Property changes on: trunk/tutti-persistence-adagio/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/tutti-persistence-adagio/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/tutti-persistence-adagio/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/pom.xml =================================================================== --- trunk/tutti-persistence-adagio/pom.xml (rev 0) +++ trunk/tutti-persistence-adagio/pom.xml 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,130 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>tutti</artifactId> + <version>0.2-SNAPSHOT</version> + </parent> + + <groupId>fr.ifremer.tutti</groupId> + <artifactId>tutti-persistence-adagio</artifactId> + + <name>Tutti :: Persistence Adagio (impl)</name> + + <dependencies> + +  + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tutti-persistence</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>fr.ifremer.adagio</groupId> + <artifactId>adagio-core</artifactId> + <classifier>allegro</classifier> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + +  + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + </dependency> +  + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + </dependency> + + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + +  + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </dependency> + + </dependencies> + +</project> Property changes on: trunk/tutti-persistence-adagio/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,21 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - General Public License (GPL) +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Nov 22 17:23:30 CET 2012 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Property changes on: trunk/tutti-persistence-adagio/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java =================================================================== --- trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java (rev 0) +++ trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,291 @@ +package fr.ifremer.tutti.persistence; + +import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; +import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; +import fr.ifremer.tutti.persistence.entities.data.Cruise; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch; +import fr.ifremer.tutti.persistence.entities.data.PlanktonBatch; +import fr.ifremer.tutti.persistence.entities.data.Program; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; +import fr.ifremer.tutti.persistence.entities.referential.BeaufortScale; +import fr.ifremer.tutti.persistence.entities.referential.Country; +import fr.ifremer.tutti.persistence.entities.referential.Gear; +import fr.ifremer.tutti.persistence.entities.referential.Person; +import fr.ifremer.tutti.persistence.entities.referential.SeaState; +import fr.ifremer.tutti.persistence.entities.referential.Sex; +import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.persistence.entities.referential.Strata; +import fr.ifremer.tutti.persistence.entities.referential.Vessel; +import fr.ifremer.tutti.persistence.entities.referential.WeightCategory; +import fr.ifremer.tutti.persistence.entities.referential.Zone; +import org.nuiton.util.ApplicationConfig; + +import java.io.IOException; +import java.util.List; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class TuttiPersistenceAdagioImpl implements TuttiPersistence { + + @Override + public String getImplementationName() { + return "Persistence Adagio implementation"; + } + + @Override + public void open(ApplicationConfig config) throws IOException { + } + + @Override + public void close() throws IOException { + } + + @Override + public List<WeightCategory> getAllWeightCategory() { + return null; + } + + @Override + public List<Sex> getAllSex() { + return null; + } + + @Override + public List<Species> getAllSpecies() { + return null; + } + + @Override + public List<SeaState> getAllSeaState() { + return null; + } + + @Override + public List<Strata> getAllStrata() { + return null; + } + + @Override + public List<BeaufortScale> getAllBeaufortScale() { + return null; + } + + @Override + public List<Zone> getAllZone() { + return null; + } + + @Override + public List<Country> getAllCountry() { + return null; + } + + @Override + public List<Vessel> getAllVessel() { + return null; + } + + @Override + public List<Gear> getAllGear() { + return null; + } + + @Override + public List<Person> getAllPerson() { + return null; + } + + @Override + public List<Program> getAllProgram() { + return null; + } + + @Override + public Program getProgram(String id) { + return null; + } + + @Override + public Program createProgram(Program bean) { + return null; + } + + @Override + public Program saveProgram(Program bean) { + return null; + } + + @Override + public List<Cruise> getAllCruise(String programId) { + return null; + } + + @Override + public Cruise getCruise(String id) { + return null; + } + + @Override + public Cruise createCruise(Cruise bean) { + return null; + } + + @Override + public Cruise saveCruise(Cruise bean) { + return null; + } + + @Override + public List<FishingOperation> getAllFishingOperation(String cruiseId) { + return null; + } + + @Override + public FishingOperation getFishingOperation(String id) { + return null; + } + + @Override + public FishingOperation createFishingOperation(FishingOperation bean) { + return null; + } + + @Override + public FishingOperation saveFishingOperation(FishingOperation bean) { + return null; + } + + @Override + public List<SpeciesBatch> getAllSpeciesBatch(String fishingOperationId) { + return null; + } + + @Override + public SpeciesBatch getSpeciesBatch(String id) { + return null; + } + + @Override + public SpeciesBatch createSpeciesBatch(SpeciesBatch bean) { + return null; + } + + @Override + public SpeciesBatch saveSpeciesBatch(SpeciesBatch bean) { + return null; + } + + @Override + public void deleteSpeciesBatch(String id) { + } + + @Override + public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) { + return null; + } + + @Override + public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies) { + return null; + } + + @Override + public List<BenthosBatch> getAllBenthosBatch(String fishingOperationId) { + return null; + } + + @Override + public BenthosBatch getBenthosBatch(String id) { + return null; + } + + @Override + public BenthosBatch createBenthosBatch(BenthosBatch bean) { + return null; + } + + @Override + public BenthosBatch saveBenthosBatch(BenthosBatch bean) { + return null; + } + + @Override + public void deleteBenthosBatch(String id) { + } + + @Override + public List<PlanktonBatch> getAllPlanktonBatch(String fishingOperationId) { + return null; + } + + @Override + public PlanktonBatch getPlanktonBatch(String id) { + return null; + } + + @Override + public PlanktonBatch createPlanktonBatch(PlanktonBatch bean) { + return null; + } + + @Override + public PlanktonBatch savePlanktonBatch(PlanktonBatch bean) { + return null; + } + + @Override + public void deletePlanktonBatch(String id) { + } + + @Override + public List<MacroWasteBatch> getAllMacroWasteBatch(String fishingOperationId) { + return null; + } + + @Override + public MacroWasteBatch getMacroWasteBatch(String id) { + return null; + } + + @Override + public MacroWasteBatch createMacroWasteBatch(MacroWasteBatch bean) { + return null; + } + + @Override + public MacroWasteBatch saveMacroWasteBatch(MacroWasteBatch bean) { + return null; + } + + @Override + public void deleteMacroWasteBatch(String id) { + } + + @Override + public List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId) { + return null; + } + + @Override + public AccidentalBatch getAccidentalBatch(String id) { + return null; + } + + @Override + public AccidentalBatch createAccidentalBatch(AccidentalBatch bean) { + return null; + } + + @Override + public AccidentalBatch saveAccidentalBatch(AccidentalBatch bean) { + return null; + } + + @Override + public void deleteAccidentalBatch(String id) { + } +} Property changes on: trunk/tutti-persistence-adagio/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceAdagioImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence (rev 0) +++ trunk/tutti-persistence-adagio/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.TuttiPersistence 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1 @@ +fr.ifremer.tutti.persistence.TuttiPersistenceAdagioImpl \ No newline at end of file Added: trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml (rev 0) +++ trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" + xmlns:context="http://www.springframework.org/schema/context" + xsi:schemaLocation=" + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd + http://www.springframework.org/schema/aop + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + + <context:component-scan base-package="fr.ifremer.adagio.core.service" /> +  + <context:annotation-config /> + +  +  + <tx:annotation-driven transaction-manager="transactionManager" /> + +  + <aop:aspectj-autoproxy /> + +</beans> \ No newline at end of file Property changes on: trunk/tutti-persistence-adagio/src/main/resources/applicationContext-service-tutti.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml (rev 0) +++ trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> + + <import resource="applicationContext-conf.xml"/> + + <bean id="beanRefFactory" + class="org.springframework.context.support.ClassPathXmlApplicationContext"> + <constructor-arg> + <list> + <value>applicationContext-conf.xml</value> + <value>applicationContext-dataSource-${dataSource.type}.xml</value> + <value>applicationContext-entities.xml</value> +  + <value>applicationContext-service-tutti.xml</value> + </list> + </constructor-arg> + </bean> + +</beans> \ No newline at end of file Property changes on: trunk/tutti-persistence-adagio/src/main/resources/beanRefFactory.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml (rev 0) +++ trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,40 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> +  + + <query cacheable="true" name="getAllScientificVessels"> + FROM VesselImpl WHERE vesselType.id=8 + + </query> + + <query cacheable="true" name="getAllFishingVessels"> + FROM VesselImpl WHERE vesselType.id=1 + </query> + + <query cacheable="true" name="getAllGears"> + FROM GearImpl + </query> + + <query cacheable="true" name="getPmfm"> + FROM GearImpl + </query> + + +</hibernate-mapping> Property changes on: trunk/tutti-persistence-adagio/src/main/resources/queries-override.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: trunk/tutti-persistence-adagio/src/test ___________________________________________________________________ Added: svn:ignore + db Added: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java (rev 0) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,44 @@ +package fr.ifremer.tutti.persistence; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.SessionFactory; +import org.junit.Assume; +import org.junit.BeforeClass; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.transaction.TransactionConfiguration; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.io.File; + +(a)RunWith(SpringJUnit4ClassRunner.class) +// Skip bean definition for services, in the Spring context for DAO unit testing +// This is need to increase test execution +@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml", + "classpath:applicationContext-dataSource-local.xml", + "classpath:applicationContext-entities.xml"}) +@TransactionConfiguration(transactionManager = "transactionManager") +@Transactional +public abstract class BaseDaoTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(BaseDaoTest.class); + + @Resource + protected SessionFactory sessionFactory; + + @BeforeClass + public static void beforeClass() { + File db = new File("src/test/db"); + if (!db.exists()) { + + if (log.isWarnEnabled()) { + log.warn("Could not find db at " + db + ", test is skipped."); + } + Assume.assumeTrue(false); + } + } +} Property changes on: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/BaseDaoTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java (rev 0) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,51 @@ +package fr.ifremer.tutti.persistence; + +import fr.ifremer.adagio.core.dao.Search; +import fr.ifremer.adagio.core.dao.SearchParameter; +import fr.ifremer.adagio.core.dao.referential.gear.Gear; +import fr.ifremer.adagio.core.dao.referential.gear.GearDao; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Query; +import org.hibernate.classic.Session; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; +import java.util.Set; + + +public class GearDaoTest extends BaseDaoTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(GearDaoTest.class); + + protected Session session; + + @Before + public void setUp() throws Exception { + + session = sessionFactory.openSession(); + } + + @After + public void tearDown() throws Exception { + if (session != null) { + session.close(); + } + } + + @Test + public void getAllGear() { + + Query query = session.getNamedQuery("getAllGears"); + + List gears = query.list(); + Assert.assertNotNull(gears); + } + +} Property changes on: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/GearDaoTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java (rev 0) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,49 @@ +package fr.ifremer.tutti.persistence; + +import fr.ifremer.adagio.core.dao.Search; +import fr.ifremer.adagio.core.dao.SearchParameter; +import fr.ifremer.adagio.core.dao.administration.programStrategy.Program; +import fr.ifremer.adagio.core.dao.administration.programStrategy.ProgramDao; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Query; +import org.hibernate.classic.Session; +import org.junit.Assert; +import org.junit.Test; + +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; + + +public class ProgramDaoTest extends BaseDaoTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ProgramDaoTest.class); + + @Resource(name = "programDao") + private ProgramDao dao; + + @Test + public void getAllProgramFromHibernate() { + Session sess = sessionFactory.openSession(); + Query query = sess.createQuery("from ProgramImpl"); + List actual = query.list(); + Assert.assertNotNull(actual); + + if (log.isInfoEnabled()) { + log.info("Nb program: " + actual.size()); + } + } + + public void getProgram() { + Search search = new Search(); + SearchParameter parameter = new SearchParameter("label", "OTB"); + search.addSearchParameter(parameter); + String programCode = ""; + Program actual = dao.load(programCode); + Assert.assertNotNull(actual); + Assert.assertEquals(programCode, actual.getCode()); + } + +} Property changes on: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/ProgramDaoTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java =================================================================== --- trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java (rev 0) +++ trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,51 @@ +package fr.ifremer.tutti.persistence; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.Query; +import org.hibernate.classic.Session; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.List; + +public class VesselDaoTest extends BaseDaoTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(VesselDaoTest.class); + + protected Session session; + + @Before + public void setUp() throws Exception { + + session = sessionFactory.openSession(); + } + + @After + public void tearDown() throws Exception { + if (session != null) { + session.close(); + } + } + + @Test + public void getScientificVessel() { + + Query query = session.getNamedQuery("getAllScientificVessels"); + + List vessels = query.list(); + Assert.assertNotNull(vessels); + } + + @Test + public void getFishingVessel() { + + Query query = session.getNamedQuery("getAllFishingVessels"); + + List vessels = query.list(); + Assert.assertNotNull(vessels); + } +} Property changes on: trunk/tutti-persistence-adagio/src/test/java/fr/ifremer/tutti/persistence/VesselDaoTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/test/resources/conf.properties =================================================================== --- trunk/tutti-persistence-adagio/src/test/resources/conf.properties (rev 0) +++ trunk/tutti-persistence-adagio/src/test/resources/conf.properties 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,40 @@ +#-------------------------------------------------------------------------- +# +# WARNING : For UNIT TEST ONLY +# -------------- +# Configuration file for agadio-persistence +# +# project : ${pom.name} +# version : ${pom.version} for ${pom.env} +# env : ${pom.env} - ${pom.profil} +# date : ${pom.date.fr} +# +# Copyright INRH/Ifremer 2012 +# +# 25/11/12 BL Creation +#-------------------------------------------------------------------------- + +# dataSource : jndi ou local +dataSource.type=local + +# Si 'dataSource.type=jndi' : +# - pour tomcat : jdbc/adagio-ds +# - pour jboss : java:jdbc/adagio-ds +#dataSource.jndi-name=jdbc/adagio-ds + +# Si 'dataSource.type=local' : +dataSource.jdbc.driver=org.hsqldb.jdbcDriver +dataSource.jdbc.username=sa +dataSource.jdbc.password= +dataSource.jdbc.url=jdbc:hsqldb:file:src/test/db/allegro +#dataSource.jdbc.url=jdbc:hsqldb:hsql://localhost/toto + +# Hibernate configuration : +hibernate.dialect=org.hibernate.dialect.HSQLDialect +#hibernate.show_sql=true +hibernate.format_sql=false +hibernate.use_sql_comments=true +hibernate.generate_statistics=false +hibernate.query.substitutions=true 1, false 0 +hibernate.hbm2ddl.auto=none + Property changes on: trunk/tutti-persistence-adagio/src/test/resources/conf.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/tutti-persistence-adagio/src/test/resources/log4j.properties =================================================================== --- trunk/tutti-persistence-adagio/src/test/resources/log4j.properties (rev 0) +++ trunk/tutti-persistence-adagio/src/test/resources/log4j.properties 2012-12-14 21:15:42 UTC (rev 65) @@ -0,0 +1,41 @@ +### +# #%L +# Tutti :: Persistence Dev (impl) +# $Id$ +# $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/tutti-persistence-dev/src/te… $ +# %% +# Copyright (C) 2012 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +# Global logging configuration + +log4j.rootCategory=DEBUG, A1 +log4j.logger.no.api=DEBUG +log4j.appender.A1=org.apache.log4j.ConsoleAppender +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d %-4r [%t] %-5p %c %x - %m%n + +log4j.logger.org.springframework=WARN +log4j.logger.org.apache.commons.beanutils=WARN + +log4j.logger.org.hibernate=WARN +#log4j.logger.org.hibernate.SQL=DEBUG + +log4j.logger.net.sf.ehcache=WARN + +log4j.logger.fr.ifremer.adagio.core=DEBUG +log4j.logger.fr.ifremer.tutti=DEBUG Property changes on: trunk/tutti-persistence-adagio/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r64 - in trunk: . tutti-ui-swing
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-14 22:11:12 +0100 (Fri, 14 Dec 2012) New Revision: 64 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/64 Log: add table filter support + adagio dependencies Modified: trunk/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-14 21:09:43 UTC (rev 63) +++ trunk/pom.xml 2012-12-14 21:11:12 UTC (rev 64) @@ -16,6 +16,7 @@ <modules> <module>tutti-persistence</module> <module>tutti-persistence-dev</module> + <module>tutti-persistence-adagio</module> <module>tutti-service</module> <module>tutti-ui-swing</module> </modules> @@ -75,6 +76,31 @@ <packaging>pom</packaging> + <repositories> + <repository> + <id>tutti-repository</id> + <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>tutti-plugin-repository</id> + <url>http://nexus.nuiton.org/nexus/content/groups/tutti-group/</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + </pluginRepositories> <properties> <platform>forge.codelutin.com</platform> @@ -95,6 +121,8 @@ <xworkVersion>2.3.7</xworkVersion> <slf4jVersion>1.7.2</slf4jVersion> + + <adagioVersion>3.3.1-SNAPSHOT</adagioVersion> <i18n.bundles>fr_FR</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -109,6 +137,13 @@ <license.organizationName>Ifremer</license.organizationName> <license.licenseName>gpl_v3</license.licenseName> + <aspectj.version>1.6.6</aspectj.version> + <spring.version>3.1.3.RELEASE</spring.version> + <slf4j.version>1.6.1</slf4j.version> + <ehcache.version>2.3.0</ehcache.version> + <javassist.version>3.12.1.GA</javassist.version> + <jdbc.hsqldb.version>1.8.0.7</jdbc.hsqldb.version> + </properties> <dependencyManagement> @@ -230,6 +265,13 @@ <version>${hibernateVersion}</version> </dependency> + <dependency> + <groupId>fr.ifremer.adagio</groupId> + <artifactId>adagio-core</artifactId> + <version>${adagioVersion}</version> + <classifier>allegro</classifier> + </dependency> +  <dependency> <groupId>com.h2database</groupId> @@ -257,6 +299,64 @@ <version>${slf4jVersion}</version> </dependency> + +  + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${spring.version}</version> + </dependency> +  + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${spring.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>${aspectj.version}</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>${aspectj.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + +  + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>runtime</scope> + <version>${jdbc.hsqldb.version}</version> + </dependency> + </dependencies> </dependencyManagement> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2012-12-14 21:09:43 UTC (rev 63) +++ trunk/tutti-ui-swing/pom.xml 2012-12-14 21:11:12 UTC (rev 64) @@ -279,6 +279,11 @@ <artifactId>swingx-autocomplete</artifactId> </dependency> + <dependency> + <groupId>com.ezware.oxbow</groupId> + <artifactId>swing-bits</artifactId> + </dependency> +  <dependency>

1 0

r63 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-14 22:09:43 +0100 (Fri, 14 Dec 2012) New Revision: 63 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/63 Log: add filter on table Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-14 21:09:04 UTC (rev 62) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-14 21:09:43 UTC (rev 63) @@ -62,6 +62,7 @@ import java.awt.event.FocusEvent; import java.util.List; import java.util.Set; +import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; /** * @author tchemit <chemit(a)codelutin.com> @@ -460,6 +461,8 @@ JXTable table = getTable(); + TableRowFilterSupport.forTable(table).searchable(true).useTableRenderers(true).apply(); + // create table column model TableColumnModel columnModel = createTableColumnModel();

1 0

r62 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by tchemit＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: tchemit Date: 2012-12-14 22:09:04 +0100 (Fri, 14 Dec 2012) New Revision: 62 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/62 Log: add title of saisisseurs Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.css 2012-12-14 16:59:59 UTC (rev 61) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.css 2012-12-14 21:09:04 UTC (rev 62) @@ -333,6 +333,7 @@ #saisisseurList { beanType: {Person.class}; property: "saisisseur"; + border: {BorderFactory.createTitledBorder(_("tutti.label.list.saisisseur"))}; } #commentPane {

1 0

r61 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/species java/fr/ifremer/tutti/ui/swing/util/editor resources/icons
by kmorin＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: kmorin Date: 2012-12-14 17:59:59 +0100 (Fri, 14 Dec 2012) New Revision: 61 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/61 Log: add attachment editor to the species table Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java trunk/tutti-ui-swing/src/main/resources/icons/action-delete.png Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchRowModel.java 2012-12-14 16:59:03 UTC (rev 60) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchRowModel.java 2012-12-14 16:59:59 UTC (rev 61) @@ -25,6 +25,7 @@ */ import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.VracHorsVracEnum; @@ -76,6 +77,8 @@ public static final String PROPERTY_COMPUTED_NUMBER = "computedNumber"; public static final String PROPERTY_COMPUTED_WEIGHT = "computedWeight"; + + public static final String PROPERTY_ATTACHMENTS = "attachments"; /** * Species observed. @@ -167,6 +170,13 @@ * @since 0.2 */ protected String comment; + + /** + * Attachments + * + * @since 0.2 + */ + protected List<Attachment> attachments; /** * List of frequencies observed for this batch. @@ -334,6 +344,16 @@ firePropertyChange(PROPERTY_COMMENT, oldValue, comment); } + public List<Attachment> getAttachments() { + return attachments; + } + + public void setAttachments(List<Attachment> attachments) { + Object oldValue = getAttachments(); + this.attachments = attachments; + firePropertyChange(PROPERTY_ATTACHMENTS, oldValue, attachments); + } + public List<SpeciesFrequencyRowModel> getFrequency() { return frequency; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTableModel.java 2012-12-14 16:59:03 UTC (rev 60) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchTableModel.java 2012-12-14 16:59:59 UTC (rev 61) @@ -111,8 +111,8 @@ n_("tutti.table.species.batch.header.comment"), n_("tutti.table.species.batch.header.comment")); - public static final ColumnIdentifier<SpeciesBatchRowModel> FILE = ColumnIdentifier.newId( - null, + public static final ColumnIdentifier<SpeciesBatchRowModel> ATTACHMENTS = ColumnIdentifier.newId( + SpeciesBatchRowModel.PROPERTY_ATTACHMENTS, n_("tutti.table.species.batch.header.file"), n_("tutti.table.species.batch.header.file")); @@ -124,8 +124,8 @@ setNoneEditableCols( SAMPLE_WEIGHT, - SAMPLING_RATIO, - FILE + SAMPLING_RATIO/*, + FILE*/ ); noneEditableColIfNoSpecies = Sets.newHashSet(); noneEditableColIfNoSpecies.add(COMPUTED_NUMBER); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-14 16:59:03 UTC (rev 60) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-14 16:59:59 UTC (rev 61) @@ -31,6 +31,7 @@ fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI fr.ifremer.tutti.ui.swing.content.operation.species.SpeciesFrequencyUI fr.ifremer.tutti.ui.swing.util.editor.LongTextEditorUI + fr.ifremer.tutti.ui.swing.util.editor.AttachmentEditorUI org.jdesktop.swingx.JXTable @@ -79,6 +80,8 @@ <SpeciesFrequencyUI id='frequencyUI' constructorParams='handler.getContext()'/> <LongTextEditorUI id='longTextEditorUI'/> + + <AttachmentEditorUI id='attachmentEditorUI'/> <Table id='form' fill='both' constraints='BorderLayout.NORTH'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-14 16:59:03 UTC (rev 60) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-14 16:59:59 UTC (rev 61) @@ -41,6 +41,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import fr.ifremer.tutti.ui.swing.util.table.TableRowModificationListener; @@ -117,6 +118,7 @@ SpeciesBatchRowModel.PROPERTY_AGE, SpeciesBatchRowModel.PROPERTY_WEIGHT, SpeciesBatchRowModel.PROPERTY_COMMENT, + SpeciesBatchRowModel.PROPERTY_ATTACHMENTS, SpeciesBatchRowModel.PROPERTY_FREQUENCY); this.ui = ui; this.persistenceService = context.getService(PersistenceService.class); @@ -308,7 +310,9 @@ { // File column addColumnToModel(columnModel, - SpeciesBatchTableModel.FILE); + AttachmentCellComponent.newEditor(ui.getAttachmentEditorUI()), + AttachmentCellComponent.newRender(), + SpeciesBatchTableModel.ATTACHMENTS); } return columnModel; } Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java (from rev 57, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentCellComponent.java 2012-12-14 16:59:59 UTC (rev 61) @@ -0,0 +1,260 @@ +package fr.ifremer.tutti.ui.swing.util.editor; + +import fr.ifremer.tutti.ui.swing.util.ComponentResizer; +import com.google.common.base.Preconditions; +import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; +import fr.ifremer.tutti.ui.swing.util.ComponentMover; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; +import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; +import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import java.awt.event.WindowAdapter; +import java.awt.Color; +import java.awt.Component; +import java.awt.Frame; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowEvent; +import javax.swing.AbstractCellEditor; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JTable; +import javax.swing.border.LineBorder; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import jaxx.runtime.JAXXUtil; +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import static org.nuiton.i18n.I18n._; + +/** + * Component to edit a cell containing attachments + * + * @author kmorin + * @since 0.2 + */ +public class AttachmentCellComponent extends JButton { + + /** Logger. */ + private static final Log log = LogFactory.getLog(AttachmentCellComponent.class); + + public AttachmentCellComponent() { + setContentAreaFilled(false); + setOpaque(false); + setIcon(SwingUtil.createActionIcon("edit")); + } + + public static TableCellRenderer newRender() { + return new AttachmentCellRenderer(); + } + + public static TableCellEditor newEditor(AttachmentEditorUI ui) { + return new AttachmentCellEditor(ui); + } + + + public static class AttachmentCellEditor extends AbstractCellEditor implements TableCellEditor { + + protected final AttachmentCellComponent component; + + protected final AttachmentEditorUI ui; + + protected Frame frame; + + protected JTable table; + + protected AbstractTuttiTableModel<AbstractTuttiBeanUIModel> tableModel; + + protected ColumnIdentifier<AbstractTuttiBeanUIModel> columnIdentifier; + + protected AbstractTuttiBeanUIModel editRow; + + protected Integer rowIndex; + + protected Integer columnIndex; + + public AttachmentCellEditor(AttachmentEditorUI ui) { + this.ui = ui; + + component = new AttachmentCellComponent(); + component.setBorder(new LineBorder(Color.BLACK)); + component.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + if (e.getKeyCode() == KeyEvent.VK_ENTER || + e.getKeyCode() == KeyEvent.VK_SPACE) { + e.consume(); + startEdit(); + } + } + }); + + component.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + e.consume(); + startEdit(); + } + }); + } + + protected void startEdit() { + if (frame == null) { + frame = SwingUtil.getParentContainer(ui, Frame.class); + } + + ui.setBorder(BorderFactory.createTitledBorder(_(columnIdentifier.getHeaderI18nKey()))); + ui.setBean(editRow); + ui.setProperty(columnIdentifier.getPropertyName()); + + JDialog editor = new JDialog(frame, true); + editor.setUndecorated(true); + editor.add(ui); + editor.setResizable(true); + editor.pack(); + + ComponentResizer cr = new ComponentResizer(); + cr.registerComponent(editor); + ComponentMover cm = new ComponentMover(); + cm.setDragInsets(cr.getDragInsets()); + cm.registerComponent(editor); + + editor.addWindowListener(new WindowAdapter() { + + @Override + public void windowClosed(WindowEvent e) { + Component ui = (Component) e.getSource(); + if (log.isInfoEnabled()) { + log.info("Destroy ui " + ui); + } + JAXXUtil.destroy(ui); + } + }); + + // Computes the location of bottom left corner of the cell + Component comp = component; + int x = 0; + int y = component.getHeight(); + while (comp != null) { + x += comp.getX(); + y += comp.getY(); + comp = comp.getParent(); + } + // if the editor is too big on the right, + // then align its right side to the right side of the cell + if (x + editor.getWidth() > frame.getX() + frame.getWidth()) { + x = x - editor.getWidth() + component.getWidth(); + } + editor.setLocation(x, y); + editor.setVisible(true); + + int r = rowIndex; + int c = columnIndex; + + // stop edition + stopCellEditing(); + + // reselect this cell + AbstractSelectTableAction.doSelectCell(table, r, c); + } + + @Override + public Component getTableCellEditorComponent(JTable table, + Object value, + boolean isSelected, + int row, + int column) { + if (tableModel == null) { + tableModel = (AbstractTuttiTableModel<AbstractTuttiBeanUIModel>) table.getModel(); + this.table = table; + columnIdentifier = tableModel.getPropertyName(column); + } + + rowIndex = row; + columnIndex = column; + + editRow = tableModel.getEntry(row); + + return component; + } + + @Override + public Object getCellEditorValue() { + + Preconditions.checkNotNull(editRow, "No editRow found in editor."); + + String propertyName = columnIdentifier.getPropertyName(); + Object result = TuttiUIUtil.getProperty(editRow, propertyName); + if (log.isInfoEnabled()) { + log.info("editor value (" + propertyName + "): " + result); + } + + return result; + } + + @Override + public boolean stopCellEditing() { + boolean b = super.stopCellEditing(); + if (b) { + rowIndex = null; + editRow = null; + columnIndex = null; + } + return b; + } + + @Override + public void cancelCellEditing() { + super.cancelCellEditing(); + rowIndex = null; + columnIndex = null; + editRow = null; + } + } + + public static class AttachmentCellRenderer implements TableCellRenderer { + + protected final AttachmentCellComponent component; + + protected String propertyName; + + public AttachmentCellRenderer() { + component = new AttachmentCellComponent(); + } + + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { + + String text; + if (value == null) { + if (propertyName == null) { + AbstractTuttiTableModel tableModel = + (AbstractTuttiTableModel) table.getModel(); + ColumnIdentifier columnIdentifier = tableModel.getPropertyName(column); + propertyName = columnIdentifier.getPropertyName(); + } + // use HTML to show the tooltip in italic + text = "<html><body><i>" + _("tutti.tooltip." + propertyName + ".none") + "</i></body></html>"; + + } else { + // use html to display the tooltip on several lines + text = "<html><body>" + String.valueOf(value).replace("\n", "<br/>") + "</body></html>"; + } + + boolean editable = table.isCellEditable(row, column); + component.setEnabled(editable); + component.setToolTipText(text); + return component; + } + } +} Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css (from rev 57, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.css) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.css 2012-12-14 16:59:59 UTC (rev 61) @@ -0,0 +1,23 @@ +#fileLabel { + text: "tutti.label.attachmentEditor.file"; + labelFor: {file}; +} + +#fileNameLabel { + text: "tutti.label.attachmentEditor.fileName"; + labelFor: {fileName}; +} + +#fileCommentLabel { + text: "tutti.label.attachmentEditor.fileComment"; + labelFor: {fileComment}; +} + +#addButton { + actionIcon: "add"; +} + +#closeButton { + actionIcon: "close"; + text: "tutti.action.close"; +} Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.jaxx (from rev 57, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUI.jaxx) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.jaxx (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUI.jaxx 2012-12-14 16:59:59 UTC (rev 61) @@ -0,0 +1,64 @@ +<Table id='mainPanel'> + + <import> + fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel + fr.ifremer.tutti.persistence.entities.data.Attachment + </import> + +  + <String id='property' javaBean='""'/> + +  + <Boolean id='editable' javaBean='true'/> + +  + <AbstractTuttiBeanUIModel id='bean' javaBean='null'/> + + <AttachmentEditorUIHandler id='handler' constructorParams='this'/> + + <Attachment id='model' javaBean='null'/> + + <row fill='both'> + <cell fill='both' weightx='1' columns='3'> + <VBox id='attachments'></VBox> + </cell> + </row> + <row fill='both'> + <cell fill='both' weightx='1'> + <JLabel id='fileLabel'/> + </cell> + <cell fill='both' weightx='1'> + <JTextField id='file' + onMouseClicked='handler.chooseFile()'/> + </cell> + <cell fill='both' rows='3'> + <JButton id='addButton' + onActionPerformed='handler.addAttachment()'/> + </cell> + </row> + <row fill='both'> + <cell fill='both' weightx='1'> + <JLabel id='fileNameLabel'/> + </cell> + <cell fill='both' weightx='1'> + <JTextField id='fileName'/> + </cell> + </row> + <row fill='both' weighty='1'> + <cell fill='both' weightx='1'> + <JLabel id='fileCommentLabel'/> + </cell> + <cell fill='both' weightx='1'> + <JScrollPane> + <JTextArea id='fileComment' rows='3'/> + </JScrollPane> + </cell> + </row> + <row fill='both'> +  + <cell fill='both' weightx='1' columns='3'> + <JButton id='closeButton' onActionPerformed='handler.close()'/> + </cell> + </row> +</Table> \ No newline at end of file Copied: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java (from rev 57, trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java) =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java (rev 0) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/AttachmentEditorUIHandler.java 2012-12-14 16:59:59 UTC (rev 61) @@ -0,0 +1,174 @@ +package fr.ifremer.tutti.ui.swing.util.editor; + +import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.data.Attachment; +import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import java.awt.Cursor; +import java.awt.Desktop; +import java.awt.Window; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.SwingConstants; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.HBox; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Handler of the LongTextEditorUI + * @author kmorin + * @since 0.2 + */ +public class AttachmentEditorUIHandler { + + private static final Log log = LogFactory.getLog(AttachmentEditorUIHandler.class); + + private final AttachmentEditorUI ui; + + private JFileChooser fileChooser = new JFileChooser(); + + public AttachmentEditorUIHandler(AttachmentEditorUI attachmentEditorUI) { + ui = attachmentEditorUI; + + ui.addPropertyChangeListener(new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + init(); + } + }); + } + + public void init() { + resetFields(); + ui.getAttachments().removeAll(); + AbstractTuttiBeanUIModel bean = ui.getBean(); + String property = ui.getProperty(); + if (bean != null && !StringUtils.isEmpty(property)) { + List<Attachment> list = (List<Attachment>) TuttiUIUtil.getProperty(bean, property); + if (list != null) { + for (Attachment attachment : list) { + addAttachment(attachment); + } + } + } + } + + protected void addAttachment(final Attachment attachment) { + final HBox hbox = new HBox(); + hbox.setVerticalAlignment(SwingConstants.CENTER); + + JButton deleteButton = new JButton(SwingUtil.createActionIcon("delete")); + deleteButton.addActionListener(new ActionListener() { + + public void actionPerformed(ActionEvent e) { + AbstractTuttiBeanUIModel bean = ui.getBean(); + String property = ui.getProperty(); + List<Attachment> list = (List<Attachment>) TuttiUIUtil.getProperty(bean, property); + if (list != null) { + list.remove(attachment); + TuttiUIUtil.setProperty(bean, property, list); + } + + ui.getAttachments().remove(hbox); + + JDialog parent = SwingUtil.getParentContainer(ui, JDialog.class); + parent.pack(); + } + }); + hbox.add(deleteButton); + + final JLabel label = new JLabel("<html><body><a href=''>" + + attachment.getName() + "</a></body></html>"); + label.setToolTipText(attachment.getComment()); + label.addMouseListener(new MouseAdapter() { + + @Override + public void mouseClicked(MouseEvent e) { + SwingUtil.openLink("file://" + attachment.getFile().getAbsolutePath()); + } + + @Override + public void mouseEntered(MouseEvent e) { + label.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + } + + @Override + public void mouseExited(MouseEvent e) { + label.setCursor(Cursor.getDefaultCursor()); + } + + }); + hbox.add(label); + + ui.getAttachments().add(hbox); + } + + /** + * closes the editor + */ + public void close() { + if (log.isInfoEnabled()) { + log.info("Will close UI " + ui); + } + SwingUtil.getParentContainer(ui, Window.class).dispose(); + } + + public void chooseFile() { + if (fileChooser.showOpenDialog(ui) == JFileChooser.APPROVE_OPTION) { + File file = fileChooser.getSelectedFile(); + ui.getModel().setFile(file); + ui.getFile().setText(file.getAbsolutePath()); + } + } + + public void addAttachment() { + AbstractTuttiBeanUIModel bean = ui.getBean(); + String property = ui.getProperty(); + List<Attachment> list = (List<Attachment>) TuttiUIUtil.getProperty(bean, property); + if (list == null) { + list = Lists.newArrayList(); + } + Attachment attachment = ui.getModel(); + File file = attachment.getFile(); + if (file != null) { + String name = ui.getFileName().getText(); + if (StringUtils.isEmpty(name)) { + name = file.getName(); + } + attachment.setName(name); + attachment.setComment(ui.getFileComment().getText()); + list.add(attachment); + TuttiUIUtil.setProperty(bean, property, list); + + resetFields(); + addAttachment(attachment); + + JDialog parent = SwingUtil.getParentContainer(ui, JDialog.class); + parent.pack(); + } + } + + protected void resetFields() { + ui.setModel(new Attachment()); + fileChooser.setSelectedFile(null); + ui.getFile().setText(""); + ui.getFileName().setText(""); + ui.getFileComment().setText(""); + } + +} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-14 16:59:03 UTC (rev 60) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextCellComponent.java 2012-12-14 16:59:59 UTC (rev 61) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package fr.ifremer.tutti.ui.swing.util.editor; import fr.ifremer.tutti.ui.swing.util.ComponentResizer; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 16:59:03 UTC (rev 60) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/LongTextEditorUIHandler.java 2012-12-14 16:59:59 UTC (rev 61) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package fr.ifremer.tutti.ui.swing.util.editor; import fr.ifremer.tutti.ui.swing.AbstractTuttiBeanUIModel; Added: trunk/tutti-ui-swing/src/main/resources/icons/action-delete.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-delete.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r60 - trunk/tutti-persistence/src/main/xmi
by kmorin＠users.forge.codelutin.com Dec. 14, 2012

Dec. 14, 2012

Author: kmorin Date: 2012-12-14 17:59:03 +0100 (Fri, 14 Dec 2012) New Revision: 60 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/60 Log: add attachment class Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ)

1 0