This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 77880e6a816382656bbc47016fab19c18f38b8e5 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 +++---- 1 file changed, 3 insertions(+), 4 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); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.