This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 0fb90db254b4992f12beeaa92651f58f6bfa76ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 11 16:35:24 2015 +0200 refs #6904 forbids to replay import once it has be done (you need then to revalidate import) --- .../genericformat/GenericFormatImportUI.css | 7 ++++- .../genericformat/GenericFormatImportUI.jaxx | 30 +++++++++++----------- .../genericformat/GenericFormatImportUIModel.java | 3 +-- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css index 83d49ba..85dbd86 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css @@ -21,6 +21,11 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ + +.canConfigureImport { + enabled: {model.getImportResult() == null}; +} + FileEditor { showReset:true; directoryEnabled: false; @@ -207,7 +212,7 @@ JTextField { toolTipText: "tutti.genericFormatImport.action.import.tip"; i18nMnemonic: "tutti.genericFormatImport.action.import.mnemonic"; _applicationAction: {fr.ifremer.tutti.ui.swing.content.genericformat.actions.GenericFormatImportAction.class}; - enabled: {model.isCanImport()}; + enabled: {model.isCanImport() && model.getImportResult() == null}; _help: {"tutti.genericFormatImport.action.import.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx index 0836526..b282482 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx @@ -113,30 +113,30 @@ <!-- Data selection --> <JScrollPane id='dataSelectionPane' constraints='BorderLayout.CENTER'> - <JTree id='dataSelectionTree'/> + <JTree id='dataSelectionTree' styleClass='canConfigureImport'/> </JScrollPane> <!-- Import options --> <JPanel id='importOptions' layout='{new BorderLayout()}' constraints='BorderLayout.EAST'> <JPanel layout='{new GridLayout(0, 1)}' constraints='BorderLayout.NORTH'> - <JCheckBox id='updateCruisesCheckBox' onItemStateChanged='handler.setBoolean(event, "updateCruises")'/> - <JCheckBox id='updateOperationsCheckBox' onItemStateChanged='handler.setBoolean(event, "updateOperations")'/> - <JCheckBox id='importSpeciesCheckBox' onItemStateChanged='handler.setBoolean(event, "importSpecies")'/> - <JCheckBox id='importBenthosCheckBox' onItemStateChanged='handler.setBoolean(event, "importBenthos")'/> - <JCheckBox id='importMarineLitterCheckBox' onItemStateChanged='handler.setBoolean(event, "importMarineLitter")'/> - <JCheckBox id='importAccidentalCatchCheckBox' onItemStateChanged='handler.setBoolean(event, "importAccidentalCatch")'/> - <JCheckBox id='importIndividualObservationCheckBox' onItemStateChanged='handler.setBoolean(event, "importIndividualObservation")'/> - <JCheckBox id='importAttachmentsCheckBox' onItemStateChanged='handler.setBoolean(event, "importAttachments")'/> - <JCheckBox id='cleanWeightsCheckBox' onItemStateChanged='handler.setBoolean(event, "cleanWeights")'/> - <JCheckBox id='checkWeightsCheckBox' onItemStateChanged='handler.setBoolean(event, "checkWeights")'/> + <JCheckBox id='updateCruisesCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "updateCruises")'/> + <JCheckBox id='updateOperationsCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "updateOperations")'/> + <JCheckBox id='importSpeciesCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "importSpecies")'/> + <JCheckBox id='importBenthosCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "importBenthos")'/> + <JCheckBox id='importMarineLitterCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "importMarineLitter")'/> + <JCheckBox id='importAccidentalCatchCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "importAccidentalCatch")'/> + <JCheckBox id='importIndividualObservationCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "importIndividualObservation")'/> + <JCheckBox id='importAttachmentsCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "importAttachments")'/> + <JCheckBox id='cleanWeightsCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "cleanWeights")'/> + <JCheckBox id='checkWeightsCheckBox' styleClass='canConfigureImport' onItemStateChanged='handler.setBoolean(event, "checkWeights")'/> </JPanel> </JPanel> <JToolBar id='dataSelectionTreeHeader' constraints='BorderLayout.SOUTH'> - <JButton id='unfoldAllButton'/> - <JButton id='foldAllButton'/> - <JButton id='selectAllButton'/> - <JButton id='unselectAllButton'/> + <JButton id='unfoldAllButton' styleClass='canConfigureImport'/> + <JButton id='foldAllButton' styleClass='canConfigureImport'/> + <JButton id='selectAllButton' styleClass='canConfigureImport'/> + <JButton id='unselectAllButton' styleClass='canConfigureImport'/> </JToolBar> </JPanel> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java index 2ccec2c..29475ea 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java @@ -370,7 +370,6 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { return importResult != null; } - public boolean isImportValid() { return importResult != null && importResult.isValid(); } @@ -380,7 +379,7 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { } public boolean computeIsCanImport() { - return isValidateDone() && isValidateValid() && isDataSelected(); + return isValidateDone() && isValidateValid() && isDataSelected() && importResult == null; } public void setRootNode(ProgramSelectTreeNode rootNode) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.