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 a219dd72a675aec4a3f88437d25dd3ef875edfb1 Author: Kevin Morin <morin@codelutin.com> Date: Thu Feb 4 11:34:16 2016 +0100 ajout des libellé sur les racines des arbres (refs #7929) --- .../content/protocol/zones/ZoneEditorUIHandler.java | 18 ------------------ .../zones/tree/AbstractZoneEditorTreeModel.java | 4 ++-- .../content/protocol/zones/tree/StratasTreeModel.java | 6 ++++++ .../content/protocol/zones/tree/ZoneEditorNode.java | 4 ++-- .../zones/tree/ZoneEditorTreeCellRenderer.java | 16 ---------------- .../content/protocol/zones/tree/ZonesTreeModel.java | 7 +++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 8 files changed, 22 insertions(+), 38 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java index e201889..aba0d05 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIHandler.java @@ -4,7 +4,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.entities.protocol.SubStrata; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; -import fr.ifremer.tutti.persistence.entities.referential.TuttiLocations; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.StrataUIModel; @@ -117,21 +116,12 @@ public class ZoneEditorUIHandler extends AbstractTuttiUIHandler<EditProtocolUIMo Collection<SubStrataUIModel> newSubStratas = (Collection<SubStrataUIModel>) evt.getNewValue(); Collection<SubStrataUIModel> oldSubStratas = (Collection<SubStrataUIModel>) evt.getOldValue(); - if (log.isInfoEnabled()) { - log.info(oldSubStratas); - log.info(newSubStratas); - } - Collection<SubStrataUIModel> subStratasToAdd = new ArrayList<>(newSubStratas); subStratasToAdd.removeAll(oldSubStratas); Collection<SubStrataUIModel> subStratasToRemove = new ArrayList<>(oldSubStratas); subStratasToRemove.removeAll(newSubStratas); - if (log.isInfoEnabled()) { - log.info("substrata to remove : " + subStratasToRemove); - } - StratasTreeModel stratasTreeModel = (StratasTreeModel) getUI().getAvailableStratasTree().getModel(); stratasTreeModel.updateSubStratas(strata, subStratasToAdd, subStratasToRemove); @@ -292,14 +282,6 @@ public class ZoneEditorUIHandler extends AbstractTuttiUIHandler<EditProtocolUIMo Multimap<TuttiLocation, TuttiLocation> programStratasAndSubstratas = HashMultimap.create(persistenceService.getAllFishingOperationStratasAndSubstratas(programZone.getId())); - //FIXME only for tests - TuttiLocation test = programStratasAndSubstratas.keySet().iterator().next(); - for (int i = 0 ; i < 5 ; i++) { - TuttiLocation location = TuttiLocations.newTuttiLocation(); - location.setId(i); - location.setLabel("substrata" + i); - programStratasAndSubstratas.put(test, location); - } // on transforme les données du service en modele d'ui Collection<StrataUIModel> availableStratas = new HashSet<>(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java index b1617cd..1862a76 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java @@ -14,8 +14,8 @@ public abstract class AbstractZoneEditorTreeModel extends DefaultTreeModel { /** Logger. */ private static final Log log = LogFactory.getLog(AbstractZoneEditorTreeModel.class); - public AbstractZoneEditorTreeModel() { - super(new ZoneEditorNode()); + public AbstractZoneEditorTreeModel(String rootLabel) { + super(new ZoneEditorNode(rootLabel)); } public void addNode(ZoneEditorNode newChild, ZoneEditorNode parent) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java index 1b9838c..86b6c9b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java @@ -11,6 +11,8 @@ import java.util.Collection; import java.util.Enumeration; import java.util.HashSet; +import static org.nuiton.i18n.I18n.t; + /** * @author Kevin Morin (Code Lutin) * @since 4.5 @@ -20,6 +22,10 @@ public class StratasTreeModel extends AbstractZoneEditorTreeModel { /** Logger. */ private static final Log log = LogFactory.getLog(StratasTreeModel.class); + public StratasTreeModel() { + super(t("tutti.zoneEditor.availableStratas.root.label")); + } + public void removeStratas(Collection<StrataUIModel> stratasToRemove) { ZoneEditorNode root = (ZoneEditorNode) getRoot(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java index 43e113a..36fb577 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java @@ -17,8 +17,8 @@ public class ZoneEditorNode extends DefaultMutableTreeNode implements Comparable /** Logger. */ private static final Log log = LogFactory.getLog(ZoneEditorNode.class); - public ZoneEditorNode() { - super(); + public ZoneEditorNode(String label) { + super(label); } public ZoneEditorNode(Object userObject, boolean allowchildren) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java index f81d71d..4de547f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java @@ -22,22 +22,6 @@ public class ZoneEditorTreeCellRenderer extends DefaultTreeCellRenderer { super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus); -// String text = ""; -// -// if (value instanceof StrataNode) { -// StrataUIModel strata = ((StrataNode) value).getStrata(); -// text = strata.getLabel(); -// -// } else if (value instanceof SubStrataNode) { -// SubStrataUIModel substrata = ((SubStrataNode) value).getSubstrata(); -// text = substrata.getLabel(); -// -// } else if (value instanceof ZoneNode) { -// Zone zone = ((ZoneNode) value).getZone(); -// text = zone.getLabel(); -// } - -// setText(text); setIcon(SwingUtil.createActionIcon("location")); return this; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java index 047e183..2b88ddb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java @@ -15,6 +15,8 @@ import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; +import static org.nuiton.i18n.I18n.t; + /** * @author Kevin Morin (Code Lutin) * @since 4.5 @@ -24,6 +26,11 @@ public class ZonesTreeModel extends AbstractZoneEditorTreeModel { /** Logger. */ private static final Log log = LogFactory.getLog(ZonesTreeModel.class); + public ZonesTreeModel() { + super(t("tutti.zoneEditor.zones.root.label")); + log.info(t("tutti.test", "test1", "test2", 1.0d)); + } + public void removeZones(Collection<ZoneUIModel> zonesToRemove) { ZoneEditorNode root = (ZoneEditorNode) getRoot(); diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index c5f1ff2..56bde07 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -2221,6 +2221,7 @@ tutti.splitSpeciesBatch.table.header.category= tutti.splitSpeciesBatch.table.header.selected= tutti.splitSpeciesBatch.table.header.weight= tutti.splitSpeciesBatch.title= +tutti.test= tutti.title.openReplaceTemporaryGearUI.noSource= tutti.title.openReplaceTemporaryGearUI.noTarget= tutti.title.openReplaceTemporaryPersonUI.noSource= @@ -2354,9 +2355,11 @@ tutti.zoneEditor.action.delete.tip= tutti.zoneEditor.action.rename= tutti.zoneEditor.action.rename.mnemonic= tutti.zoneEditor.action.rename.tip= +tutti.zoneEditor.availableStratas.root.label= tutti.zoneEditor.createZone.message= tutti.zoneEditor.createZone.title= tutti.zoneEditor.deleteZone.message= tutti.zoneEditor.deleteZone.title= tutti.zoneEditor.renameZone.message= tutti.zoneEditor.renameZone.title= +tutti.zoneEditor.zones.root.label= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index e05c253..9a9bad0 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -2179,9 +2179,11 @@ tutti.zoneEditor.action.delete.tip=S tutti.zoneEditor.action.rename=Renommer la zone tutti.zoneEditor.action.rename.mnemonic=Renommer la zone sélectionnée tutti.zoneEditor.action.rename.tip=R +tutti.zoneEditor.availableStratas.root.label=Strates à attribuer à une zone tutti.zoneEditor.createZone.message=Libellé de la nouvelle zone tutti.zoneEditor.createZone.title=Nouvelle zone tutti.zoneEditor.deleteZone.message=Vous êtes sur le point de supprimer la zone %s. Êtes-vous sûr de vouloir la supprimer ? tutti.zoneEditor.deleteZone.title=Suppression de zone tutti.zoneEditor.renameZone.message=Nouveau libellé de la zone tutti.zoneEditor.renameZone.title=Renommer la zone %s +tutti.zoneEditor.zones.root.label=Zones -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.