Author: kmorin Date: 2013-05-30 17:41:32 +0200 (Thu, 30 May 2013) New Revision: 1053 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1053 Log: fixes #2470 [CAPTURE] modification des caract?\195?\169ristiques du trait non pris en compte dans les identifiants affich?\195?\169s Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 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/catches/AbstractImportMultiPostAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java Modified: trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties =================================================================== --- trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-service/src/test/resources/tutti-test-read-dbCGFS.properties 2013-05-30 15:41:32 UTC (rev 1053) @@ -21,7 +21,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -tutti.persistence.db.directory=src/test/dbCGFS -tutti.persistence.jdbc.url=jdbc:hsqldb:file:src/test/dbCGFS/allegro +tutti.persistence.db.directory=/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS +tutti.persistence.jdbc.url=jdbc:hsqldb:file:/home/kmorin/Projects/tutti/tutti-service/src/test/dbCGFS/allegro #tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro #tutti.persistence.jdbc.createScript=src/test/dbEmpty/allegro.script \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-30 15:41:32 UTC (rev 1053) @@ -36,6 +36,8 @@ #log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO +log4j.logger.jaxx.runtime.editor=DEBUG + log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.file=${tutti.log.file} log4j.appender.file.MaxFileSize=10MB Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -331,12 +331,10 @@ // now fishing operation is edited model.setEditFishingOperation(fishingOperation); - String fishingOperationText = getFishingOperationTitle(fishingOperation); + loadFishingOperation(fishingOperation); - loadFishingOperation(fishingOperation, fishingOperationText); + loadCatchBatch(fishingOperation, true); - loadCatchBatch(fishingOperation, fishingOperationText, true); - JTabbedPane form = ui.getTabPane(); JLabel noContentPane = ui.getNoTraitPane(); @@ -373,8 +371,7 @@ getUI().repaint(); } - public void loadFishingOperation(FishingOperation bean, - String fishingOperationText) { + public void loadFishingOperation(FishingOperation bean) { EditFishingOperationUI ui = getUI().getFishingOperationTabContent(); @@ -465,34 +462,26 @@ editFishingOperationUIModel.setLoadingData(false); - ui.getTraitGeneralTabPane().setTitle(fishingOperationText); - ui.getVesselUseFeatureTabPane().setTitle(fishingOperationText); - ui.getGearUseFeatureTabPane().setTitle(fishingOperationText); - handler.installStartDateListener(); handler.installCoordinatesListener(); } - public String getFishingOperationTitle(FishingOperation bean) { - Decorator<FishingOperation> decorator = - getDecorator(FishingOperation.class, null); +// public String getFishingOperationTitle(FishingOperation bean) { +// String fishingOperationText; +// +// if (bean == null) { +// fishingOperationText = null; +// } else if (TuttiEntities.isNew(bean)) { +// fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", +// _("tutti.editFishingOperation.label.traitReminder.inCreation")); +// } else { +// fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", +// decorate(bean)); +// } +// return fishingOperationText; +// } - String fishingOperationText; - - if (bean == null) { - fishingOperationText = null; - } else if (TuttiEntities.isNew(bean)) { - fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", - _("tutti.editFishingOperation.label.traitReminder.inCreation")); - } else { - fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", - decorator.toString(bean)); - } - return fishingOperationText; - } - public void loadCatchBatch(FishingOperation bean, - String fishingOperationText, boolean loadOtherTabs) { boolean empty = bean == null || TuttiEntities.isNew(bean); @@ -580,14 +569,6 @@ catchesUIModel.setModify(false); catchBatchMonitor.clearModified(); - // 3) Propagate title to others tabs - ui.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); - ui.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ui.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); - if (loadOtherTabs) { // 4) Propagate new selected fishingoperation to others tabs 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 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -25,11 +25,13 @@ */ import com.google.common.collect.Lists; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.CloseableUI; @@ -140,12 +142,11 @@ log.debug("propertyChange " + FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION); } + // selected fishing operation is now the editing one + FishingOperation newValue = (FishingOperation) evt.getNewValue(); + if (!getModel().isEditionAdjusting()) { - // selected fishing operation is now the editing one - - FishingOperation newValue = (FishingOperation) evt.getNewValue(); - FishingOperation operation; if (newValue == null) { operation = null; @@ -165,6 +166,23 @@ TuttiActionHelper.runInternalAction(editFishingOperationAction); } } + + // done here instead of in the action in order to update the headers + // when the operation is saved + String fishingOperationText = getFishingOperationTitle(newValue); + + EditFishingOperationUI efoUI = getUI().getFishingOperationTabContent(); + efoUI.getTraitGeneralTabPane().setTitle(fishingOperationText); + efoUI.getVesselUseFeatureTabPane().setTitle(fishingOperationText); + efoUI.getGearUseFeatureTabPane().setTitle(fishingOperationText); + + EditCatchesUI ecUI = getUI().getCatchesTabContent(); + ecUI.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); + ecUI.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); } }); @@ -286,4 +304,19 @@ return getModel().getEditFishingOperation() != null && getUI().getCatchesTabContent().getModel().isValid(); } + + public String getFishingOperationTitle(FishingOperation bean) { + String fishingOperationText; + + if (bean == null) { + fishingOperationText = null; + } else if (TuttiEntities.isNew(bean)) { + fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", + _("tutti.editFishingOperation.label.traitReminder.inCreation")); + } else { + fishingOperationText = _("tutti.editFishingOperation.label.traitReminder", + decorate(bean)); + } + return fishingOperationText; + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractImportMultiPostAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -107,9 +107,7 @@ importBatches(operation); - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); - - getEditAction().loadCatchBatch(operation, fishingOperationText, true); + getEditAction().loadCatchBatch(operation, true); } protected abstract void importBatches(FishingOperation operation); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-30 14:41:16 UTC (rev 1052) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriAction.java 2013-05-30 15:41:32 UTC (rev 1053) @@ -121,10 +121,8 @@ operation, catchBatch); - String fishingOperationText = getEditAction().getFishingOperationTitle(operation); + getEditAction().loadCatchBatch(operation, true); - getEditAction().loadCatchBatch(operation, fishingOperationText, true); - sendMessage(_("tutti.editSpeciesBatch.action.importPupitri.success", getModel().getRootNumber(), rejectedSpeciesNb)); }