January 2017 - Observe-commits - mailman.cloud.codelutin.com

branch develop-5.x updated (8477f14 -> a9a0cb8)
by codelutin.com scm 19 Jan '17

19 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 8477f14 Les corrections orthographiques (fixes #8975) new a9a0cb8 [jgitflow-maven-plugin]updating poms for 5.3.1-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a9a0cb814a3d2501988f532ff8841453651426e6 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Jan 19 20:16:01 2017 +0100 [jgitflow-maven-plugin]updating poms for 5.3.1-SNAPSHOT development Summary of changes: application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (8663e1a -> 81bb131)
by codelutin.com scm 19 Jan '17

19 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 8663e1a Templates de traduction mis à jour (fixes #8967) new 3feb95e Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) new 81bb131 Les corrections orthographiques (fixes #8975) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 81bb131e77ee4bd3c24b52fd2e30aa2f99bc3fd8 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 20:02:03 2017 +0100 Les corrections orthographiques (fixes #8975) commit 3feb95eeaf2387b03166e832b3d1545d0a6016c1 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 20:01:42 2017 +0100 Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) Summary of changes: ...pplication-swing-configuration_fr_FR.properties | 53 ++--- .../application-swing-decoration_fr_FR.properties | 16 +- .../application-swing-validation_en_GB.properties | 2 +- .../application-swing-validation_fr_FR.properties | 54 ++--- .../i18n/application-swing_fr_FR.properties | 173 ++++++++-------- .../application-web-configuration_fr_FR.properties | 2 +- .../resources/i18n/services-topia_en_GB.properties | 2 +- .../maven/plugins/toolbox/MergeI18nBundleMojo.java | 221 +++++++++++++++++++++ 8 files changed, 376 insertions(+), 147 deletions(-) create mode 100644 toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MergeI18nBundleMojo.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop-5.x updated (afde26e -> 8477f14)
by codelutin.com scm 19 Jan '17

19 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from afde26e Bascule distant-> local lorsque la connexion serveur a été perdue (Fixes #8957) new 6f8e734 Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) new 8477f14 Les corrections orthographiques (fixes #8975) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8477f14d8a113dc23c89badda48a759e1df35f3d Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 20:02:03 2017 +0100 Les corrections orthographiques (fixes #8975) commit 6f8e73423f575968d66cf2c68fc8221142a0f668 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 20:01:42 2017 +0100 Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) Summary of changes: ...pplication-swing-configuration_fr_FR.properties | 42 ++-- .../application-swing-decoration_fr_FR.properties | 16 +- .../application-swing-validation_en_GB.properties | 2 +- .../application-swing-validation_fr_FR.properties | 52 ++--- .../i18n/application-swing_fr_FR.properties | 134 ++++++------- .../application-web-configuration_fr_FR.properties | 2 +- .../services-topia-validation_en_GB.properties | 34 ++-- .../services-topia-validation_fr_FR.properties | 66 +++--- .../resources/i18n/services-topia_en_GB.properties | 2 +- .../maven/plugins/toolbox/MergeI18nBundleMojo.java | 221 +++++++++++++++++++++ 10 files changed, 396 insertions(+), 175 deletions(-) create mode 100644 toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MergeI18nBundleMojo.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop-5.x updated (1ef80d4 -> afde26e)
by codelutin.com scm 19 Jan '17

19 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 1ef80d4 Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966) (la vrai correction...) new afde26e Bascule distant-> local lorsque la connexion serveur a été perdue (Fixes #8957) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit afde26e6f4a5bfc5271861c4f18ad41dfce93da8 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 10:35:54 2017 +0100 Bascule distant-> local lorsque la connexion serveur a été perdue (Fixes #8957) Summary of changes: .../application/swing/ui/storage/StorageUIHandler.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

02/02: Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966) (la vrai correction...)
by codelutin.com scm 19 Jan '17

19 Jan '17

This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1ef80d4fe8cdaa80a3ad9da27a1d4e15ef327f25 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 08:40:57 2017 +0100 Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966) (la vrai correction...) --- .../swing/ui/tree/ObserveTreeHelper.java | 4 +-- .../ui/tree/node/AbstrctReferenceNodeSupport.java | 30 +++++----------------- .../ui/tree/node/DataReferenceNodeSupport.java | 18 +++---------- .../swing/ui/tree/node/ProgramLonglineNode.java | 2 -- .../tree/node/ReferentialReferenceNodeSupport.java | 22 +++------------- .../renderer/AbstractObserveTreeCellRenderer.java | 9 +++---- 6 files changed, 18 insertions(+), 67 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java index 193e249..4a20a1a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java @@ -561,7 +561,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { public void reloadSelectedNode(boolean refreshFromParent, boolean refreshChilds) { ObserveNode node = getSelectedNode(); - ((AbstrctReferenceNodeSupport) node).setReloadEntity(true); + ((AbstrctReferenceNodeSupport) node).setReloadEntity(); if (refreshFromParent) { node = node.getParent(); @@ -570,7 +570,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { } public void reloadNode(ObserveNode node, boolean refreshChilds) { - ((AbstrctReferenceNodeSupport) node).setReloadEntity(true); + ((AbstrctReferenceNodeSupport) node).setReloadEntity(); refreshNode(node, refreshChilds); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java index 2e391c2..3bae57d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java @@ -22,10 +22,9 @@ package fr.ird.observe.application.swing.ui.tree.node; * #L% */ -import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; +import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -54,17 +53,13 @@ public abstract class AbstrctReferenceNodeSupport<E extends IdDto, R extends Abs protected abstract R fetchEntity(); - protected AbstrctReferenceNodeSupport(Class<E> internalClass, R entity) { - this(internalClass, entity, null); - } - protected AbstrctReferenceNodeSupport(Class<E> type, R entity, AbstractNodeChildLoador<?, ?> childLoador) { this(type, entity, null, childLoador); } protected AbstrctReferenceNodeSupport(Class<E> type, R entity, String context, AbstractNodeChildLoador<?, ?> childLoador) { super(type, entity.getId(), context, childLoador, false); - setEntity(entity); + this.entity = entity; } @Override @@ -81,21 +76,7 @@ public abstract class AbstrctReferenceNodeSupport<E extends IdDto, R extends Abs return entity; } - public void setEntity(R entity) { - this.entity = entity; - } - - - protected void loadEntity(ObserveDataProvider oProvider) { - - //FIXME -// if (oProvider.getSelectionModel() != null) { -// -// if (log.isDebugEnabled()) { -// log.debug("try to get entity from selectionModel " + internalClass + " : " + id); -// } -// entity = (ReferenceDto<E>) oProvider.getSelectionModel().getEntityCache(id); -// } + public R getOrLoadEntity() { if (entity == null) { @@ -107,10 +88,11 @@ public abstract class AbstrctReferenceNodeSupport<E extends IdDto, R extends Abs } + return entity; } - public void setReloadEntity(boolean reloadEntity) { - this.reloadEntity = reloadEntity; + public void setReloadEntity() { + this.reloadEntity = true; } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java index acb70c2..f0aa320 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java @@ -24,11 +24,10 @@ package fr.ird.observe.application.swing.ui.tree.node; import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; +import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.OpenableDto; -import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; import jaxx.runtime.swing.nav.NavBridge; import jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; @@ -57,15 +56,8 @@ public abstract class DataReferenceNodeSupport<E extends DataDto> extends Abstrc super(type, entity, null, childLoador); } - protected DataReferenceNodeSupport(Class<E> type, DataReference<E> entity, String context, AbstractNodeChildLoador<?, ?> childLoador) { - super(type, entity, context, childLoador); - } - @Override - public void populateNode(NavBridge<DefaultTreeModel, ObserveNode> bridge, - NavDataProvider provider, - boolean populateChilds) { - + public void populateNode(NavBridge<DefaultTreeModel, ObserveNode> bridge, NavDataProvider provider, boolean populateChilds) { try { super.populateNode(bridge, provider, populateChilds); @@ -75,11 +67,7 @@ public abstract class DataReferenceNodeSupport<E extends DataDto> extends Abstrc if (provider != null && id != null) { - if (entity == null) { - - loadEntity((ObserveDataProvider) provider); - - } + getOrLoadEntity(); if (OpenableDto.class.isAssignableFrom(entity.getType())) { ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java index 97300f8..0acfa2f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java @@ -50,8 +50,6 @@ public class ProgramLonglineNode extends ReferentialReferenceNodeSupport<Program entity, ((GearType) entity.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE)).name(), ObserveTreeHelper.getChildLoador(ProgramLonglineNodeChildLoador.class)); - // FIXME kmorin 20151012 pkoi refaire un setEntity alors qu'il est fait dans le super ? - setEntity(entity); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java index b1d4c59..a856559 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java @@ -22,10 +22,9 @@ package fr.ird.observe.application.swing.ui.tree.node; * #L% */ -import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; +import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; import jaxx.runtime.swing.nav.NavBridge; import jaxx.runtime.swing.nav.NavDataProvider; import org.apache.commons.logging.Log; @@ -46,23 +45,12 @@ public abstract class ReferentialReferenceNodeSupport<E extends ReferentialDto> private static final long serialVersionUID = 1L; - protected ReferentialReferenceNodeSupport(Class<E> internalClass, ReferentialReference<E> entity) { - super(internalClass, entity, null); - } - - protected ReferentialReferenceNodeSupport(Class<E> type, ReferentialReference<E> entity, AbstractNodeChildLoador<?, ?> childLoador) { - super(type, entity, null, childLoador); - } - protected ReferentialReferenceNodeSupport(Class<E> type, ReferentialReference<E> entity, String context, AbstractNodeChildLoador<?, ?> childLoador) { super(type, entity, context, childLoador); } @Override - public void populateNode(NavBridge<DefaultTreeModel, ObserveNode> bridge, - NavDataProvider provider, - boolean populateChilds) { - + public void populateNode(NavBridge<DefaultTreeModel, ObserveNode> bridge, NavDataProvider provider, boolean populateChilds) { try { super.populateNode(bridge, provider, populateChilds); @@ -72,11 +60,7 @@ public abstract class ReferentialReferenceNodeSupport<E extends ReferentialDto> if (provider != null && id != null) { - if (entity == null) { - - loadEntity((ObserveDataProvider) provider); - - } + getOrLoadEntity(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java index 6fd8a1c..9445ac9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/renderer/AbstractObserveTreeCellRenderer.java @@ -254,7 +254,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel return t(node.getId()); } - Class<?> beanType = node.getInternalClass(); + Class beanType = node.getInternalClass(); if (node.isReferentielNode()) { @@ -290,11 +290,10 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel if (node instanceof DataReferenceNodeSupport) { DataReferenceNodeSupport<?> entityNodeSupport = (DataReferenceNodeSupport) node; - DataReference entity = entityNodeSupport.getEntity(); - + DataReference entity = entityNodeSupport.getOrLoadEntity(); Objects.requireNonNull(entity, "L'entité doit être chargée dans le noeud: " + node); - Decorator<?> decorator = getDecoratorService().getDataReferenceDecorator((Class) beanType); + Decorator<?> decorator = getDecoratorService().getDataReferenceDecorator(beanType); String result = decorator.toString(entity); if (node instanceof TripSeineNode) { @@ -310,7 +309,7 @@ public abstract class AbstractObserveTreeCellRenderer extends AbstractNavTreeCel Objects.requireNonNull(entity, "L'entité doit être chargée dans le noeud: " + node); - Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator((Class) beanType); + Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator(beanType); String result = decorator.toString(entity); if (node instanceof ProgramSeineNode || node instanceof ProgramLonglineNode) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

01/02: Revert "Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966)"
by codelutin.com scm 19 Jan '17

19 Jan '17

This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5dc2c399aae4b19953449a725a343cb086569534 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 08:10:35 2017 +0100 Revert "Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966)" This reverts commit 66b7da16359caf9bc9135a299beebe0f56f6cf87. --- .../swing/ui/tree/ObserveTreeHelper.java | 4 +- .../ui/tree/node/AbstrctReferenceNodeSupport.java | 49 ++++++++++++++++++---- .../ui/tree/node/DataReferenceNodeSupport.java | 15 ++++--- .../swing/ui/tree/node/ProgramLonglineNode.java | 2 + .../tree/node/ReferentialReferenceNodeSupport.java | 15 ++++--- 5 files changed, 64 insertions(+), 21 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java index 6db6a26..193e249 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveTreeHelper.java @@ -561,7 +561,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { public void reloadSelectedNode(boolean refreshFromParent, boolean refreshChilds) { ObserveNode node = getSelectedNode(); - ((AbstrctReferenceNodeSupport) node).reloadEntity(); + ((AbstrctReferenceNodeSupport) node).setReloadEntity(true); if (refreshFromParent) { node = node.getParent(); @@ -570,7 +570,7 @@ public class ObserveTreeHelper extends NavTreeHelper<ObserveNode> { } public void reloadNode(ObserveNode node, boolean refreshChilds) { - ((AbstrctReferenceNodeSupport) node).reloadEntity(); + ((AbstrctReferenceNodeSupport) node).setReloadEntity(true); refreshNode(node, refreshChilds); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java index 850eca3..2e391c2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/AbstrctReferenceNodeSupport.java @@ -22,14 +22,13 @@ package fr.ird.observe.application.swing.ui.tree.node; * #L% */ -import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.Optional; - /** * Created on 4/9/15. * @@ -51,6 +50,8 @@ public abstract class AbstrctReferenceNodeSupport<E extends IdDto, R extends Abs */ protected transient R entity; + protected boolean reloadEntity; + protected abstract R fetchEntity(); protected AbstrctReferenceNodeSupport(Class<E> internalClass, R entity) { @@ -63,23 +64,53 @@ public abstract class AbstrctReferenceNodeSupport<E extends IdDto, R extends Abs protected AbstrctReferenceNodeSupport(Class<E> type, R entity, String context, AbstractNodeChildLoador<?, ?> childLoador) { super(type, entity.getId(), context, childLoador, false); - this.entity = entity; + setEntity(entity); } @Override public void setDirty(boolean dirty) { super.setDirty(dirty); - if (dirty) { - reloadEntity(); + + if (dirty && reloadEntity) { + entity = null; } + } public R getEntity() { - return Optional.ofNullable(entity).orElse(entity = fetchEntity()); + return entity; + } + + public void setEntity(R entity) { + this.entity = entity; + } + + + protected void loadEntity(ObserveDataProvider oProvider) { + + //FIXME +// if (oProvider.getSelectionModel() != null) { +// +// if (log.isDebugEnabled()) { +// log.debug("try to get entity from selectionModel " + internalClass + " : " + id); +// } +// entity = (ReferenceDto<E>) oProvider.getSelectionModel().getEntityCache(id); +// } + + if (entity == null) { + + if (log.isInfoEnabled()) { + log.info("will load entity " + internalClass.getSimpleName() + " : " + id); + } + + entity = fetchEntity(); + + } + } - public void reloadEntity() { - this.entity = fetchEntity(); + public void setReloadEntity(boolean reloadEntity) { + this.reloadEntity = reloadEntity; } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java index 6cc7a69..acb70c2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/DataReferenceNodeSupport.java @@ -24,6 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.node; import fr.ird.observe.application.swing.ObserveOpenDataManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.OpenableDto; @@ -66,15 +67,19 @@ public abstract class DataReferenceNodeSupport<E extends DataDto> extends Abstrc boolean populateChilds) { -// try { + try { super.populateNode(bridge, provider, populateChilds); -// } finally { -// reloadEntity = false; -// } + } finally { + reloadEntity = false; + } if (provider != null && id != null) { - getEntity(); + if (entity == null) { + + loadEntity((ObserveDataProvider) provider); + + } if (OpenableDto.class.isAssignableFrom(entity.getType())) { ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java index 0acfa2f..97300f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ProgramLonglineNode.java @@ -50,6 +50,8 @@ public class ProgramLonglineNode extends ReferentialReferenceNodeSupport<Program entity, ((GearType) entity.getPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE)).name(), ObserveTreeHelper.getChildLoador(ProgramLonglineNodeChildLoador.class)); + // FIXME kmorin 20151012 pkoi refaire un setEntity alors qu'il est fait dans le super ? + setEntity(entity); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java index 3933e56..b1d4c59 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/node/ReferentialReferenceNodeSupport.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.tree.node; * #L% */ +import fr.ird.observe.application.swing.ui.tree.ObserveDataProvider; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.application.swing.ui.tree.loadors.AbstractNodeChildLoador; @@ -63,15 +64,19 @@ public abstract class ReferentialReferenceNodeSupport<E extends ReferentialDto> boolean populateChilds) { -// try { + try { super.populateNode(bridge, provider, populateChilds); -// } finally { -// reloadEntity = false; -// } + } finally { + reloadEntity = false; + } if (provider != null && id != null) { - getEntity(); + if (entity == null) { + + loadEntity((ObserveDataProvider) provider); + + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop-5.x updated (d423f43 -> 1ef80d4)
by codelutin.com scm 19 Jan '17

19 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from d423f43 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) new 5dc2c39 Revert "Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966)" new 1ef80d4 Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966) (la vrai correction...) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1ef80d4fe8cdaa80a3ad9da27a1d4e15ef327f25 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 08:40:57 2017 +0100 Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966) (la vrai correction...) commit 5dc2c399aae4b19953449a725a343cb086569534 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Thu Jan 19 08:10:35 2017 +0100 Revert "Une exception apparait si on ouvre l'assistant de changement de connexion et qu'on annule (Fixes #8966)" This reverts commit 66b7da16359caf9bc9135a299beebe0f56f6cf87. Summary of changes: .../swing/ui/tree/ObserveTreeHelper.java | 4 +-- .../ui/tree/node/AbstrctReferenceNodeSupport.java | 35 +++++++++++++++------- .../ui/tree/node/DataReferenceNodeSupport.java | 21 +++++-------- .../tree/node/ReferentialReferenceNodeSupport.java | 25 +++++----------- .../renderer/AbstractObserveTreeCellRenderer.java | 9 +++--- 5 files changed, 44 insertions(+), 50 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (1869d03 -> 8663e1a)
by codelutin.com scm 18 Jan '17

18 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 1869d03 Fix bad topia generation (Fixes #8934) new 52570ec Petites mises au point sur le widget positions(fixes #8964) new 28561c4 fix doc new 0f58afb Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) new 17384ba le calendrier reste en anglais (fixes #8952) new 8663e1a Templates de traduction mis à jour (fixes #8967) The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8663e1ac24386225181611061486e5db02482306 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 12:10:43 2017 +0100 Templates de traduction mis à jour (fixes #8967) commit 17384ba380092a2732a230fcd16c1280f29af0fe Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 13:17:45 2017 +0100 le calendrier reste en anglais (fixes #8952) commit 0f58afb1b8a5ec5d3955467eda60028be7ab92d1 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 20:08:59 2017 +0100 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) commit 28561c46d2e8a3f8bda0d38d24fd904866b8585a Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 20:03:54 2017 +0100 fix doc commit 52570ec01aaf188207fc9d9c54c39d75a4b71bd1 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 15:32:38 2017 +0100 Petites mises au point sur le widget positions(fixes #8964) Summary of changes: .../src/main/resources/log4j.properties | 5 +- .../src/main/resources/observe-log4j.properties | 1 + ...ivityLonglineDto-ui-create-error-validation.xml | 20 +++--- ...ivityLonglineDto-ui-update-error-validation.xml | 25 ++++--- .../SetLonglineDto-ui-create-error-validation.xml | 80 +++++++++++++--------- .../SetLonglineDto-ui-update-error-validation.xml | 80 +++++++++++++--------- ...ActivitySeineDto-ui-create-error-validation.xml | 22 +++--- ...ActivitySeineDto-ui-update-error-validation.xml | 21 +++--- .../swing/ui/content/ContentUIInitializer.java | 2 +- .../main/resources/ftl/connexionTestResult_en.ftl | 2 +- .../main/resources/ftl/connexionTestResult_es.ftl | 6 +- .../main/resources/ftl/connexionTestResult_fr.ftl | 4 +- .../ftl/dataSourceConnectionReport_en.ftl | 62 ++++++++--------- .../ftl/dataSourceConnectionReport_es.ftl | 77 +++++++++++---------- .../ftl/dataSourceConnectionReport_fr.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_en.ftl | 20 +++--- .../resources/ftl/dataSourceInformation_es.ftl | 18 ++--- .../resources/ftl/dataSourceInformation_fr.ftl | 4 +- .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 8 +-- .../src/main/resources/ftl/dataSourcePolicy_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_en.ftl | 18 ++--- .../ftl/dataSourceSelectModeResume_es.ftl | 8 +-- .../ftl/dataSourceSelectModeResume_fr.ftl | 10 +-- .../ftl/storageModelDataSourceConfiguration_en.ftl | 26 +++---- .../ftl/storageModelDataSourceConfiguration_es.ftl | 26 +++---- application-web/pom.xml | 6 +- .../controller/v1/DataSourceServiceController.java | 12 +++- pom.xml | 4 +- .../ObserveTopiaApplicationContextFactory.java | 46 ++++++++++--- src/site/rst/administration-web.rst.vm | 8 +-- 30 files changed, 372 insertions(+), 277 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop-5.x updated (bc821a4 -> d423f43)
by codelutin.com scm 18 Jan '17

18 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from bc821a4 Petites mises au point sur le widget positions(fixes #8964) new 6861d0b Improve log (remove deprecated stuff out of it) new dabad6a fix doc new d423f43 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d423f43af8ad2a80963f6c0df46438b1beb63165 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 20:08:59 2017 +0100 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) commit dabad6ad8d52a6d1b6276779baa02f065dace1e8 Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 20:03:54 2017 +0100 fix doc commit 6861d0b21fb994f1f4890be8238128863f421b1d Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 19:59:28 2017 +0100 Improve log (remove deprecated stuff out of it) Summary of changes: .../src/main/resources/log4j.properties | 2 + .../src/main/resources/observe-log4j.properties | 2 + .../src/main/resources/observeweb-log4j.conf | 3 ++ application-web/pom.xml | 6 ++- .../controller/v1/DataSourceServiceController.java | 14 +++++-- .../fr/ird/observe/ObserveTopiaConfiguration.java | 4 +- pom.xml | 2 +- .../ObserveTopiaApplicationContextFactory.java | 46 +++++++++++++++++----- src/site/rst/administration-web.rst.vm | 8 ++-- 9 files changed, 66 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop-5.x updated (7636482 -> bc821a4)
by codelutin.com scm 18 Jan '17

18 Jan '17

This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 7636482 Le libellé observe.common.label a sauté (fixes #8951) new bc821a4 Petites mises au point sur le widget positions(fixes #8964) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bc821a4d37968f8f6c086d3c944ff306d22230af Author: Tony CHEMIT <dev(a)tchemit.fr> Date: Wed Jan 18 15:32:38 2017 +0100 Petites mises au point sur le widget positions(fixes #8964) Summary of changes: .../src/main/resources/log4j.properties | 3 +- .../src/main/resources/observe-log4j.properties | 1 + ...ivityLonglineDto-ui-create-error-validation.xml | 20 +++--- ...ivityLonglineDto-ui-update-error-validation.xml | 25 ++++--- .../SetLonglineDto-ui-create-error-validation.xml | 80 +++++++++++++--------- .../SetLonglineDto-ui-update-error-validation.xml | 80 +++++++++++++--------- ...ActivitySeineDto-ui-create-error-validation.xml | 21 +++--- ...ActivitySeineDto-ui-update-error-validation.xml | 21 +++--- pom.xml | 4 +- 9 files changed, 153 insertions(+), 102 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1