December 2019 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 4 commits: Review focus management (but there is still some work to do on it...)
by Tony CHEMIT 30 Dec '19

30 Dec '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 17f1a652 by tchemit at 2019-12-30T09:42:25+01:00 Review focus management (but there is still some work to do on it...) - - - - - 8319cfd6 by tchemit at 2019-12-30T09:58:49+01:00 update pom - - - - - 3e9781c4 by tchemit at 2019-12-30T10:13:32+01:00 use last toolkit - - - - - dcb05dc8 by tchemit at 2019-12-30T10:29:16+01:00 update license header - - - - - 30 changed files: - client-api-admin/pom.xml - client-api-admin/src/main/i18n/templates/validationReport_en_GB.ftl - client-api-admin/src/main/i18n/templates/validationReport_es_ES.ftl - client-api-admin/src/main/i18n/templates/validationReport_fr_FR.ftl - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminActionModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminActionWorker.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jcss - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jcss - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/AdminTabUIActionSupport.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/AdminUIActionSupport.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/Cancel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/Close.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/CopyToClipBoard.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/NextStep.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/PreviousStep.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/SelectData.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jcss - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5bcbcd8fd04d72f74018dbb332… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5bcbcd8fd04d72f74018dbb332… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] More fix on actions and content
by Tony CHEMIT 18 Dec '19

18 Dec '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5bcbcd8f by tchemit at 2019-12-18T20:15:54+01:00 More fix on actions and content - - - - - 30 changed files: - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBodyContent.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/AdminTabUIActionSupport.java - client-api-mainui/src/main/java/fr/ird/observe/client/ui/main/MainUI.java - client-api-mainui/src/main/java/fr/ird/observe/client/ui/main/MainUIBodyContent.java - client-api-mainui/src/main/java/fr/ird/observe/client/ui/main/MainUIBodyContentManager.java - + client-api-util/src/main/java/fr/ird/observe/client/api/util/JMenuWithAccelerator.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/CommonTable.jcss - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingPartUIHandler.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/BranchlinesCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/FloatlinesCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/HooksCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/main/ClientConfigBodyContent.java - + client-core/src/main/java/fr/ird/observe/client/ui/main/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/ui/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/main/actions/ShowConfigAction.java - client-datasource-api/pom.xml - client-datasource-api/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-datasource-api/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/MainDataSourceListener.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/actions/ChangeFocusGlobalUIAction.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5bcbcd8fd04d72f74018dbb332c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5bcbcd8fd04d72f74018dbb332c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] More fix on actions and content
by Tony CHEMIT 18 Dec '19

18 Dec '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a924f83f by tchemit at 2019-12-18T19:13:21+01:00 More fix on actions and content - - - - - 30 changed files: - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBodyContent.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/actions/AdminTabUIActionSupport.java - client-api-mainui/src/main/java/fr/ird/observe/client/ui/main/MainUI.java - client-api-mainui/src/main/java/fr/ird/observe/client/ui/main/MainUIBodyContent.java - client-api-mainui/src/main/java/fr/ird/observe/client/ui/main/MainUIBodyContentManager.java - + client-api-util/src/main/java/fr/ird/observe/client/api/util/JMenuWithAccelerator.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingPartUIHandler.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/BranchlinesCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIModel.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/FloatlinesCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/HooksCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/main/ClientConfigBodyContent.java - + client-core/src/main/java/fr/ird/observe/client/ui/main/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/ui/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/main/ObserveMainUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/main/actions/ShowConfigAction.java - client-datasource-api/pom.xml - client-datasource-api/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-datasource-api/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/MainDataSourceListener.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/actions/ChangeFocusGlobalUIAction.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/ContentUIActionSupport.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/menu/DataSourceEditorMenuModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a924f83f2436d7e2904eda164d3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a924f83f2436d7e2904eda164d3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Make select data works again
by Tony CHEMIT 16 Dec '19

16 Dec '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d10bbc2e by tchemit at 2019-12-16T17:04:20+01:00 Make select data works again Make some actions works again (still have some work to do on it) - - - - - 30 changed files: - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBodyContent.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/menu/actions/LaunchAdminActionSupport.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jcss - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchronizeTaskListModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/Apply.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterAddTask.java - − client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterAddTaskLeft.java - − client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterAddTaskRight.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterCopyTask.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterDeleteTask.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterDesactivateAndReplaceTaskLeft.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterDesactivateTask.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterDesactivateTaskLeft.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterRevertTask.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterSkipTask.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterTasksActionSupport.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterUpdateTask.java - − client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/actions/RegisterUpdateTaskRight.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d10bbc2e99b6e7aeec772d0c586… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d10bbc2e99b6e7aeec772d0c586… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Make select data works again
by Tony CHEMIT 16 Dec '19

16 Dec '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 72663de4 by tchemit at 2019-12-16T11:44:48+01:00 Make select data works again Make some actions works again (still have some work to do on it) - - - - - 27 changed files: - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBodyContent.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUIHandler.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/menu/actions/LaunchAdminActionSupport.java - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jaxx - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jcss - client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java - client-api-util/src/main/java/fr/ird/observe/client/api/util/ObserveKeyStrokesSupport.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/SelectDataUIHandler.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTree.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreeCellRenderer.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreeModel.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreePane.jaxx - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreePane.jcss - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreePaneHandler.java - + client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/actions/SelectUnselect.java - + client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/actions/SelectUnselectWithOpposite.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/ProgramSelectionTreeNode.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/ReferentialsSelectionTreeNode.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/RootSelectionTreeNode.java - client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/SelectionTreeNodeSupport.java - pom.xml Changes: ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBodyContent.java ===================================== @@ -63,9 +63,6 @@ public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements Wi /** the jaxx context entry to store the cancel action */ public static final JAXXContextEntryDef<Runnable> CANCEL_DEF = JAXXUtil.newContextEntryDef("cancel", Runnable.class); - private AdminUIMenu menu; - - public AdminUIBodyContent() { super(3, AdminUI.class); setSupplier(SingletonSupplier.of(createSupplier())); @@ -74,7 +71,7 @@ public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements Wi @Override public void install(MainUI mainUI) { super.install(mainUI); - menu = new AdminUIMenu(UIHelperSupport.initialContext((JAXXObject) mainUI, mainUI.getModel())); + AdminUIMenu menu = new AdminUIMenu(UIHelperSupport.initialContext((JAXXObject) mainUI, mainUI.getModel())); JMenuBar menuBar = mainUI.getMenu(); menuBar.add(menu, 2); } @@ -82,12 +79,53 @@ public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements Wi @Override public void show(MainUI mainUI) { super.show(mainUI); + + AdminUI ui = get(); + + AdminUIModel adminUIModel = ui.getModel(); + mainUI.setContextValue(adminUIModel); + + adminUIModel.addOperation(adminUIModel.getAdminStep()); + adminUIModel.updateStepUniverse(); + + ui.start(); + // refresh selected tab (otherwise it does NOT display (white screen...) + SwingUtilities.invokeLater(() -> { + ui.getTabs().getSelectedComponent().validate(); + ui.getTabs().getSelectedComponent().requestFocusInWindow(); + }); } @Override public void hide(MainUI mainUI) throws HideBodyContentNotAcceptedException { + + AdminUI ui = get(); + AdminUIModel model = ui.getModel(); + + ConfigModel.doCloseSource(model.getConfigModel().getCentralSourceModel().getSource()); + ConfigModel.doCloseSource(model.getConfigModel().getLocalSourceModel().getSource()); + + model.destroy(); + + ui.destroy(); + ui.dispose(); + + //FIXME:BodyContent find a way to start mainUIBodyContent in a simplified ui JDialog +// if (!(parent instanceof MainUI)) { +// JDialog dialog = (JDialog) parent; +// log.info("dispose ui!"); +// dialog.setVisible(false); +// dialog.dispose(); +// log.info("After dispose."); +// ApplicationContext.get().releaseLock(); +// return; +// } + + mainUI.removeContextValue(model.getClass()); + + ObserveUtil.cleanMemory(); + super.hide(mainUI); - doClose(get().getModel().isWasCanceled()); } private Supplier<AdminUI> createSupplier() { @@ -95,27 +133,16 @@ public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements Wi MainUI mainUI = getClientUIContext().getMainUI(); AdminStep adminStep = mainUI.getContextValue(AdminStep.class); AdminUIModel model = new AdminUIModel(Objects.requireNonNull(adminStep)); - JAXXInitialContext uiContext = new JAXXInitialContext(); - uiContext.add(mainUI); - // parent context model - uiContext.add(model); + JAXXInitialContext uiContext = UIHelperSupport.initialContext((JAXXObject) mainUI, model); //FIXME:BodyContent Review jaxx to remove this... // apply action uiContext.add(APPLY_DEF, () -> { -// try { -// doAction(ui); -// } finally { doClose(false); -// } }); // cancel action uiContext.add(CANCEL_DEF, () -> { -// try { -// doCancel(ui); -// } finally { doClose(true); -// } }); return new AdminUI(uiContext); }; @@ -127,35 +154,11 @@ public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements Wi AdminUI ui = get(); AdminUIModel model = ui.getModel(); - ConfigModel.doCloseSource(model.getConfigModel().getCentralSourceModel().getSource()); - ConfigModel.doCloseSource(model.getConfigModel().getLocalSourceModel().getSource()); - - model.destroy(); - ui.dispose(); - -// if (!(parent instanceof MainUI)) { -// JDialog dialog = (JDialog) parent; -// log.info("dispose ui!"); -// dialog.setVisible(false); -// dialog.dispose(); -// log.info("After dispose."); -// ApplicationContext.get().releaseLock(); -// return; -// } - MainUI mainUI = getClientUIContext().getMainUI(); - mainUI.removeContextValue(model.getClass()); - - //FIXME:BodyContent -// mainUI.getSynchroWizard().remove(ui); - - ObserveUtil.cleanMemory(); ObserveSwingDataSource source = model.getConfigModel().getPreviousSource(); - //FIXME:BodyContent if (source == null) { - // pas de service auparavant mainUI.changeBodyContent(NoBodyContent.NoBodyContentComponent.class); return; @@ -163,6 +166,7 @@ public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements Wi try { + //FIXME:BodyContent now source is not linked to ui, maybe we could be able to do this in a better way ConfigModel.doCloseSource(source); // on attache la source a l'ui @@ -181,42 +185,4 @@ public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements Wi } } - protected void start() { - AdminUI ui = get(); - - MainUI mainUI = getClientUIContext().getMainUI(); - - String title = (String) ui.getClientProperty("title"); - -// if (mainUI == null) { -// -// // pas de fenetre detectee -// // on encapsule l'ui dans un dialog -// -// JDialog dialog = (JDialog) parent; -// dialog.setTitle(t(title)); -// dialog.setContentPane(ui); -//// dialog.pack(); -// dialog.setVisible(true); -// log.debug("After dispay dialog"); -// } else { - - // on attache dans la fenetre principale - String tip = (String) ui.getClientProperty("tip"); - - //FIXME:BodyContent Hum use neutral mainUI body content -// JXTitledPanel panel = mainUI.getSynchroWizard(); -// panel.setTitle(t(title)); -// panel.setToolTipText(t(tip)); -// panel.setContentContainer(ui); - mainUI.setContextValue(ui.getModel()); -// mainUI.getModel().setMode(ObserveUIMode.SYNCHRO); - - // refresh selected tab (otherwise it does NOT display (white screen...) - SwingUtilities.invokeLater(() -> { - ui.getTabs().getSelectedComponent().validate(); - ui.getTabs().getSelectedComponent().requestFocusInWindow(); - }); -// } - } } ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java ===================================== @@ -189,7 +189,7 @@ public class AdminUIHandler implements UIHandler<AdminUI>, WithClientUIContext { String title = I18nEnumHelper.getLabel(step); String tip = I18nEnumHelper.getDescription(step); ui.tabs.addTab(title, null, c, tip); - c.setEnabled(i == 0); +// c.setEnabled(i == 0); } ui.getModel().setValueAdjusting(false); ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java ===================================== @@ -77,9 +77,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { this.adminStep = Objects.requireNonNull(adminStep); this.availableIncomingModes = EnumSet.noneOf(DbMode.class); this.listenStepChanged = this::onStepChanged; - addOperation(adminStep); - updateStepUniverse(); - log.debug(String.format("model [%s] is instantiated.", this)); } ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java ===================================== @@ -81,10 +81,9 @@ public class SelectDataModel extends AdminActionModel { // on remplit le modèle de sélection uniquement avec le bon type de marées ReportModel reportModel = uiModel.getReportModel(); ObserveModelType reportType = reportModel.getModelType(); - boolean loadSeineTrip = ObserveModelType.PS == reportType; - selectionDataModel.setLoadLongline(!loadSeineTrip); - selectionDataModel.setLoadSeine(loadSeineTrip); + selectionDataModel.setLoadLongline(ObserveModelType.LL == reportType); + selectionDataModel.setLoadSeine(ObserveModelType.PS == reportType); selectAllTrips = false; @@ -208,14 +207,9 @@ public class SelectDataModel extends AdminActionModel { selectionModel.addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, evt -> { SelectionTreeModel source = (SelectionTreeModel) evt.getSource(); - if (log.isDebugEnabled()) { - log.debug(String.format("selection data model [%s] changed on %s, new value = %s", - source, evt.getPropertyName(), evt.getNewValue())); - } + log.debug(String.format("selection data model [%s] changed on %s, new value = %s", source, evt.getPropertyName(), evt.getNewValue())); uiModel.validate(); - if (log.isDebugEnabled()) { - log.debug("nb selected export datas = " + source.getSelectedCount()); - } + log.debug("nb selected export datas = " + source.getSelectedCount()); }); } ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jaxx ===================================== @@ -27,6 +27,6 @@ </import> <SelectDataModel id='stepModel' initializer='getModel().getSelectDataModel()'/> <JPanel id='PENDING_content' layout="{new BorderLayout()}"> - <SelectionTreePane id='selectTreePane'/> + <SelectionTreePane id='selectTreePane' decorator='boxed' constraints='BorderLayout.CENTER'/> </JPanel> </fr.ird.observe.client.ui.admin.AdminTabUI> ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUIHandler.java ===================================== @@ -37,7 +37,7 @@ public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> impleme @Override public void afterInit(SelectDataUI ui) { - super.afterInit(this.ui); + super.afterInit(ui); UIHelperSupport.setLayerUI(ui.getContent(), null); UIHelperSupport.setLayerUI(ui.getSelectTreePane(), parentUI.getConfigBlockLayerUI()); @@ -45,9 +45,9 @@ public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> impleme SelectionTree tree = ui.getSelectTreePane().getTree(); getModel().getSelectDataModel().setSelectionDataModel(tree.getTreeModel()); - tree.installUI(); + tree.installUI(ui.getSelectTreePane()); //FIXME Init tree ? -// UIHelperSupport.initUI(tabUI.getSelectTreePane(), tree); +// UIHelperSupport.initUI(ui.getSelectTreePane(), tree); } } ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/menu/actions/LaunchAdminActionSupport.java ===================================== @@ -68,7 +68,7 @@ public abstract class LaunchAdminActionSupport extends AdminUIMenuActionSupport MainUI mainUI = getClientUIContext().getMainUI(); mainUI.setContextValue(action); try { - mainUI.getMainUIBodyContentManager().changeCurrentBody(AdminUI.class); + mainUI.changeBodyContent(AdminUI.class); } finally { mainUI.removeContextValue(AdminStep.class); } ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jaxx ===================================== @@ -54,15 +54,15 @@ <cell weightx="0.1"> <JPanel layout="{new BorderLayout()}" border='{new TitledBorder(" ")}'> <JPanel id="middleActions" layout="{new GridLayout(0, 2)}" constraints='BorderLayout.CENTER'> - <JButton id="copyFromLeft"/> - <JButton id="copyFromRight"/> - <JButton id="deleteFromLeft"/> - <JButton id="deleteFromRight"/> + <JButton id="copyFromLeft" styleClass="disabled"/> + <JButton id="copyFromRight" styleClass="disabled"/> + <JButton id="deleteFromLeft" styleClass="disabled"/> + <JButton id="deleteFromRight" styleClass="disabled"/> </JPanel> </JPanel> </cell> <cell weightx="0.45"> - <SelectionTreePane id="rightTreePane"/> + <SelectionTreePane id="rightTreePane" constructorParams="true"/> </cell> </row> </Table> ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jcss ===================================== @@ -33,24 +33,6 @@ resizeWeight: 0.8; } -#leftTree { - minimumSize:{UIHelperSupport.newMinDimension()}; - font-size:11; -} - -#leftTreePane { - verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; -} - -#rightTree { - minimumSize:{UIHelperSupport.newMinDimension()}; - font-size:11; -} - -#rightTreePane { - verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; -} - #copyToLeft { enabled:false; } ===================================== client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java ===================================== @@ -53,7 +53,6 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple leftSelectionDataModel.setLoadReferential(false); leftSelectionDataModel.setShowEmptyTrips(false); - SelectionTree rightTree = ui.getRightTreePane().getTree(); SelectionTreeModel rightSelectionDataModel = rightTree.getTreeModel(); stepModel.setRightSelectionDataModel(rightSelectionDataModel); @@ -62,26 +61,22 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple rightSelectionDataModel.setLoadReferential(false); rightSelectionDataModel.setShowEmptyTrips(false); + //FIXME:BodyContent verifier que cela fonctionne bien... // on n'installe qu'une seule fois l'ui - leftTree.installUI2(rightTree); + leftTree.installUI2(ui.getLeftTreePane(), ui.getRightTreePane()); stepModel.getLeftSelectionDataModel().addPropertyChangeListener(evt -> { - SelectionTreeModel model = (SelectionTreeModel) evt.getSource(); boolean withDataSelected = !model.isSelectionEmpty(); - ui.getCopyFromLeft().setEnabled(withDataSelected); ui.getDeleteFromLeft().setEnabled(withDataSelected); }); stepModel.getRightSelectionDataModel().addPropertyChangeListener(evt -> { - SelectionTreeModel model = (SelectionTreeModel) evt.getSource(); boolean withDataSelected = !model.isSelectionEmpty(); - ui.getCopyFromRight().setEnabled(withDataSelected); ui.getDeleteFromRight().setEnabled(withDataSelected); - }); stepModel.getProgressModel().installUI(ui.getProgressBar()); ===================================== client-api-util/src/main/java/fr/ird/observe/client/api/util/ObserveKeyStrokesSupport.java ===================================== @@ -59,10 +59,10 @@ public abstract class ObserveKeyStrokesSupport { public static final KeyStroke KEY_STROKE_CANCEL = KeyStroke.getKeyStroke("alt pressed A"); public static final KeyStroke KEY_STROKE_EXIT = KeyStroke.getKeyStroke("alt pressed F"); - public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_COPY_FROM_LEFT = KeyStroke.getKeyStroke("alt pressed C"); - public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_DELETE_FROM_LEFT = KeyStroke.getKeyStroke("alt pressed D"); - public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_COPY_FROM_RIGHT = KeyStroke.getKeyStroke("shift alt pressed C"); - public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_DELETE_FROM_RIGHT = KeyStroke.getKeyStroke("shift alt pressed D"); + public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_COPY_FROM_LEFT = KeyStroke.getKeyStroke("ctrl pressed C"); + public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_DELETE_FROM_LEFT = KeyStroke.getKeyStroke("ctrl pressed D"); + public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_COPY_FROM_RIGHT = KeyStroke.getKeyStroke("shift ctrl pressed C"); + public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_DELETE_FROM_RIGHT = KeyStroke.getKeyStroke("shift ctrl pressed D"); public static final KeyStroke KEY_STROKE_STORAGE_DO_CONFIGURE_REMOTE = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_STORAGE_DO_CONFIGURE_SERVER = KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK); ===================================== client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java ===================================== @@ -122,7 +122,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi try { dataSource.close(); } finally { - getClientUIContext().getMainUI().changeBodyContent(NoBodyContent.NoBodyContentComponent.class); + mainUI.changeBodyContent(NoBodyContent.NoBodyContentComponent.class); } } @@ -180,7 +180,6 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi ObserveEditModelApplicationComponent.value().load(navigationEditModel); } -// navigationMenu.getUiModel().setConfig(null); navigationMenu.getUiModel().setConfig(get().getNavigationUI().getNavigationConfig()); get().getHandler().loadNavigationUI(dataSource, progressModel); ===================================== client-datasource-editor/src/main/java/fr/ird/observe/client/datasource/editor/wizard/tabs/SelectDataUIHandler.java ===================================== @@ -42,6 +42,6 @@ class SelectDataUIHandler extends StorageTabUIHandler<SelectDataUI> implements U description = ObserveKeyStrokesSupport.suffixTextWithKeyStroke(description, ObserveKeyStrokesSupport.KEY_STROKE_ENTER); ui.setDescriptionText(description); } - ui.getSelectedTreePane().getTree().installUI(); + ui.getSelectedTreePane().getTree().installUI(ui.getSelectedTreePane()); } } ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTree.java ===================================== @@ -10,30 +10,24 @@ package fr.ird.observe.client.datasource.tree.selection; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -import fr.ird.observe.client.api.util.ObserveKeyStrokesSupport; import fr.ird.observe.client.api.util.UIHelperSupport; -import fr.ird.observe.client.datasource.tree.selection.nodes.SelectionTreeNodeSupport; +import fr.ird.observe.client.datasource.tree.selection.actions.SelectUnselect; +import fr.ird.observe.client.datasource.tree.selection.actions.SelectUnselectWithOpposite; import org.jdesktop.swingx.JXTree; -import javax.swing.AbstractAction; -import javax.swing.ActionMap; -import javax.swing.InputMap; import javax.swing.tree.TreeSelectionModel; -import java.awt.event.ActionEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; /** * Created on 14/11/16. @@ -54,90 +48,54 @@ public class SelectionTree extends JXTree { setToggleClickCount(100); } - public void installUI() { + public void installUI(SelectionTreePane parent) { + SelectUnselect.init(parent, null, SelectUnselect.class); + } - getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "none"); -// getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SELECT_ALL_TREE, "none"); -// getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_UNSELECT_ALL_TREE, "none"); - InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); - ActionMap actionMap = getActionMap(); - inputMap.put(ObserveKeyStrokesSupport.KEY_STROKE_ENTER, "select/unselect"); - inputMap.put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "select/unselect"); - actionMap.put("select/unselect", new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - selectUnSelect(SelectionTree.this); - } - }); + public void installUI2(SelectionTreePane parent, SelectionTreePane oppositeTree) { - addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) { - selectUnSelect(SelectionTree.this); - } - } - }); - } + SelectUnselectWithOpposite.init(parent, null, new SelectUnselectWithOpposite(oppositeTree)); - public void installUI2(SelectionTree oppositeTree) { +// InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); +// ActionMap actionMap = getActionMap(); +// getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "none"); +// oppositeTree.getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "none"); - InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); - ActionMap actionMap = getActionMap(); - getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "none"); // getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SELECT_ALL_TREE, "none"); // getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_UNSELECT_ALL_TREE, "none"); - oppositeTree.getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "none"); // oppositeTree.getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SELECT_ALL_TREE, "none"); // oppositeTree.getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_UNSELECT_ALL_TREE, "none"); - inputMap.put(ObserveKeyStrokesSupport.KEY_STROKE_ENTER, "select/unselect"); - inputMap.put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "select/unselect"); - actionMap.put("select/unselect", new AbstractAction() { - - @Override - public void actionPerformed(ActionEvent e) { - selectUnSelectWithOpposite(oppositeTree); - } - }); - addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) { - selectUnSelectWithOpposite(oppositeTree); - } - } - }); - oppositeTree.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - if (e.getClickCount() == 2) { - oppositeTree.selectUnSelectWithOpposite(SelectionTree.this); - } - } - }); - } - - private void selectUnSelectWithOpposite(SelectionTree oppositeTree) { - if (isFocusOwner()) { - selectUnSelect(SelectionTree.this); - } else { - selectUnSelect(oppositeTree); - } +// inputMap.put(ObserveKeyStrokesSupport.KEY_STROKE_ENTER, "select/unselect"); +// inputMap.put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "select/unselect"); +// actionMap.put("select/unselect", new AbstractAction() { +// +// @Override +// public void actionPerformed(ActionEvent e) { +// selectUnSelectWithOpposite(oppositeTree); +// } +// }); +// addMouseListener(new MouseAdapter() { +// @Override +// public void mouseClicked(MouseEvent e) { +// if (e.getClickCount() == 2) { +// selectUnSelectWithOpposite(oppositeTree); +// } +// } +// }); +// oppositeTree.addMouseListener(new MouseAdapter() { +// @Override +// public void mouseClicked(MouseEvent e) { +// if (e.getClickCount() == 2) { +// oppositeTree.selectUnSelectWithOpposite(SelectionTree.this); +// } +// } +// }); } public SelectionTreeModel getTreeModel() { return (SelectionTreeModel) getModel(); } - private void selectUnSelect(SelectionTree tree) { - Object selectedRow = tree.getLastSelectedPathComponent(); - if (selectedRow == null) { - return; - } - - SelectionTreeNodeSupport<?> node = (SelectionTreeNodeSupport) selectedRow; - tree.getTreeModel().setValueAt(node, !node.isSelected()); - } } ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreeCellRenderer.java ===================================== @@ -63,13 +63,13 @@ public class SelectionTreeCellRenderer extends DefaultXTreeCellRenderer { selected.setSelectedIcon(selectedIcon); } - public Icon getIcon(SelectionTreeNodeSupport node) { + public Icon getIcon(SelectionTreeNodeSupport<?> node) { return node.getIcon(); } @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { - SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) value; + SelectionTreeNodeSupport<?> node = (SelectionTreeNodeSupport<?>) value; Icon icon = getIcon(node); super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); setIcon(icon); ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreeModel.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.datasource.tree.selection; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -238,6 +238,7 @@ public class SelectionTreeModel extends DefaultTreeModel { return builder.build(); } + @SuppressWarnings({"unchecked", "rawtypes"}) public Map<ProgramReference, List<? extends TripReference>> getSelectedDataByProgram() { ImmutableList.Builder<TripSelectionTreeNodeSupport<?, ?>> builder = ImmutableList.builder(); getRoot().collectSelectedTripNodes(builder); @@ -251,7 +252,7 @@ public class SelectionTreeModel extends DefaultTreeModel { public void removeProgram(String programId) { RootSelectionTreeNode rootNode = getRoot(); - SelectionTreeNodeSupport result = rootNode.findById(programId); + SelectionTreeNodeSupport<?> result = rootNode.findById(programId); Objects.requireNonNull(result, "Could not find program node with id: " + programId); removeNodeFromParent(result); } @@ -259,9 +260,9 @@ public class SelectionTreeModel extends DefaultTreeModel { public void removeTrip(ProgramReference program, TripReference trip) { RootSelectionTreeNode rootNode = getRoot(); - SelectionTreeNodeSupport programNode = rootNode.findById(program.getId()); + SelectionTreeNodeSupport<?> programNode = rootNode.findById(program.getId()); Objects.requireNonNull(programNode, "Could not find program node with id: " + program); - SelectionTreeNodeSupport tripNode = programNode.findById(trip.getId()); + SelectionTreeNodeSupport<?> tripNode = programNode.findById(trip.getId()); Objects.requireNonNull(tripNode, "Could not find program node with id: " + trip); removeNodeFromParent(tripNode); @@ -271,7 +272,7 @@ public class SelectionTreeModel extends DefaultTreeModel { } public boolean containsData(ProgramReference program, TripReference trip) { - ReferenceSelectionTreeNodeSupport programNode = getRoot().findById(program.getId()); + ReferenceSelectionTreeNodeSupport<?, ?> programNode = getRoot().findById(program.getId()); return programNode != null && programNode.findById(trip.getId()) != null; } @@ -280,6 +281,10 @@ public class SelectionTreeModel extends DefaultTreeModel { getRoot().collectSelectedTripNodes(builder); for (TripSelectionTreeNodeSupport<?, ?> tripNode : builder.build()) { ProgramSelectionTreeNode programNode = tripNode.getParent(); + if (programNode.getParent() == null) { + // This means that the parent was already removed + continue; + } if (programNode.isSelected()) { removeProgram(programNode.getId()); } else { @@ -291,28 +296,28 @@ public class SelectionTreeModel extends DefaultTreeModel { } public void selectAllTrips() { - Enumeration<SelectionTreeNodeSupport> children = getRoot().children(); + Enumeration<SelectionTreeNodeSupport<?>> children = getRoot().children(); while (children.hasMoreElements()) { - SelectionTreeNodeSupport selectionTreeNodeSupport = children.nextElement(); + SelectionTreeNodeSupport<?> selectionTreeNodeSupport = children.nextElement(); selectionTreeNodeSupport.setSelected(true); } recomputeSelectedCount(); } public void unselectAllTrips() { - Enumeration<SelectionTreeNodeSupport> children = getRoot().children(); + Enumeration<SelectionTreeNodeSupport<?>> children = getRoot().children(); while (children.hasMoreElements()) { - SelectionTreeNodeSupport selectionTreeNodeSupport = children.nextElement(); + SelectionTreeNodeSupport<?> selectionTreeNodeSupport = children.nextElement(); selectionTreeNodeSupport.setSelected(false); } recomputeSelectedCount(); } public void setExistingTrips(List<? super TripReference> existingTrips) { - Enumeration<SelectionTreeNodeSupport> children = getRoot().children(); + Enumeration<SelectionTreeNodeSupport<?>> children = getRoot().children(); while (children.hasMoreElements()) { SelectionTreeNodeSupport<?> programNode = children.nextElement(); - Enumeration<SelectionTreeNodeSupport> children1 = programNode.children(); + Enumeration<SelectionTreeNodeSupport<?>> children1 = programNode.children(); while (children1.hasMoreElements()) { TripSelectionTreeNodeSupport<?, ?> tripNode = (TripSelectionTreeNodeSupport<?, ?>) children1.nextElement(); DataDtoReference<?, ?> data = tripNode.getData(); @@ -338,7 +343,7 @@ public class SelectionTreeModel extends DefaultTreeModel { } public boolean isDataFull() { - Enumeration<SelectionTreeNodeSupport> children = getRoot().children(); + Enumeration<SelectionTreeNodeSupport<?>> children = getRoot().children(); while (children.hasMoreElements()) { SelectionTreeNodeSupport<?> programNode = children.nextElement(); if (!programNode.isSelected()) { ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreePane.jaxx ===================================== @@ -19,7 +19,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JScrollPane id='treePane' decorator='boxed' columnHeaderView='{treeHeader}'> +<JScrollPane id='treePane' columnHeaderView='{treeHeader}'> <import> fr.ird.observe.client.api.util.UIHelperSupport @@ -41,20 +41,15 @@ public boolean isOpposite() { return opposite; } ]]> </script> <String id='labelText' javaBean='null'/> - <SelectionTree id='tree' javaBean="new SelectionTree()"/> - + <SelectionTree id='tree'/> <JPanel id="treeHeader" layout='{new BorderLayout()}'> - - <JLabel id="label" constraints='BorderLayout.CENTER'/> - <JToolBar id='toolbar' constraints='BorderLayout.EAST'> <JButton id='collapseAll'/> <JButton id='expandAll'/> <JButton id='selectAll'/> <JButton id='unselectAll'/> </JToolBar> - </JPanel> </JScrollPane> ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreePane.jcss ===================================== @@ -21,7 +21,7 @@ */ #tree { - minimumSize:{UIHelperSupport.newMinDimension()}; + /*minimumSize:{UIHelperSupport.newMinDimension()};*/ font-size:11; } ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/SelectionTreePaneHandler.java ===================================== @@ -38,11 +38,10 @@ class SelectionTreePaneHandler implements UIHandler<SelectionTreePane> { public void afterInit(SelectionTreePane ui) { PropertyChangeListener propertyChangeListener = e -> onTripCountChanged(ui, (int) e.getNewValue()); - ui.addPropertyChangeListener(SelectionTreePane.PROPERTY_TREE, e -> { - SelectionTreeModel newValue = ((SelectionTree) e.getNewValue()).getTreeModel(); - newValue.removePropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, propertyChangeListener); - newValue.addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, propertyChangeListener); - }); + ui.getTree().getTreeModel().addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, propertyChangeListener); + onTripCountChanged(ui, ui.getTree().getTreeModel().getSelectedCount()); + //FIXME:BodyContent Jaxx should do this for us, instead just call a add method on scrollPane, and tree is not visible + ui.setViewportView(ui.getTree()); } private void onTripCountChanged(SelectionTreePane ui, int newValue) { ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/actions/SelectUnselect.java ===================================== @@ -0,0 +1,107 @@ +package fr.ird.observe.client.datasource.tree.selection.actions; + +/*- + * #%L + * ObServe :: Client DataSource Tree Selection + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.api.util.ObserveKeyStrokesSupport; +import fr.ird.observe.client.datasource.tree.selection.SelectionTree; +import fr.ird.observe.client.datasource.tree.selection.SelectionTreePane; +import fr.ird.observe.client.datasource.tree.selection.nodes.SelectionTreeNodeSupport; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.swing.ActionMap; +import javax.swing.InputMap; +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public class SelectUnselect extends SelectionTreePaneActionSupport { + + private static final Logger log = LogManager.getLogger(SelectUnselect.class); + + public SelectUnselect() { + super(null, null, null, ObserveKeyStrokesSupport.KEY_STROKE_SPACE); + } + + @Override + protected InputMap getInputMap(SelectionTreePane selectionTreePane, int inputMapCondition) { + return selectionTreePane.getTree().getInputMap(inputMapCondition); + } + + @Override + protected ActionMap getActionMap(SelectionTreePane selectionTreePane) { + return selectionTreePane.getTree().getActionMap(); + } + + @Override + protected void defaultInit(InputMap inputMap, ActionMap actionMap) { + super.defaultInit(inputMap, actionMap); + getUi().getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "none"); + getUi().getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_DATA_SYNCHRO_COPY_FROM_LEFT, "none"); + getUi().getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_DATA_SYNCHRO_DELETE_FROM_LEFT, "none"); + getUi().getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_DATA_SYNCHRO_COPY_FROM_RIGHT, "none"); + getUi().getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_DATA_SYNCHRO_DELETE_FROM_RIGHT, "none"); +// oppositeTree.getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "none"); + + inputMap.put(ObserveKeyStrokesSupport.KEY_STROKE_ENTER, getActionCommandKey()); + getUi().getTree().addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + actionPerformed(new ActionEvent(getUi().getTree(), 0, "yo")); + } + } + }); + } + + @Override + protected boolean canExecuteAction(ActionEvent e) { + boolean result = canExecutionActionFromLayer(getUi(), e); + if (result) { + log.info(String.format("Accept action : %s", getName())); + } else { + log.info(String.format("Reject action : %s", getName())); + } + return result; + } + + @Override + protected void doActionPerformed(ActionEvent e, SelectionTreePane ui) { + selectUnSelect(ui.getTree()); + } + + protected void selectUnSelect(SelectionTree tree) { + Object selectedRow = tree.getLastSelectedPathComponent(); + if (selectedRow == null) { + return; + } + + SelectionTreeNodeSupport<?> node = (SelectionTreeNodeSupport<?>) selectedRow; + tree.getTreeModel().setValueAt(node, !node.isSelected()); + } + +} ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/actions/SelectUnselectWithOpposite.java ===================================== @@ -0,0 +1,64 @@ +package fr.ird.observe.client.datasource.tree.selection.actions; + +/*- + * #%L + * ObServe :: Client DataSource Tree Selection + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.api.util.ObserveKeyStrokesSupport; +import fr.ird.observe.client.datasource.tree.selection.SelectionTree; +import fr.ird.observe.client.datasource.tree.selection.SelectionTreePane; + +import java.awt.event.ActionEvent; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public class SelectUnselectWithOpposite extends SelectUnselect { + + private final SelectionTreePane oppositeTreePane; + + public SelectUnselectWithOpposite(SelectionTreePane oppositeTreePane) { + this.oppositeTreePane = oppositeTreePane; + } + + @Override + public void init() { + oppositeTreePane.getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_SPACE, "none"); + oppositeTreePane.getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_DATA_SYNCHRO_COPY_FROM_LEFT, "none"); + oppositeTreePane.getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_DATA_SYNCHRO_COPY_FROM_RIGHT, "none"); + oppositeTreePane.getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_DATA_SYNCHRO_DELETE_FROM_LEFT, "none"); + oppositeTreePane.getTree().getInputMap().put(ObserveKeyStrokesSupport.KEY_STROKE_DATA_SYNCHRO_DELETE_FROM_RIGHT, "none"); + defaultInit(getInputMap(ui, getInputMapCondition()), getActionMap(ui)); + defaultInit(getInputMap(oppositeTreePane, getInputMapCondition()), getActionMap(oppositeTreePane)); + } + + @Override + protected void doActionPerformed(ActionEvent e, SelectionTreePane ui) { + SelectionTree tree = ui.getTree(); + if (tree.isFocusOwner()) { + selectUnSelect(tree); + } else { + selectUnSelect(oppositeTreePane.getTree()); + } + } + +} ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/ProgramSelectionTreeNode.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.datasource.tree.selection.nodes; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -84,9 +84,9 @@ public class ProgramSelectionTreeNode extends ReferenceSelectionTreeNodeSupport< @Override public boolean isSelected() { - Enumeration<SelectionTreeNodeSupport> children = children(); + Enumeration<SelectionTreeNodeSupport<?>> children = children(); while (children.hasMoreElements()) { - SelectionTreeNodeSupport node = children.nextElement(); + SelectionTreeNodeSupport<?> node = children.nextElement(); if (!node.isSelected()) { return false; } @@ -96,18 +96,18 @@ public class ProgramSelectionTreeNode extends ReferenceSelectionTreeNodeSupport< @Override public void setSelected(boolean selected) { - Enumeration<SelectionTreeNodeSupport> children = children(); + Enumeration<SelectionTreeNodeSupport<?>> children = children(); while (children.hasMoreElements()) { - SelectionTreeNodeSupport node = children.nextElement(); + SelectionTreeNodeSupport<?> node = children.nextElement(); node.setSelected(selected); } } @Override public void collectSelectedTripNodes(ImmutableList.Builder<TripSelectionTreeNodeSupport<?, ?>> builder) { - Enumeration<SelectionTreeNodeSupport> children = children(); + Enumeration<SelectionTreeNodeSupport<?>> children = children(); while (children.hasMoreElements()) { - TripSelectionTreeNodeSupport<?, ?> tripNode = (TripSelectionTreeNodeSupport) children.nextElement(); + TripSelectionTreeNodeSupport<?, ?> tripNode = (TripSelectionTreeNodeSupport<?, ?>) children.nextElement(); tripNode.collectSelectedTripNodes(builder); } } ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java ===================================== @@ -56,7 +56,7 @@ public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R exten @Override public String getText() { - Decorator decorator = DecoratorServiceApplicationComponent.value().getReferenceDecorator(getData().getReferenceType()); + Decorator<?> decorator = DecoratorServiceApplicationComponent.value().getReferenceDecorator(getData().getReferenceType()); return decorator.toString(getData()); } @@ -88,9 +88,9 @@ public abstract class ReferenceSelectionTreeNodeSupport<D extends IdDto, R exten if (isLeaf()) { return false; } - Enumeration<SelectionTreeNodeSupport> children = children(); + Enumeration<SelectionTreeNodeSupport<?>> children = children(); while (children.hasMoreElements()) { - SelectionTreeNodeSupport nodeSupport = children.nextElement(); + SelectionTreeNodeSupport<?> nodeSupport = children.nextElement(); if (nodeSupport.isSelected()) { return true; } ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/ReferentialsSelectionTreeNode.java ===================================== @@ -50,7 +50,7 @@ public class ReferentialsSelectionTreeNode extends SelectionTreeNodeSupport<Stri public static ReferentialsSelectionTreeNode of(String name, ImmutableSet<Class<? extends ReferentialDto>> types) { ReferentialsSelectionTreeNode result = new ReferentialsSelectionTreeNode(t(name)); for (Class<? extends ReferentialDto> aClass : ObserveI18nDecoratorHelper.sortTypes(types, ClientConfigApplicationComponent.value().getLocale())) { - ReferentialSelectionTreeNode child = new ReferentialSelectionTreeNode<>(aClass); + ReferentialSelectionTreeNode<?> child = new ReferentialSelectionTreeNode<>(aClass); result.add(child); } ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/RootSelectionTreeNode.java ===================================== @@ -77,10 +77,10 @@ public class RootSelectionTreeNode extends SelectionTreeNodeSupport<Void> { } public ReferentialsSelectionTreeNode[] getReferentialNodes() { - Enumeration<SelectionTreeNodeSupport> children = children(); + Enumeration<SelectionTreeNodeSupport<?>> children = children(); List<ReferentialsSelectionTreeNode> result = new LinkedList<>(); while (children.hasMoreElements()) { - SelectionTreeNodeSupport childNode = children.nextElement(); + SelectionTreeNodeSupport<?> childNode = children.nextElement(); result.add((ReferentialsSelectionTreeNode) childNode); } return result.toArray(new ReferentialsSelectionTreeNode[0]); @@ -88,9 +88,9 @@ public class RootSelectionTreeNode extends SelectionTreeNodeSupport<Void> { @Override public void collectSelectedTripNodes(ImmutableList.Builder<TripSelectionTreeNodeSupport<?, ?>> builder) { - Enumeration<SelectionTreeNodeSupport> children = children(); + Enumeration<SelectionTreeNodeSupport<?>> children = children(); while (children.hasMoreElements()) { - SelectionTreeNodeSupport childNode = children.nextElement(); + SelectionTreeNodeSupport<?> childNode = children.nextElement(); if (childNode instanceof ProgramSelectionTreeNode) { ProgramSelectionTreeNode programNode = (ProgramSelectionTreeNode) childNode; programNode.collectSelectedTripNodes(builder); ===================================== client-datasource-tree-selection/src/main/java/fr/ird/observe/client/datasource/tree/selection/nodes/SelectionTreeNodeSupport.java ===================================== @@ -56,6 +56,7 @@ public abstract class SelectionTreeNodeSupport<O> extends DefaultMutableTreeNode return getText(); } + @SuppressWarnings("unchecked") public O getData() { return (O) getUserObject(); } @@ -75,15 +76,16 @@ public abstract class SelectionTreeNodeSupport<O> extends DefaultMutableTreeNode public abstract void setSelected(boolean selected); + @SuppressWarnings({"unchecked", "rawtypes"}) @Override - public Enumeration<SelectionTreeNodeSupport> children() { + public Enumeration<SelectionTreeNodeSupport<?>> children() { return (Enumeration) super.children(); } - public ReferenceSelectionTreeNodeSupport findById(String id) { - Enumeration<SelectionTreeNodeSupport> children = children(); + public ReferenceSelectionTreeNodeSupport<?,?> findById(String id) { + Enumeration<SelectionTreeNodeSupport<?>> children = children(); while (children.hasMoreElements()) { - ReferenceSelectionTreeNodeSupport<?, ?> child = (ReferenceSelectionTreeNodeSupport) children.nextElement(); + ReferenceSelectionTreeNodeSupport<?, ?> child = (ReferenceSelectionTreeNodeSupport<?,?>) children.nextElement(); if (id.equals(child.getData().getId())) { return child; } ===================================== pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.43</version> + <version>2019.8.44</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/72663de4c4e06cd4f7e5a073d3e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/72663de4c4e06cd4f7e5a073d3e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [skip ci] fix release deploy war job
by Tony CHEMIT 11 Dec '19

11 Dec '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7abb2f54 by tchemit at 2019-11-05T11:43:26Z [skip ci] fix release deploy war job - - - - - 3a84a167 by tchemit at 2019-11-16T11:37:57Z Use new application context API Use new application template API Improve tests API Clean code - - - - - 1f5453e6 by tchemit at 2019-12-11T12:24:58Z fury commit... - - - - - 30 changed files: - .gitlab-ci.yml - client-db/.mvn/add-geotools-repository → client-api-admin/.mvn/add-geotools-repository - client-db/.mvn/i18n/parse-java → client-api-admin/.mvn/i18n/parse-java - client-core/.mvn/i18n/parse-java-enumerations → client-api-admin/.mvn/i18n/parse-java-enumerations - client-db/.mvn/jaxx-generate → client-api-admin/.mvn/jaxx-generate - client-db/.mvn/pom.gitflow.develop → client-api-admin/.mvn/pom.gitflow.develop - client-db/.mvn/pom.gitflow.master → client-api-admin/.mvn/pom.gitflow.master - client-db/.mvn/pom.organizationId → client-api-admin/.mvn/pom.organizationId - client-db/.mvn/pom.projectId → client-api-admin/.mvn/pom.projectId - client-db/.mvn/pom.stageId → client-api-admin/.mvn/pom.stageId - client-db/LICENSE.txt → client-api-admin/LICENSE.txt - client-db/README.md → client-api-admin/README.md - + client-api-admin/pom.xml - + client-api-admin/src/license/THIRD-PARTY.properties - + client-api-admin/src/main/i18n/getters/java-enumeration.getter - + client-api-admin/src/main/i18n/getters/java.getter - + client-api-admin/src/main/i18n/getters/jaxx.getter - + client-api-admin/src/main/i18n/templates/validationReport_en_GB.ftl - + client-api-admin/src/main/i18n/templates/validationReport_es_ES.ftl - + client-api-admin/src/main/i18n/templates/validationReport_fr_FR.ftl - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminActionModel.java - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminActionWorker.java - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jaxx - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jcss - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jcss - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIBodyContent.java - + client-api-admin/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0b7a31d68570c2c4e965611040… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0b7a31d68570c2c4e965611040… You're receiving this email because of your account on gitlab.com.

1 0