branch feature/6944 updated (2c6ffc7 -> 71a68a3)
This is an automated email from the git hooks/post-receive script. New change to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git from 2c6ffc7 add export map into png, fix zoomIt in launch new 71a68a3 accepter la carte par son type plutot que par son nome dans le bloqueur + passage a jaxx en snapshot (refs #6944) 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 71a68a375d0fe7fca5630825e7b2b8ef51169979 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 18:46:37 2015 +0200 accepter la carte par son type plutot que par son nome dans le bloqueur + passage a jaxx en snapshot (refs #6944) Summary of changes: .../main/java/fr/ird/observe/ui/content/ContentUIInitializer.java | 7 +++---- pom.xml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/6944 in repository observe. See http://git.codelutin.com/observe.git commit 71a68a375d0fe7fca5630825e7b2b8ef51169979 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 22 18:46:37 2015 +0200 accepter la carte par son type plutot que par son nome dans le bloqueur + passage a jaxx en snapshot (refs #6944) --- .../main/java/fr/ird/observe/ui/content/ContentUIInitializer.java | 7 +++---- pom.xml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index da583f1..aad26b8 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -35,6 +35,7 @@ import fr.ird.observe.entities.referentiel.ReferenceEntity; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.actions.shared.AbstractUIAction; import fr.ird.observe.ui.util.BooleanEditor; +import fr.ird.observe.ui.util.tripMap.ObserveMapPane; import fr.ird.observe.util.DBHelper; import fr.ird.observe.validation.ObserveValidator; import jaxx.runtime.JAXXValidator; @@ -74,6 +75,7 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JList; +import javax.swing.JScrollBar; import javax.swing.JSpinner; import javax.swing.JTable; import javax.swing.JTextArea; @@ -209,9 +211,6 @@ public class ContentUIInitializer<E extends TopiaEntity, UI extends ObserveConte Set<String> doNotBlockComponentIds = new HashSet<String>(); - // Never block map - doNotBlockComponentIds.add("observeMapPane"); - DecoratorService decoratorService = ObserveContext.get().getDecoratorService(); for (String name : ui.get$objectMap().keySet()) { @@ -312,7 +311,7 @@ public class ContentUIInitializer<E extends TopiaEntity, UI extends ObserveConte } protected void initBlockLayerUI(String... doNotBlockComponentIds) { - + ui.getBlockLayerUI().setAcceptedComponentTypes(ObserveMapPane.class, JScrollBar.class); ui.getBlockLayerUI().setAcceptedComponentNames(doNotBlockComponentIds); } diff --git a/pom.xml b/pom.xml index 3a324fd..59bde0e 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ <eugenePluginVersion>2.14</eugenePluginVersion> <topiaVersion>2.9.5.2</topiaVersion> - <jaxxVersion>2.23</jaxxVersion> + <jaxxVersion>2.24-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm