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 ad0adf1d5fd9085c4484b868d4e5599bf43a8aa4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 12:01:57 2015 +0200 ajout dans le tip des noeuds les identifiants + ajout dans la configuration d'import de propriétés manquantes --- .../swing/content/genericformat/GenericFormatImportUIModel.java | 7 +++++-- .../ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java | 8 +------- .../content/genericformat/tree/DataSelectTreeNodeSupport.java | 8 +++++++- .../genericformat/tree/ExportDataSelectTreeCellRenderer.java | 2 +- .../genericformat/tree/ImportDataSelectTreeCellRenderer.java | 1 + 5 files changed, 15 insertions(+), 11 deletions(-) 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 c73158c..747591e 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 @@ -70,7 +70,7 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { public static final String PROPERTY_UPDATE_CRUISES = "updateCruises"; - public static final String PROPERTY_UPDATE_OPERATIONS= "updateOperations"; + public static final String PROPERTY_UPDATE_OPERATIONS = "updateOperations"; public static final String PROPERTY_CAN_VALIDATE = "canValidate"; @@ -88,7 +88,7 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { public static final String PROPERTY_IMPORT_VALID = "importValid"; - public static final String PROPERTY_DATA_SELECTED= "dataSelected"; + public static final String PROPERTY_DATA_SELECTED = "dataSelected"; private Program program; @@ -165,6 +165,9 @@ public class GenericFormatImportUIModel extends AbstractSerializableBean { ProgramDataModel selectedDataModel = rootNode.getSelectedDataModel(); configuration.setDataToExport(selectedDataModel); + configuration.setUpdateCruises(updateCruises); + configuration.setUpdateOperations(updateOperations); + configuration.setImportSpecies(importSpecies); configuration.setImportBenthos(importBenthos); configuration.setImportMarineLitter(importMarineLitter); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java index 39798c7..61f4a6e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java @@ -90,13 +90,7 @@ public class CruiseSelectTreeNode extends DataSelectTreeNodeSupport<CruiseDataMo } } - CruiseDataModel result; - if (operations.isEmpty()) { - result = null; - } else { - result = new CruiseDataModel(getId(), getLabel(), operations); - } - + CruiseDataModel result = new CruiseDataModel(getId(), getLabel(), operations); return result; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java index 8f02ce8..557f93a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java @@ -47,6 +47,12 @@ public abstract class DataSelectTreeNodeSupport<O extends DataModelSupport> exte } public boolean isExist() { - return getUserObject().getOptionalId()!=null; + return getOptionalId() != null; } + + public String getOptionalId() { + return getUserObject().getOptionalId(); + } + + } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java index 51738c0..7ff8d7a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java @@ -60,7 +60,7 @@ public class ExportDataSelectTreeCellRenderer extends DefaultTreeCellRenderer { DataSelectTreeNodeSupport node = (DataSelectTreeNodeSupport) value; - text = node.getLabel(); + text = node.getLabel() + " (identifiant : " + node.getId() + ") "; filled = node.isSelected(); if (node instanceof CruiseSelectTreeNode) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java index 35dfd95..2530a0f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java @@ -80,6 +80,7 @@ public class ImportDataSelectTreeCellRenderer extends DefaultTreeCellRenderer { if (node.isExist()) { checkBox.setText(checkBox.getText() + " (*)"); + checkBox.setToolTipText(checkBox.getToolTipText() + " (donnée existante - identifiant : " + node.getOptionalId() + ")"); } checkBox.setFont(font); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.