Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e473bd86 by Tony Chemit at 2021-01-22T10:35:05+01:00 Disponibilité du sélecteur DMS / DMD / DD - Closes #1717 - - - - - 9 changed files: - client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/main/focus/MainUIFocusModel.java ===================================== @@ -69,7 +69,7 @@ public class MainUIFocusModel extends UIFocusModel implements PropertyChangeList this.keyboardFocusManager = Objects.requireNonNull(keyboardFocusManager); this.acceptedClassesInBlockingLayer = new LinkedHashSet<>(); this.acceptedClassesInBlockingLayer.add(JTable.class); - this.acceptedClassesInBlockingLayer.add(JList.class); +// this.acceptedClassesInBlockingLayer.add(JList.class); this.acceptedClassesInBlockingLayer.add(JScrollBar.class); this.acceptedClassesInBlockingLayer.add(JTabbedPane.class); ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java ===================================== @@ -49,11 +49,9 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI public static final String CLIENT_PROPERTY_FORCE_LOAD = "forceLoad"; public static final String CLIENT_PROPERTY_LIST_NO_LOAD = "listNoLoad"; - // public static final String DELEGATE_CONTENT_UI = "delegateContentUI"; public static final String MAIN_TABBED_PANE = "mainTabbedPane"; public static final String SUB_TABBED_PANE = "subTabbedPane"; - public static final String CLIENT_PROPERTY_NOT_BLOCKING = "notBlocking"; public static final Class<?>[] MANAGED_TYPES = new Class<?>[]{ JComponent.class, BeanCheckBox.class, @@ -192,10 +190,6 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI protected void init(JComponent editor) { initializerContext.checkFirstPass(); - final Boolean propertyName = (Boolean) editor.getClientProperty(CLIENT_PROPERTY_NOT_BLOCKING); - if (propertyName != null) { - initializerContext.addDoNotBlockComponentId(editor.getName()); - } } } ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializerContext.java ===================================== @@ -74,4 +74,30 @@ public class DefaultUIInitializerContext<U extends JAXXObject> extends UIInitial public void setSubTabbedPaneValidator(JTabbedPane tabbedPane) { this.subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) getUi(), tabbedPane.getName()).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } + + @Override + public UIInitializerContext<U> startFirstPass() { + super.startFirstPass(); + // Url + addDoNotBlockComponentId("openLink"); + // JaxxComboBox, DoubleList, ListHeader + addDoNotBlockComponentId("displayDecorator"); + // TripMap + addDoNotBlockComponentId("observeMapPane"); + addDoNotBlockComponentId("zoomIt"); + addDoNotBlockComponentId("zoomPlus"); + addDoNotBlockComponentId("zoomMinus"); + addDoNotBlockComponentId("exportPng"); + addDoNotBlockComponentId("toggleLegend"); + addDoNotBlockComponentId("addObservations"); + addDoNotBlockComponentId("addLogbook"); + // TemperatureEditor + addDoNotBlockComponentId("cFormat"); + addDoNotBlockComponentId("fFormat"); + // CoordinateEditor + addDoNotBlockComponentId("ddFormat"); + addDoNotBlockComponentId("dmdFormat"); + addDoNotBlockComponentId("dmsFormat"); + return this; + } } ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java ===================================== @@ -185,7 +185,11 @@ public class UIInitHelper { Objects.requireNonNull(label, "can't find label for temperature editor " + editor); editor.setConfig(new TemperatureEditorConfig(TemperatureFormat.C, label.getText(), propertyName)); editor.init(label); - editor.getModel().addPropertyChangeListener("format", e -> validator.doValidate()); + editor.getModel().addPropertyChangeListener("format", e -> { + if (validator.getBean() != null) { + validator.doValidate(); + } + }); } public static void init(NumberEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton) { ===================================== client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -118,10 +118,6 @@ JToolBar { opaque:false; } -JTabbedPane { - _notBlocking: true; -} - JXDatePicker { formats:{"dd/MM/yyyy"}; } @@ -144,7 +140,6 @@ DoubleList { showSelectPopupEnabled: false; filterable:false; autoSortSelectedList:true; - _notBlocking: true; } JaxxComboBox { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -368,17 +368,6 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(JComponent editor) { initializerContext.checkFirstPass(); - if (editor instanceof UrlEditor) { - initializerContext.addDoNotBlockComponentId("openLink"); - } else if (editor.getClientProperty(DefaultUIInitializer.CLIENT_PROPERTY_NOT_BLOCKING) != null) { - initializerContext.addDoNotBlockComponentId(editor.getName()); - ActionMap actionMap = editor.getActionMap(); - if (actionMap.keys() != null) { - for (Object key : actionMap.keys()) { - initializerContext.addDoNotBlockComponentId(key.toString()); - } - } - } Object property = editor.getClientProperty(CLIENT_PROPERTY_FOCUS_COMPONENT); if (property == null) { return; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jcss ===================================== @@ -94,8 +94,4 @@ #mapTab { enabled:{!states.isCreatingMode()}; -} - -#tripMap { - _notBlocking:true; -} +} \ No newline at end of file ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -79,7 +79,6 @@ #sectionsTable { model: {sectionsTableModel}; editable: {states.isEnabled()}; - _notBlocking: true; } #basketsPane { @@ -94,7 +93,6 @@ #basketsTable { model: {basketsTableModel}; editable: {states.isEnabled()}; - _notBlocking: true; } #branchlinesPane { @@ -109,7 +107,6 @@ #branchlinesTable { model: {branchlinesTableModel}; editable: {states.isEnabled()}; - _notBlocking: true; } /* ***************************************************************************** */ ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss ===================================== @@ -34,8 +34,4 @@ #mapTab { enabled:{!states.isCreatingMode()}; -} - -#tripMap { - _notBlocking:true; -} +} \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e473bd86fa64ad8cd31e53c2cd... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e473bd86fa64ad8cd31e53c2cd... You're receiving this email because of your account on gitlab.com.