Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6c360637 by tchemit at 2019-05-27T11:33:56Z [LL] Pas d'alertes dans les onglets - Closes #1296 - - - - - 15 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineContentTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/TripLonglineSampleLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss - pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java ===================================== @@ -225,6 +225,8 @@ public class ContentUIInitializer<UI extends ContentUI> { ui.getActionMap().setParent(actionMap); ui.setInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW, inputMap); + ImmutableMap.Builder<String, JAXXValidator> extraTabUIBuilder = ImmutableMap.builder(); + Set<Object> done = new LinkedHashSet<>(); for (String name : ui.get$objectMap().keySet()) { Object o = ui.getObjectById(name); @@ -305,11 +307,6 @@ public class ContentUIInitializer<UI extends ContentUI> { init(ui, (ObserveSwingValidator<?>) o); continue; } - - if (o instanceof JTabbedPane) { - init((JTabbedPane) o); - continue; - } if (o instanceof JLabel) { init((JLabel) o); continue; @@ -330,12 +327,26 @@ public class ContentUIInitializer<UI extends ContentUI> { init((NormalTextEditor) o); continue; } + if (o instanceof ContentUI) { + init((ContentUI) o, extraTabUIBuilder); + continue; + } if (o instanceof Table) { init((Table) o); } } + // second pass to init JTabbedPane + ImmutableMap<String, JAXXValidator> extraTabUis = extraTabUIBuilder.build(); + for (String name : ui.get$objectMap().keySet()) { + Object o = ui.getObjectById(name); + + if (o instanceof JTabbedPane) { + init((JTabbedPane) o,extraTabUis); + } + } + if (!doNotBlockComponentIds.isEmpty()) { String[] acceptedComponentNames = doNotBlockComponentIds.toArray(new String[0]); initBlockLayerUI(acceptedComponentNames); @@ -431,6 +442,16 @@ public class ContentUIInitializer<UI extends ContentUI> { } } + protected void init(ContentUI editor, ImmutableMap.Builder<String, JAXXValidator> extraTabUIBuilder) { + if (editor instanceof JAXXValidator) { + String tab = (String) editor.getClientProperty("tab"); + if (tab != null) { + extraTabUIBuilder.put(tab, (JAXXValidator) editor); + } + } + + } + protected void initBlockLayerUI(String... doNotBlockComponentIds) { ui.getBlockLayerUI().setAcceptedComponentTypes(ObserveMapPane.class, JScrollBar.class); ui.getBlockLayerUI().setAcceptedComponentNames(doNotBlockComponentIds); @@ -707,9 +728,9 @@ public class ContentUIInitializer<UI extends ContentUI> { addAutoSelectOnFocus(hourEditor.getTextField()); } - protected void init(JTabbedPane tabbedPane) { + protected void init(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { if (GoToTabUIActionSupport.MAIN_TABBED_PANE.equals(tabbedPane.getName())) { - initMainTabbedPane(tabbedPane); + initMainTabbedPane(tabbedPane,extraTabUis); return; } if (GoToTabUIActionSupport.SUB_TABBED_PANE.equals(tabbedPane.getName())) { @@ -717,7 +738,7 @@ public class ContentUIInitializer<UI extends ContentUI> { } } - protected void initMainTabbedPane(JTabbedPane tabbedPane) { + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { int tabCount = tabbedPane.getTabCount(); InputMap inputMap = ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.edit; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport; import fr.ird.observe.client.ui.content.api.ContentUIInitializer; import org.nuiton.jaxx.validator.JAXXValidator; @@ -45,15 +46,15 @@ public class ContentEditUIInitializer<UI extends ContentEditUI> extends ContentU } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope( NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab(extraTabUis).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.open; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport; import fr.ird.observe.client.ui.content.api.ContentUIInitializer; import org.nuiton.jaxx.validator.JAXXValidator; @@ -29,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.tab.JTabbedPaneValidator; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JTabbedPane; +import java.util.Map; /** * To initialize ui. @@ -45,15 +47,15 @@ public class ContentOpenableUIInitializer<UI extends ContentOpenableUI> extends } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.simple; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport; import fr.ird.observe.client.ui.content.api.ContentUIInitializer; import org.nuiton.jaxx.validator.JAXXValidator; @@ -29,6 +30,7 @@ import org.nuiton.jaxx.validator.swing.tab.JTabbedPaneValidator; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JTabbedPane; +import java.util.Map; /** * To initialize ui. @@ -45,15 +47,15 @@ public class ContentSimpleUIInitializer<UI extends ContentSimpleUI> extends Cont } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.data.table; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; @@ -41,6 +42,7 @@ import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.table.DefaultTableCellRenderer; import java.awt.BorderLayout; +import java.util.Map; import static io.ultreia.java4all.i18n.I18n.n; @@ -69,15 +71,15 @@ public class ContentTableUIInitializer<D extends DataDto, C extends DataDto, U e } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).addExtraTab((Map)extraTabUis).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIInitializer.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.api.ref; * #L% */ +import com.google.common.collect.ImmutableMap; import fr.ird.observe.client.ui.actions.content.api.tab.GoToTabUIActionSupport; import fr.ird.observe.client.ui.content.api.ContentUIInitializer; import fr.ird.observe.dto.reference.ReferentialDtoReference; @@ -58,15 +59,15 @@ public class ContentReferenceUIInitializer<E extends ReferentialDto, R extends R } @Override - protected void initMainTabbedPane(JTabbedPane tabbedPane) { - super.initMainTabbedPane(tabbedPane); - tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + protected void initMainTabbedPane(JTabbedPane tabbedPane, ImmutableMap<String, JAXXValidator> extraTabUis) { + super.initMainTabbedPane(tabbedPane, extraTabUis); + tabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.MAIN_TABBED_PANE).addScope( NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } @Override protected void initSubTabbedPane(JTabbedPane tabbedPane) { super.initSubTabbedPane(tabbedPane); - subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE, NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING); + subTabbedPaneValidator = JTabbedPaneValidator.builder((JAXXValidator) ui, GoToTabUIActionSupport.SUB_TABBED_PANE).addScope(NuitonValidatorScope.ERROR, NuitonValidatorScope.WARNING).build(); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineContentTableModel.java ===================================== @@ -57,7 +57,6 @@ public class LandingPartLonglineContentTableModel extends ContentTableModel<Land parent.setLandingPart(childs); } - @Override protected SwingValidator<LandingLonglineDto> getParentValidator() { return parentUI.getValidator(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartLonglineUIHandler.java ===================================== @@ -23,7 +23,7 @@ package fr.ird.observe.client.ui.content.data.ll.landing; */ import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler; +import fr.ird.observe.client.ui.content.api.data.table.NotStandaloneContentTableUIHandler; import fr.ird.observe.client.ui.content.api.spi.ContentUIReferenceCache; import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy; import fr.ird.observe.client.ui.util.UIHelper; @@ -47,7 +47,7 @@ import static io.ultreia.java4all.i18n.I18n.n; * @author Tony Chemit - dev@tchemit.fr * @since 3.7 */ -public class LandingPartLonglineUIHandler extends ContentTableUIHandler<LandingLonglineDto, LandingPartLonglineDto, LandingPartLonglineUI> implements UIHandler<LandingPartLonglineUI> { +public class LandingPartLonglineUIHandler extends NotStandaloneContentTableUIHandler<LandingLonglineDto, LandingPartLonglineDto, LandingPartLonglineUI> implements UIHandler<LandingPartLonglineUI> { private static final Logger log = LogManager.getLogger(LandingPartLonglineUIHandler.class); @@ -127,16 +127,6 @@ public class LandingPartLonglineUIHandler extends ContentTableUIHandler<LandingL UIHelper.askFocus(ui.getSpecies()); } - @Override - public void doPersist(LandingLonglineDto bean) { - // not a standalone ui - } - - @Override - protected void loadEditBean(String beanId) { - // not a standalone ui - } - @Override public void startEditUI() { ui.getValidatorTable().setParentValidator(ui.getValidator()); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jaxx ===================================== @@ -159,7 +159,7 @@ <tab id='landingPartTab' i18nProperty=""> <JPanel id="landingPartPanel" layout='{new BorderLayout()}'> - <LandingPartLonglineUIImpl id="LandingPartLonglineUI" constructorParams="this"/> + <LandingPartLonglineUIImpl id="landingPartLonglineUI" constructorParams="this"/> </JPanel> </tab> </JTabbedPane> @@ -176,6 +176,6 @@ <JButton id='move'/> <Object id="delegateContentUI" initializer="mainTabbedPane"/> - <LandingPartLonglineUIModel id="landingPartModel" initializer="LandingPartLonglineUI.getModel()"/> + <LandingPartLonglineUIModel id="landingPartModel" initializer="landingPartLonglineUI.getModel()"/> </fr.ird.observe.client.ui.content.api.data.open.ContentOpenableUI> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss ===================================== @@ -44,6 +44,10 @@ /* LANDING PART TAB *********************************************************** */ /* ***************************************************************************** */ +#landingPartLonglineUI { + _tab:{"landingPartTab"}; +} + #comment { title:"observe.common.TripLonglineLandingDto.comment"; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/LonglineGlobalCompositionLogbookUI.jcss ===================================== @@ -34,3 +34,19 @@ mitigationType { universeLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineLogbookGlobalCompositionDto.selectedMitigationType")}; } + +#floatlinesCompositionUI { + _tab:{"floatlinesCompositionTab"}; +} + +#branchlinesCompositionUI { + _tab:{"branchlinesCompositionTab"}; +} + +#hooksCompositionUI { + _tab:{"hooksCompositionTab"}; +} + +#baitsCompositionUI { + _tab:{"baitsCompositionTab"}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/TripLonglineSampleLogbookUI.jcss ===================================== @@ -44,6 +44,10 @@ /* SAMPLE PART TAB ************************************************************ */ /* ***************************************************************************** */ +#samplePartLogbookUI { + _tab:{"samplePartLogbookTab"}; +} + #comment { title:"observe.common.TripLonglineSampleLogbookDto.comment"; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jcss ===================================== @@ -191,3 +191,7 @@ #branchlineDetailTab { enabled: {compositionTab.isEnabled() && model.isCompositionTabValid() && !branchlinesTableModel.isSelectionEmpty()}; } + +#branchlineDetailUI { + _tab:{"branchlineDetailTab"}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineGlobalCompositionObsUI.jcss ===================================== @@ -34,3 +34,19 @@ universeLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.availableMitigationType")}; selectedLabel:{t("observe.common.SetLonglineObsGlobalCompositionDto.selectedMitigationType")}; } + +#floatlinesCompositionUI { + _tab:{"floatlinesCompositionTab"}; +} + +#branchlinesCompositionUI { + _tab:{"branchlinesCompositionTab"}; +} + +#hooksCompositionUI { + _tab:{"hooksCompositionTab"}; +} + +#baitsCompositionUI { + _tab:{"baitsCompositionTab"}; +} ===================================== pom.xml ===================================== @@ -163,7 +163,7 @@ <!--lib.version.java4all.topia>1.8</lib.version.java4all.topia--> <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>--> - <lib.version.java4all.jaxx>3.0-alpha-51</lib.version.java4all.jaxx> + <lib.version.java4all.jaxx>3.0-alpha-52-SNAPSHOT</lib.version.java4all.jaxx> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>--> <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>--> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6c3606377109b352723b9217c279... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6c3606377109b352723b9217c279... You're receiving this email because of your account on gitlab.com.