This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 89503d365ca554c291deaf481b9aec8c505195cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 6 11:19:11 2016 +0100 [stack] update dependencies --- pom.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 0191e07..d3c754c 100644 --- a/pom.xml +++ b/pom.xml @@ -168,15 +168,15 @@ <jaxxVersion>2.34</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> - <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> <nuitonConfigVersion>3.1</nuitonConfigVersion> - <xworkVersion>2.3.30</xworkVersion> + <xworkVersion>2.3.31</xworkVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> <sl4jVersion>1.7.21</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <geoToolsVersion>15.1</geoToolsVersion> + <geoToolsVersion>16.0</geoToolsVersion> <webmotionVersion>2.5.1</webmotionVersion> <httpComponentsVersion>4.5.2</httpComponentsVersion> @@ -245,7 +245,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.4</version> + <version>3.5</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -260,7 +260,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.2</version> + <version>1.9.3</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -281,12 +281,12 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>19.0</version> + <version>20.0</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.7</version> + <version>2.8.0</version> </dependency> <dependency> @@ -346,7 +346,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>3.0-rc-5</version> + <version>3.0-rc-6</version> <scope>compile</scope> </dependency> <dependency> @@ -556,7 +556,7 @@ <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.4.1209.jre7</version> + <version>9.4.1212.jre7</version> </dependency> <!-- hibernate --> @@ -844,7 +844,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>3.1.0</version> + <version>4.0.0-b01</version> <scope>provided</scope> </dependency> @@ -957,7 +957,7 @@ <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.20.0-GA</version> + <version>3.22.0-CR1</version> <scope>runtime</scope> </dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 8ff31b0b2dfb576a25836a385b419b039b2debad Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 6 12:47:36 2016 +0100 [iso] add missing license file header --- .../application/swing/ui/ObserveMainUIModel.java | 22 ++++++++++++++++++++++ .../content/AddActivityLonglineSetUIAction.java | 22 ++++++++++++++++++++++ .../AddActivitySeineFloatingObjectUIAction.java | 22 ++++++++++++++++++++++ .../content/AddActivitySeineSetUIAction.java | 22 ++++++++++++++++++++++ .../menu/action/LaunchConsolidateAction.java | 22 ++++++++++++++++++++++ .../menu/action/LaunchDataSynchronizeAction.java | 22 ++++++++++++++++++++++ .../menu/action/LaunchExportDataAction.java | 22 ++++++++++++++++++++++ .../action/LaunchReferentialSynchronizeAction.java | 22 ++++++++++++++++++++++ .../ui/actions/menu/action/LaunchReportAction.java | 22 ++++++++++++++++++++++ .../menu/action/LaunchSynchronizeAction.java | 22 ++++++++++++++++++++++ .../actions/menu/action/LaunchValidateAction.java | 22 ++++++++++++++++++++++ .../ChangeApplicationLanguageToEnglishAction.java | 22 ++++++++++++++++++++++ .../ChangeApplicationLanguageToFrenchAction.java | 22 ++++++++++++++++++++++ .../ChangeApplicationLanguageToSpanishAction.java | 22 ++++++++++++++++++++++ .../config/ChangeDbLanguageToEnglishAction.java | 22 ++++++++++++++++++++++ .../config/ChangeDbLanguageToFrenchAction.java | 22 ++++++++++++++++++++++ .../config/ChangeDbLanguageToSpanishAction.java | 22 ++++++++++++++++++++++ 17 files changed, 374 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java index a7bc4f5..524b2c7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java index c78fb95..f1093b2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.content; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java index a0b05e4..063eb8d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.content; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java index 52e7215..6adf660 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.content; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java index 0e7a9ea..beb4f64 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchConsolidateAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.action; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.admin.AdminStep; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java index 7fcdf2a..054aefd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchDataSynchronizeAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.action; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.admin.AdminStep; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java index 47d9a86..ff83b3b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchExportDataAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.action; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.admin.AdminStep; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java index 3739c9e..0de8fe6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReferentialSynchronizeAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.action; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.admin.AdminStep; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java index c8c5fb2..4fd665f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchReportAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.action; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.admin.AdminStep; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java index f9da0c9..c3232fc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchSynchronizeAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.action; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.admin.AdminStep; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java index 84dfd62..edf1e8c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/action/LaunchValidateAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.action; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.admin.AdminStep; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java index 625bb38..f1f63ff 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToEnglishAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import java.util.Locale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java index f057e54..b2e9001 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToFrenchAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import java.util.Locale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java index 1650bfc..cb3c38d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeApplicationLanguageToSpanishAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import java.util.Locale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java index ecee950..c5c8020 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToEnglishAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.services.dto.constants.ReferentialLocale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java index d63c5b0..a585a67 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToFrenchAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.services.dto.constants.ReferentialLocale; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java index 8cab839..c2ad5bb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ChangeDbLanguageToSpanishAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2016 IRD, Code Lutin, Tony Chemit + * %% + * 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.application.swing.ui.ObserveMainUI; import fr.ird.observe.services.dto.constants.ReferentialLocale; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 75001ab859de2ca7b449ccdc6653c045a342df9b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 7 12:27:16 2016 +0100 [stack] Passage en UIHandler partout où c'est possible --- .../content/EditReferentialFromListUIAction.java} | 35 ++++--- .../application/swing/ui/content/ContentUI.jaxx | 7 +- .../application/swing/ui/content/ContentUI.jcss | 2 - .../swing/ui/content/ContentUIHandler.java | 109 ++++++++++----------- .../ui/content/impl/longline/BranchlineUI.jaxx | 3 - .../content/impl/longline/BranchlineUIHandler.java | 22 +++-- .../impl/longline/LonglineDetailCompositionUI.jaxx | 3 - .../LonglineDetailCompositionUIHandler.java | 30 +++--- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 3 - .../LonglineGlobalCompositionUIHandler.java | 36 +++---- .../ui/content/impl/longline/SetLonglineUI.jaxx | 3 - .../impl/longline/SetLonglineUIHandler.java | 29 +++--- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 3 - ...ngObjectTransmittingBuoyOperationUIHandler.java | 11 +-- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 3 - .../impl/seine/FloatingObjectUIHandler.java | 7 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 3 - .../ui/content/impl/seine/SetSeineUIHandler.java | 14 ++- .../swing/ui/content/list/ContentListUI.jaxx | 6 +- .../swing/ui/content/list/ContentListUI.jcss | 2 +- .../ui/content/list/ContentListUIHandler.java | 50 ++++++---- .../list/impl/longline/ActivityLonglinesUI.jaxx | 3 - .../impl/longline/ActivityLonglinesUIHandler.java | 7 +- .../list/impl/longline/TripLonglinesUI.jaxx | 3 - .../list/impl/longline/TripLonglinesUIHandler.java | 14 +-- .../content/list/impl/seine/ActivitySeinesUI.jaxx | 3 - .../list/impl/seine/ActivitySeinesUIHandler.java | 8 +- .../swing/ui/content/list/impl/seine/RoutesUI.jaxx | 3 - .../content/list/impl/seine/RoutesUIHandler.java | 7 +- .../ui/content/list/impl/seine/TripSeinesUI.jaxx | 3 - .../list/impl/seine/TripSeinesUIHandler.java | 7 +- .../swing/ui/content/open/ContentOpenableUI.jaxx | 6 +- .../ui/content/open/ContentOpenableUIHandler.java | 5 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 3 - .../impl/longline/ActivityLonglineUIHandler.java | 10 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 3 - .../open/impl/longline/TripLonglineUIHandler.java | 22 ++--- .../content/open/impl/seine/ActivitySeineUI.jaxx | 15 --- .../open/impl/seine/ActivitySeineUIHandler.java | 22 +++-- .../swing/ui/content/open/impl/seine/RouteUI.jaxx | 3 - .../ui/content/open/impl/seine/RouteUIHandler.java | 10 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 10 +- .../open/impl/seine/TripSeineUIHandler.java | 38 +++---- .../ui/content/ref/ContentI18nReferenceUI.jcss | 4 + .../swing/ui/content/ref/ContentReferenceUI.jaxx | 10 +- .../swing/ui/content/ref/ContentReferenceUI.jcss | 18 +--- .../ui/content/ref/ContentReferenceUIHandler.java | 49 +++++---- .../swing/ui/content/ref/ReferenceHomeUI.jaxx | 2 - .../ui/content/ref/ReferenceHomeUIHandler.java | 7 +- .../ui/content/ref/impl/CountryUIHandler.java | 14 +++ .../ui/content/ref/impl/FpaZoneUIHandler.java | 14 +++ .../ref/impl/GearCaracteristicTypeUIHandler.java | 14 +++ .../ref/impl/GearCaracteristicUIHandler.java | 14 +++ .../swing/ui/content/ref/impl/GearUI.jaxx | 3 - .../swing/ui/content/ref/impl/GearUIHandler.java | 17 ++-- .../ui/content/ref/impl/HarbourUIHandler.java | 14 +++ .../content/ref/impl/LengthLengthParameterUI.jaxx | 3 - .../ref/impl/LengthLengthParameterUIHandler.java | 17 ++-- .../content/ref/impl/LengthWeightParameterUI.jaxx | 3 - .../ref/impl/LengthWeightParameterUIHandler.java | 18 ++-- .../swing/ui/content/ref/impl/OceanUIHandler.java | 14 +++ .../ui/content/ref/impl/OrganismUIHandler.java | 14 +++ .../swing/ui/content/ref/impl/PersonUIHandler.java | 14 +++ .../swing/ui/content/ref/impl/ProgramUI.jaxx | 3 - .../ui/content/ref/impl/ProgramUIHandler.java | 18 ++-- .../swing/ui/content/ref/impl/SexUIHandler.java | 14 +++ .../ui/content/ref/impl/ShipOwnerUIHandler.java | 14 +++ .../content/ref/impl/SizeMeasureTypeUIHandler.java | 14 +++ .../SpeciesGroupUIHandler.java} | 31 ++---- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 3 - .../ui/content/ref/impl/SpeciesListUIHandler.java | 13 +-- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 3 - .../ui/content/ref/impl/SpeciesUIHandler.java | 15 ++- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 2 +- .../ref/impl/VesselSizeCategoryUIHandler.java | 14 +++ .../ui/content/ref/impl/VesselTypeUIHandler.java | 14 +++ .../swing/ui/content/ref/impl/VesselUI.jaxx | 3 - .../swing/ui/content/ref/impl/VesselUIHandler.java | 17 ++-- .../ref/impl/WeightMeasureTypeUIHandler.java | 14 +++ .../impl/longline/BaitHaulingStatusUIHandler.java | 14 +++ .../impl/longline/BaitSettingStatusUIHandler.java | 14 +++ .../ref/impl/longline/BaitTypeUIHandler.java | 15 +++ .../impl/longline/CatchFateLonglineUIHandler.java | 14 +++ .../ref/impl/longline/EncounterTypeUIHandler.java | 14 +++ .../ref/impl/longline/HealthnessUIHandler.java | 14 +++ .../ref/impl/longline/HookPositionUIHandler.java | 14 +++ .../ref/impl/longline/HookSizeUIHandler.java | 14 +++ .../ref/impl/longline/HookTypeUIHandler.java | 14 +++ .../longline/ItemHorizontalPositionUIHandler.java | 14 +++ .../longline/ItemVerticalPositionUIHandler.java | 14 +++ .../impl/longline/LightsticksColorUIHandler.java | 14 +++ .../impl/longline/LightsticksTypeUIHandler.java | 14 +++ .../ref/impl/longline/LineTypeUIHandler.java | 14 +++ .../ref/impl/longline/MaturityStatusUIHandler.java | 14 +++ .../ref/impl/longline/MitigationTypeUIHandler.java | 14 +++ .../ref/impl/longline/SensorBrandUIHandler.java | 14 +++ .../impl/longline/SensorDataFormatUIHandler.java | 14 +++ .../ref/impl/longline/SensorTypeUIHandler.java | 14 +++ .../ref/impl/longline/SettingShapeUIHandler.java | 14 +++ .../ref/impl/longline/StomacFullnessUIHandler.java | 14 +++ .../ref/impl/longline/TripTypeUIHandler.java | 14 +++ .../longline/VesselActivityLonglineUIHandler.java | 14 +++ .../ref/impl/seine/DetectionModeUIHandler.java | 14 +++ .../ref/impl/seine/ObjectFateUIHandler.java | 14 +++ .../ref/impl/seine/ObjectOperationUIHandler.java | 14 +++ .../ref/impl/seine/ObjectTypeUIHandler.java | 14 +++ .../ref/impl/seine/ObservedSystemUIHandler.java | 14 +++ .../ref/impl/seine/ReasonForDiscardUIHandler.java | 14 +++ .../impl/seine/ReasonForNoFishingUIHandler.java | 14 +++ .../ref/impl/seine/ReasonForNullSetUIHandler.java | 14 +++ .../ref/impl/seine/SpeciesFateUIHandler.java | 14 +++ .../ref/impl/seine/SpeciesStatusUIHandler.java | 14 +++ .../impl/seine/SurroundingActivityUIHandler.java | 14 +++ .../seine/TransmittingBuoyOperationUIHandler.java | 14 +++ .../impl/seine/TransmittingBuoyTypeUIHandler.java | 14 +++ .../impl/seine/VesselActivitySeineUIHandler.java | 14 +++ .../ref/impl/seine/WeightCategoryUIHandler.java | 14 +++ .../ui/content/ref/impl/seine/WindUIHandler.java | 14 +++ .../swing/ui/content/table/ContentTableUI.jaxx | 6 +- .../ui/content/table/ContentTableUIHandler.java | 12 ++- .../table/impl/longline/BaitsCompositionUI.jaxx | 3 - .../impl/longline/BaitsCompositionUIHandler.java | 7 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 3 - .../longline/BranchlinesCompositionUIHandler.java | 7 +- .../table/impl/longline/CatchLonglineUI.jaxx | 3 - .../impl/longline/CatchLonglineUIHandler.java | 36 ++++--- .../content/table/impl/longline/EncounterUI.jaxx | 3 - .../table/impl/longline/EncounterUIHandler.java | 7 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 3 - .../longline/FloatlinesCompositionUIHandler.java | 7 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 3 - .../longline/GearUseFeaturesLonglineUIHandler.java | 18 ++-- .../table/impl/longline/HooksCompositionUI.jaxx | 3 - .../impl/longline/HooksCompositionUIHandler.java | 13 ++- .../content/table/impl/longline/SensorUsedUI.jaxx | 3 - .../table/impl/longline/SensorUsedUIHandler.java | 11 +-- .../ui/content/table/impl/longline/TdrUI.jaxx | 3 - .../content/table/impl/longline/TdrUIHandler.java | 31 +++--- .../table/impl/seine/AbstractSampleUIHandler.java | 4 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 3 - .../impl/seine/GearUseFeaturesSeineUIHandler.java | 17 ++-- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 3 - .../table/impl/seine/NonTargetCatchUIHandler.java | 7 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 3 - .../table/impl/seine/NonTargetSampleUIHandler.java | 7 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 3 - .../impl/seine/ObjectObservedSpeciesUIHandler.java | 7 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 3 - .../impl/seine/ObjectSchoolEstimateUIHandler.java | 7 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 3 - .../table/impl/seine/SchoolEstimateUIHandler.java | 7 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 3 - .../table/impl/seine/TargetCatchUIHandler.java | 13 +-- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 3 - .../impl/seine/TargetDiscardCatchUIHandler.java | 13 ++- .../table/impl/seine/TargetSampleCaptureUI.jaxx | 3 - .../impl/seine/TargetSampleCaptureUIHandler.java | 26 +++++ .../table/impl/seine/TargetSampleRejeteUI.jaxx | 3 - .../impl/seine/TargetSampleRejeteUIHandler.java | 26 +++++ .../content/table/impl/seine/TargetSampleUI.jaxx | 6 +- .../table/impl/seine/TargetSampleUIHandler.java | 36 ++++--- 161 files changed, 1301 insertions(+), 675 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java similarity index 50% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java index 1739471..24df0cd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java @@ -1,6 +1,6 @@ -package fr.ird.observe.application.swing.ui.content.ref; +package fr.ird.observe.application.swing.ui.actions.content; -/* +/*- * #%L * ObServe :: Application Swing * %% @@ -22,32 +22,31 @@ package fr.ird.observe.application.swing.ui.content.ref; * #L% */ -import fr.ird.observe.application.swing.db.DataContext; -import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.content.ContentUI; +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI; + +import static org.nuiton.i18n.I18n.t; /** - * Created on 9/28/14. + * Created on 10/11/16. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 6.0 */ -public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto, ReferenceHomeUI> { +public class EditReferentialFromListUIAction extends AbstractContentUIAction { - public ReferenceHomeUIHandler(ReferenceHomeUI ui) { - super(ui, null, null); - } + public static final String ACTION_NAME = EditReferentialFromListUIAction.class.getSimpleName(); - @Override - protected ContentMode getContentMode(DataContext dataContext) { - return null; + public EditReferentialFromListUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, t("observe.action.detail"), "", "go-detail", "alt pressed ENTER"); } @Override - protected boolean computeCanWrite(ObserveSwingDataSource source) { - return source.canWriteReferential(); + protected void actionPerformed(ContentUI<?, ?> ui) { + ContentReferenceUI contentReferenceUI = (ContentReferenceUI) ui; + contentReferenceUI.getHandler().modifyUI(); + } } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx index 2f819ae..d2d1982 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx @@ -22,7 +22,6 @@ <org.jdesktop.swingx.JXTitledPanel abstract='true' genericType='E extends IdDto, U extends ContentUI<E, U>' implements="fr.ird.observe.application.swing.ui.content.ObserveContentUI<E, U>" - title='{getHandler().updateTitle(getContentTitle())}' contentContainer='{contentContainer}' leftDecoration='{titleLeft}' rightDecoration='{titleRightToolBar}' @@ -40,6 +39,7 @@ fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig fr.ird.observe.application.swing.ui.actions.content.GoUpUIAction fr.ird.observe.application.swing.ui.actions.content.GoDownUIAction + fr.ird.observe.application.swing.ui.content.ContentUIHandler fr.ird.observe.services.dto.IdDto @@ -64,7 +64,7 @@ <ContentUIModel id='model' genericType='E' initializer='ContentUIModel.newModel((U) this)'/> - <ContentUIHandler id='handler' genericType='E, U' initializer='ContentUIHandler.newHandler((U) this)'/> + <!--<ContentUIHandler id='handler' genericType='E, U' initializer='ContentUIHandler.newHandler((U) this)'/>--> <IdDto id='bean' initializer='model.getBean()'/> @@ -76,6 +76,9 @@ <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this"/> <script><![CDATA[ + + public abstract ContentUIHandler<E,U> getHandler(); + public Object getSelectedBean(JComboBox combo) { return combo.getSelectedItem(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jcss index 2d23bbe..0d6231c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jcss @@ -50,8 +50,6 @@ #titleRight { - icon:{getHandler().updateModeIcon(model.getMode())}; - toolTipText:{getHandler().updateModeTip(model.getMode())}; _original:true; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 5bbf1b9..db8fe1e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -36,6 +36,7 @@ import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecor import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; +import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; @@ -64,7 +65,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.DecoratorUtil; -import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; import org.nuiton.validator.NuitonValidatorScope; @@ -110,7 +110,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U /** Logger */ static private final Log log = LogFactory.getLog(ContentUIHandler.class); - protected final String prefix; + protected String prefix; private final DataContextType parentType; @@ -119,9 +119,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U private final Icon errorIcon; /** l'interface graphique que le controleur utilise */ - protected final U ui; + protected U ui; - static <E extends IdDto, U extends ContentUI<E, U>> ContentUIHandler<E, U> newHandler(U ui) { + public static <E extends IdDto, U extends ContentUI<E, U>> ContentUIHandler<E, U> newHandler(U ui) { String uiName = ui.getClass().getName(); String modelName = uiName + "Handler"; @@ -137,6 +137,45 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } + + public void beforeInit(U ui) { + this.ui = ui; + prefix = "[" + ui.getClass().getSimpleName() + "] "; + if (log.isDebugEnabled()) { + log.debug("[" + this + "] for ui " + prefix); + } + } + + public void afterInit(U ui) { + + new ContentUIInitializer<>(ui).initUI(); + + ContentUIModel<E> model = ui.getModel(); + + model.addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel()); + + installFocusTraversalPolicy(); + + + model.addPropertyChangeListener(ContentListUIModel.PROPERTY_MODE, evt -> updateTitle((ContentMode) evt.getNewValue())); + + ui.setTitle(t(updateTitle(ui.getContentTitle()))); + updateTitle(model.getMode()); + } + + protected void updateTitle(ContentMode mode) { + String tip = null; + if (mode != null) { + tip = (String) ui.getClientProperty(mode.name() + "Tip"); + } + ui.getTitleRight().setToolTipText(tip); + Icon icon = null; + if (mode != null) { + icon = (Icon) ui.getClientProperty(mode.name() + "Icon"); + } + ui.getTitleRight().setIcon(icon); + } + public static NavigationTree getTreeHelper(JAXXContext context) { return ObserveSwingApplicationContext.get().getMainUI().getNavigation(); } @@ -249,25 +288,20 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U model.addMessages(ui, fieldName, scope, message); } -// public static <E extends IdDto, U extends ContentUI<E, U>> void removeAllMessages(U ui, NuitonValidatorScope scope, String fieldName) { -// SwingValidatorMessageTableModel model = ui.getErrorTableModel(); -// model.removeMessages(ui, fieldName, scope); -// } - protected static <E extends IdDto, U extends ContentUI<E, U>> void removeAllMessages(U ui) { SwingValidatorMessageTableModel model = ui.getErrorTableModel(); model.removeMessages(ui, null); } + public ContentUIHandler(DataContextType parentType, DataContextType type) { + this(null, parentType, type); + } + public ContentUIHandler(U ui, DataContextType parentType, DataContextType type) { this.ui = ui; this.parentType = parentType; this.type = type; - prefix = "[" + ui.getClass().getSimpleName() + "] "; - if (log.isDebugEnabled()) { - log.debug("New handler [" + this + "] for ui " + prefix); - } - errorIcon = UIManager.getIcon("action.error"); + this.errorIcon = UIManager.getIcon("action.error"); Locale locale = ObserveSwingApplicationContext.get().getConfig().getLocale(); if (Locale.ENGLISH.equals(locale)) { dateFormat = FastDateFormat.getInstance("yyyy-MM-ddZZ hh:mm:ss"); @@ -299,11 +333,11 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U public void initUI() { - new ContentUIInitializer<>(ui).initUI(); - - getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel()); - - installFocusTraversalPolicy(); +// new ContentUIInitializer<>(ui).initUI(); +// +// getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel()); +// +// installFocusTraversalPolicy(); // addFocusabelOnForm(); @@ -558,25 +592,6 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U treeHelper.selectNode(node); } - public void addChild(Class<?> type) { - NavigationTree treeHelper = getTreeHelper(ui); - NavigationTreeNodeSupport parentNode = treeHelper.getSelectedNode(); - treeHelper.addUnsavedNode(parentNode, type); - } - - protected <EE> List<EE> updateList(BeanListHeader<EE> list, List<EE> data, String message) { - if (data != null && !data.isEmpty()) { - if (log.isDebugEnabled()) { - log.debug(list.getName() + " - " + data.size()); - } - Decorator<EE> decorator = list.getHandler().getDecorator(); - DecoratorUtil.sort((JXPathDecorator<EE>) decorator, data, 0); - return data; - } else { - return new ArrayList<>(); - } - } - public void openLink(String url) { try { @@ -587,7 +602,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } } - String updateTitle(String title) { + protected String updateTitle(String title) { if (ContentReferenceUIHandler.class.isAssignableFrom(getClass())) { return ObserveI18nDecoratorHelper.getTypeI18nKey(getBeanType()); } @@ -844,22 +859,6 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U } } - Icon updateModeIcon(ContentMode mode) { - Icon icon = null; - if (mode != null) { - icon = (Icon) ui.getClientProperty(mode.name() + "Icon"); - } - return icon; - } - - String updateModeTip(ContentMode mode) { - String tip = null; - if (mode != null) { - tip = (String) ui.getClientProperty(mode.name() + "Tip"); - } - return tip; - } - protected void setContentMode(ContentMode newMode) { // pour reforcer le binding sur le mode // cela est nécessaire car le mode peut-être positionné avant d'arriver diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx index b3b48b5..4f783d8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx @@ -47,9 +47,6 @@ <style source="../../Common.jcss"/> - <!-- handler --> - <BranchlineUIHandler id='handler'/> - <!-- model --> <BranchlineUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java index 1f2f747..8c56e66 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java @@ -31,6 +31,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.BranchlineHelper; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.lang3.BooleanUtils; @@ -54,7 +55,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ -public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, BranchlineUI> { +public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, BranchlineUI> implements UIHandler<BranchlineUI> { /** Logger */ private static final Log log = LogFactory.getLog(BranchlineUIHandler.class); @@ -64,8 +65,8 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl private Decorator<BranchlineDto> branchlineDecorator; - public BranchlineUIHandler(BranchlineUI ui) { - super(ui, DataContextType.SetLongline, null); + public BranchlineUIHandler() { + super(DataContextType.SetLongline, null); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -75,6 +76,16 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl } @Override + public void afterInit(BranchlineUI ui) { + + super.afterInit(ui); + branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); + + getModel().addPropertyChangeListener(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, + evt -> getUi().getValidator().setChanged(true)); + } + + @Override protected void installFocusTraversalPolicy() { // rien a installer } @@ -163,11 +174,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl @Override public void initUI() { - branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); - super.initUI(); - getModel().addPropertyChangeListener(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, - evt -> getUi().getValidator().setChanged(true)); } @Override @@ -390,4 +397,5 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl model.setHookAndBaitTabValid(hookAndBaitTabValid); } + } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx index 8927108..a373263 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx @@ -39,9 +39,6 @@ <style source="../../Common.jcss"/> - <!-- handler --> - <LonglineDetailCompositionUIHandler id='handler'/> - <!-- model --> <LonglineDetailCompositionUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 2e8b77a..c2d56f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -45,6 +45,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,11 +54,8 @@ import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComboBox; import javax.swing.JOptionPane; -import javax.swing.LayoutFocusTraversalPolicy; import javax.swing.event.ChangeListener; import javax.swing.event.TableModelListener; -import java.awt.Component; -import java.awt.Container; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.LinkedHashSet; @@ -74,7 +72,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLonglineDetailCompositionDto, LonglineDetailCompositionUI> { +public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLonglineDetailCompositionDto, LonglineDetailCompositionUI> implements UIHandler<LonglineDetailCompositionUI> { static final String SECTION_TEMPLATES_EDITOR = "sectionTemplatesEditor"; @@ -149,8 +147,8 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong private final JVetoableTabbedPane.ChangeSelectedIndex tabbedPaneWillChanged; - public LonglineDetailCompositionUIHandler(LonglineDetailCompositionUI ui) { - super(ui, DataContextType.ActivityLongline, DataContextType.SetLongline); + public LonglineDetailCompositionUIHandler() { + super(DataContextType.ActivityLongline, DataContextType.SetLongline); sectionTemplatesTableModelModified = evt -> { Boolean newValue = (Boolean) evt.getNewValue(); onSectionTemplatesTableModelModified(newValue); @@ -231,6 +229,10 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } }; tabbedPaneWillChanged = this::onTabWillChanged; + + this.sectionDecorator = getDecoratorService().getDecoratorByType(SectionDto.class); + this.basketDecorator = getDecoratorService().getDecoratorByType(BasketDto.class); + this.branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); } @Override @@ -268,18 +270,12 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } @Override - public void initUI() { - - this.sectionDecorator = getDecoratorService().getDecoratorByType(SectionDto.class); - this.basketDecorator = getDecoratorService().getDecoratorByType(BasketDto.class); - this.branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); - - LonglineDetailCompositionUIInitializer uiInitializer = new LonglineDetailCompositionUIInitializer(getUi()); + public void afterInit(LonglineDetailCompositionUI ui) { + super.afterInit(ui); + LonglineDetailCompositionUIInitializer uiInitializer = new LonglineDetailCompositionUIInitializer(ui); uiInitializer.initUI(); - LonglineDetailCompositionUI ui1 = getUi(); - - this.validationHelper = new LonglineDetailCompositionUIValidationHelper(ui1, getDecoratorService()); + this.validationHelper = new LonglineDetailCompositionUIValidationHelper(ui, getDecoratorService()); getBranchlineDetailUIModel().addPropertyChangeListener(BranchlineUIModel.PROPERTY_SAVED, branchlineDetailChanged); @@ -322,7 +318,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } - JVetoableTabbedPane tabPane = ui1.getFishingOperationTabPane(); + JVetoableTabbedPane tabPane = ui.getFishingOperationTabPane(); tabPane.setChangeSelectedIndex(tabbedPaneWillChanged); tabPane.addChangeListener(tabbedPaneChanged); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx index 9004083..20765b8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx @@ -54,9 +54,6 @@ <style source="../../Common.jcss"/> - <!-- handler --> - <LonglineGlobalCompositionUIHandler id='handler'/> - <!-- model --> <LonglineGlobalCompositionUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index f2abcad..f1587ab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -42,6 +42,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -54,13 +55,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ -public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLonglineGlobalCompositionDto, LonglineGlobalCompositionUI> { +public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLonglineGlobalCompositionDto, LonglineGlobalCompositionUI> implements UIHandler<LonglineGlobalCompositionUI> { /** Logger */ private static final Log log = LogFactory.getLog(LonglineGlobalCompositionUIHandler.class); - public LonglineGlobalCompositionUIHandler(LonglineGlobalCompositionUI ui) { - super(ui, DataContextType.ActivityLongline, DataContextType.SetLongline); + public LonglineGlobalCompositionUIHandler() { + super(DataContextType.ActivityLongline, DataContextType.SetLongline); } @Override @@ -93,40 +94,39 @@ public class LonglineGlobalCompositionUIHandler extends ContentUIHandler<SetLong } @Override - public void initUI() { - super.initUI(); + public void afterInit(LonglineGlobalCompositionUI ui) { + super.afterInit(ui); { // init floatlinesComposition tab - FloatlinesCompositionUI compositionUI = getUi().getFloatlinesCompositionUI(); + FloatlinesCompositionUI compositionUI = ui.getFloatlinesCompositionUI(); compositionUI.init(); - getUi().getFloatlinesCompositionPanel().remove(compositionUI); - getUi().getFloatlinesCompositionPanel().add(compositionUI.getBody()); + ui.getFloatlinesCompositionPanel().remove(compositionUI); + ui.getFloatlinesCompositionPanel().add(compositionUI.getBody()); } { // init branchlinesComposition tab - BranchlinesCompositionUI compositionUI = getUi().getBranchlinesCompositionUI(); + BranchlinesCompositionUI compositionUI = ui.getBranchlinesCompositionUI(); compositionUI.init(); - getUi().getBranchlinesCompositionPanel().remove(compositionUI); - getUi().getBranchlinesCompositionPanel().add(compositionUI.getBody()); + ui.getBranchlinesCompositionPanel().remove(compositionUI); + ui.getBranchlinesCompositionPanel().add(compositionUI.getBody()); } { // init hooksComposition tab - HooksCompositionUI compositionUI = getUi().getHooksCompositionUI(); + HooksCompositionUI compositionUI = ui.getHooksCompositionUI(); compositionUI.init(); - getUi().getHooksCompositionPanel().remove(compositionUI); - getUi().getHooksCompositionPanel().add(compositionUI.getBody()); + ui.getHooksCompositionPanel().remove(compositionUI); + ui.getHooksCompositionPanel().add(compositionUI.getBody()); } { // init baitsComposition tab - BaitsCompositionUI compositionUI = getUi().getBaitsCompositionUI(); + BaitsCompositionUI compositionUI = ui.getBaitsCompositionUI(); compositionUI.init(); - getUi().getBaitsCompositionPanel().remove(compositionUI); - getUi().getBaitsCompositionPanel().add(compositionUI.getBody()); + ui.getBaitsCompositionPanel().remove(compositionUI); + ui.getBaitsCompositionPanel().add(compositionUI.getBody()); } - } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx index ec02721..7b48e48 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx @@ -58,9 +58,6 @@ <style source="../../Common.jcss"/> - <!-- handler --> - <SetLonglineUIHandler id='handler'/> - <!-- model --> <SetLonglineUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index 4171be6..0fdceee 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -39,6 +39,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineService; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.HidorButton; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -62,7 +63,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLonglineUI> { +public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLonglineUI> implements UIHandler<SetLonglineUI> { /** Logger */ private static final Log log = LogFactory.getLog(SetLonglineUIHandler.class); @@ -80,8 +81,8 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLo protected boolean coordinateFormatChangedIsChanging; - public SetLonglineUIHandler(SetLonglineUI ui) { - super(ui, DataContextType.ActivityLongline, DataContextType.SetLongline); + public SetLonglineUIHandler() { + super(DataContextType.ActivityLongline, DataContextType.SetLongline); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -133,23 +134,21 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto, SetLo } @Override - public void initUI() { + public void afterInit(SetLonglineUI ui) { + super.afterInit(ui); - super.initUI(); + ui.getSettingStartTimeStamp().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getSettingEndTimeStamp().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getHaulingStartTimeStamp().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getHaulingEndTimeStamp().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - getUi().getSettingStartTimeStamp().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - getUi().getSettingEndTimeStamp().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - getUi().getHaulingStartTimeStamp().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - getUi().getHaulingEndTimeStamp().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - - getUi().getSettingStartCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); - getUi().getSettingEndCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); - getUi().getHaulingStartCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); - getUi().getHaulingEndCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); + ui.getSettingStartCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); + ui.getSettingEndCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); + ui.getHaulingStartCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); + ui.getHaulingEndCoordinates().getModel().addPropertyChangeListener(CoordinatesEditorModel.PROPERTY_FORMAT, onCoordinateFormatChangedListener); } - @Override public void openUI() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx index 3485cc9..c1dd9bb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx @@ -46,9 +46,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <FloatingObjectTransmittingBuoyOperationUIHandler id='handler'/> - <!-- model --> <FloatingObjectTransmittingBuoyOperationUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 6f46841..4bd19b7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -42,6 +42,7 @@ import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyHelper; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyHelper; import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -59,13 +60,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIHandler<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyOperationUI> { +public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIHandler<FloatingObjectTransmittingBuoyDto, FloatingObjectTransmittingBuoyOperationUI> implements UIHandler<FloatingObjectTransmittingBuoyOperationUI> { /** Logger */ private static final Log log = LogFactory.getLog(FloatingObjectTransmittingBuoyOperationUIHandler.class); - public FloatingObjectTransmittingBuoyOperationUIHandler(FloatingObjectTransmittingBuoyOperationUI ui) { - super(ui, DataContextType.FloatingObject, null); + public FloatingObjectTransmittingBuoyOperationUIHandler() { + super(DataContextType.FloatingObject, null); } @Override @@ -202,10 +203,6 @@ public class FloatingObjectTransmittingBuoyOperationUIHandler extends ContentUIH getModel().setModified(false); } - public boolean isBalisePose(TransmittingBuoyOperationDto operation) { - return operation != null && "3".equals(operation.getCode()); - } - public boolean isBalisePose(ReferentialReference<TransmittingBuoyOperationDto> operation) { return operation != null && "3".equals(operation.getPropertyValue(TransmittingBuoyOperationDto.PROPERTY_CODE)); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx index c4d6e7b..3f04bea 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -48,9 +48,6 @@ <style source="../../Common.jcss"/> - <!-- handler --> - <FloatingObjectUIHandler id='handler'/> - <!-- model --> <FloatingObjectUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index 7974089..de2541e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -37,6 +37,7 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectHelper; import fr.ird.observe.services.service.data.seine.FloatingObjectService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -47,13 +48,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, FloatingObjectUI> { +public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, FloatingObjectUI> implements UIHandler<FloatingObjectUI> { /** Logger */ private static final Log log = LogFactory.getLog(FloatingObjectUIHandler.class); - public FloatingObjectUIHandler(FloatingObjectUI ui) { - super(ui, DataContextType.ActivitySeine, DataContextType.FloatingObject); + public FloatingObjectUIHandler() { + super(DataContextType.ActivitySeine, DataContextType.FloatingObject); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx index 252f7c4..c6ae470 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx @@ -51,9 +51,6 @@ <style source="../../Common.jcss"/> - <!-- handler --> - <SetSeineUIHandler id='handler'/> - <!-- model --> <SetSeineUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index 1d30aeb..4b44419 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -41,6 +41,7 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineHelper; import fr.ird.observe.services.service.data.seine.RouteService; import fr.ird.observe.services.service.data.seine.SetSeineService; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.HidorButton; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -62,7 +63,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> { +public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> implements UIHandler<SetSeineUI> { /** Logger */ private static final Log log = LogFactory.getLog(SetSeineUIHandler.class); @@ -75,8 +76,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> protected boolean toogleTimeEditorSliderIsChanging; - public SetSeineUIHandler(SetSeineUI ui) { - super(ui, DataContextType.ActivitySeine, DataContextType.SetSeine); + public SetSeineUIHandler() { + super(DataContextType.ActivitySeine, DataContextType.SetSeine); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -127,11 +128,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto, SetSeineUI> } @Override - public void initUI() { - - super.initUI(); - - SetSeineUI ui = getUi(); + public void afterInit(SetSeineUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx index 2fd605b..3290473 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx @@ -24,6 +24,7 @@ genericType='E extends IdDto, C extends DataDto, U extends ContentListUI<E,C, U>'> <import> + fr.ird.observe.application.swing.ui.content.ContentUIHandler fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport fr.ird.observe.services.dto.DataDto @@ -52,10 +53,13 @@ <ListSelectionModel id='listSelectionModel' initializer='new DefaultListSelectionModel()' onValueChanged='if (!event.getValueIsAdjusting()) getModel().setSelectedDatas(getSelectedDatas());'/> - <ContentListUIHandler id='handler' genericType='E, C, U'/> + <!--<ContentListUIHandler id='handler' genericType='E, C, U' initializer='(ContentListUIHandler) ContentUIHandler.newHandler((U) this)'/>--> <script><![CDATA[ +@Override +public abstract ContentListUIHandler<E,C,U> getHandler(); + public abstract JButton getGotoSelected(); public abstract JButton getGotoOpen(); public abstract JButton getReopen(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss index a2fbddf..4e746b9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss @@ -35,7 +35,7 @@ _entityClass:{getModel().getChildType()}; showReset:true; list:{list}; - data:{getHandler().updateList(listHeader, model.getData())}; + /*data:{getHandler().updateList(listHeader, model.getData())};*/ labelText:{t(getListText())}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index 8ae5090..a730722 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -32,8 +32,12 @@ import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDto; import jaxx.runtime.swing.editor.bean.BeanListHeader; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; import javax.swing.DefaultListCellRenderer; import javax.swing.Icon; @@ -48,8 +52,6 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; -import static org.nuiton.i18n.I18n.t; - /** * @author Tony Chemit - chemit@codelutin.com * @since 1.5 @@ -59,8 +61,8 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U /** Logger */ private static final Log log = LogFactory.getLog(ContentListUIHandler.class); - public ContentListUIHandler(U ui, DataContextType parentType, DataContextType type) { - super(ui, parentType, type); + public ContentListUIHandler(DataContextType parentType, DataContextType type) { + super(parentType, type); } @Override @@ -74,24 +76,37 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U } @Override - public void initUI() { - super.initUI(); + public void afterInit(U ui) { + super.afterInit(ui); - // on installe un renderer sur la liste pour afficher les couleurs + - // icones comme dans l'arbre - ListCellRenderer renderer = getUi().getList().getCellRenderer(); - NavigationTree treeHelper = getTreeHelper(getUi()); + // on installe un renderer sur la liste pour afficher les couleurs + icones comme dans l'arbre + ListCellRenderer renderer = ui.getList().getCellRenderer(); + NavigationTree treeHelper = getTreeHelper(ui); - getUi().getList().setCellRenderer(new EntityListCellRenderer(renderer, treeHelper)); + ui.getList().setCellRenderer(new EntityListCellRenderer(renderer, treeHelper)); - getModel().addPropertyChangeListener(ContentListUIModel.PROPERTY_SELECTED_DATAS, e -> { - ContentListUIModel model = (ContentListUIModel) e.getSource(); + ContentListUIModel<E, C> model = ui.getModel(); + model.addPropertyChangeListener(ContentListUIModel.PROPERTY_SELECTED_DATAS, e -> { model.setCanClose(computeCanClose()); model.setCanReopen(computeCanReopen()); model.setCanCreate(computeCanCreate()); model.setCanMove(computeCanMove()); model.setCanGotoSelected(computeCanGotoSelected()); }); + + model.addPropertyChangeListener(ContentListUIModel.PROPERTY_DATA, e -> updateList((List) e.getNewValue())); + } + + protected void updateList(List<DataReference<C>> data) { + BeanListHeader<DataReference<C>> list = ui.getListHeader(); + if (CollectionUtils.isNotEmpty(data)) { + if (log.isDebugEnabled()) { + log.debug(list.getName() + " - " + data.size()); + } + Decorator<DataReference<C>> decorator = list.getHandler().getDecorator(); + DecoratorUtil.sort((JXPathDecorator<DataReference<C>>) decorator, data, 0); + list.setData(data); + } } @Override @@ -198,7 +213,9 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U } public void addChild() { - addChild(getModel().getChildType()); + NavigationTree treeHelper = getTreeHelper(ui); + NavigationTreeNodeSupport parentNode = treeHelper.getSelectedNode(); + treeHelper.addUnsavedNode(parentNode, getModel().getChildType()); } /** @@ -214,11 +231,6 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U } } - <EE> List<EE> updateList(BeanListHeader<EE> list, List<EE> data) { - String message = t(getUi().getEmptyListMessage()); - return updateList(list, data, message); - } - /** * Pour effectuer un traitement supplémantaire à la fin de la méthode * {@link #openUI()}. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx index 38aa3ee..3d9ea55 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUI.jaxx @@ -47,9 +47,6 @@ public JButton getCreate() { return closeAndCreate; } </script> - <!-- handler --> - <ActivityLonglinesUIHandler id='handler' constructorParams='this'/> - <!-- model --> <ActivityLonglinesUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index a5e513b..06212a5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -32,6 +32,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.n; @@ -41,10 +42,10 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglineDto, ActivityLonglineDto, ActivityLonglinesUI> { +public class ActivityLonglinesUIHandler extends ContentListUIHandler<TripLonglineDto, ActivityLonglineDto, ActivityLonglinesUI> implements UIHandler<ActivityLonglinesUI> { - public ActivityLonglinesUIHandler(ActivityLonglinesUI ui) { - super(ui, DataContextType.TripLongline, DataContextType.ActivityLongline); + public ActivityLonglinesUIHandler() { + super(DataContextType.TripLongline, DataContextType.ActivityLongline); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx index 1a32450..afeb728 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUI.jaxx @@ -40,9 +40,6 @@ <style source="../CommonListUI.jcss"/> - <!-- handler --> - <TripLonglinesUIHandler id='handler' constructorParams='this'/> - <!-- model --> <TripLonglinesUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java index a559283..25abb31 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.n; @@ -43,10 +44,10 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, TripLonglineDto, TripLonglinesUI> { +public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, TripLonglineDto, TripLonglinesUI> implements UIHandler<TripLonglinesUI> { - public TripLonglinesUIHandler(TripLonglinesUI ui) { - super(ui, DataContextType.Program, DataContextType.TripLongline); + public TripLonglinesUIHandler() { + super(DataContextType.Program, DataContextType.TripLongline); } @Override @@ -89,13 +90,6 @@ public class TripLonglinesUIHandler extends ContentListUIHandler<ProgramDto, Tri String title = getDecoratorService().getReferentialReferenceDecorator(ProgramDto.class).toString(data); TripLonglinesUI ui = getUi(); ui.setContentTitle(title); - - TripLonglinesUIModel model = ui.getModel(); - - model.addPropertyChangeListener(e -> { - - }); - } protected boolean computeCanReopen() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jaxx index 0d6175b..2560492 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUI.jaxx @@ -45,9 +45,6 @@ public JButton getCreate() { return closeAndCreate; } </script> - <!-- handler --> - <ActivitySeinesUIHandler id='handler' constructorParams='this'/> - <!-- model --> <ActivitySeinesUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index 376613a..612c467 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -29,9 +29,9 @@ import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; +import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.n; @@ -39,10 +39,10 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, ActivitySeineDto, ActivitySeinesUI> { +public class ActivitySeinesUIHandler extends ContentListUIHandler<RouteDto, ActivitySeineDto, ActivitySeinesUI> implements UIHandler<ActivitySeinesUI> { - public ActivitySeinesUIHandler(ActivitySeinesUI ui) { - super(ui, DataContextType.Route, DataContextType.ActivitySeine); + public ActivitySeinesUIHandler() { + super(DataContextType.Route, DataContextType.ActivitySeine); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jaxx index ea484c9..f926b08 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUI.jaxx @@ -42,9 +42,6 @@ <style source="../CommonListUI.jcss"/> - <!-- handler --> - <RoutesUIHandler id='handler' constructorParams='this'/> - <!-- model --> <RoutesUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java index 42284ec..a017bb2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java @@ -31,6 +31,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.n; @@ -38,10 +39,10 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto, RoutesUI> { +public class RoutesUIHandler extends ContentListUIHandler<TripSeineDto, RouteDto, RoutesUI> implements UIHandler<RoutesUI> { - public RoutesUIHandler(RoutesUI ui) { - super(ui, DataContextType.TripSeine, DataContextType.Route); + public RoutesUIHandler() { + super(DataContextType.TripSeine, DataContextType.Route); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx index 4764967..676ef34 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUI.jaxx @@ -41,9 +41,6 @@ <style source="../CommonListUI.jcss"/> - <!-- handler --> - <TripSeinesUIHandler id='handler' constructorParams='this'/> - <!-- model --> <TripSeinesUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java index 5440750..e30ead1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -33,6 +33,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; +import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.n; @@ -40,10 +41,10 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSeineDto, TripSeinesUI> { +public class TripSeinesUIHandler extends ContentListUIHandler<ProgramDto, TripSeineDto, TripSeinesUI> implements UIHandler<TripSeinesUI> { - public TripSeinesUIHandler(TripSeinesUI ui) { - super(ui, DataContextType.Program, DataContextType.TripSeine); + public TripSeinesUIHandler() { + super(DataContextType.Program, DataContextType.TripSeine); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jaxx index f142c18..c25e55c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUI.jaxx @@ -44,14 +44,14 @@ </import> - <!-- handler --> - <ContentOpenableUIHandler id='handler' genericType='E, U'/> - <!-- model --> <ContentOpenableUIModel id='model' genericType='E' enabled='{!model.isReadingMode()}'/> <script><![CDATA[ + @Override + public abstract ContentOpenableUIHandler<E,U> getHandler(); + public void openData() { getHandler().openDataUI(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java index 8b4081d..bc2c5d9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/ContentOpenableUIHandler.java @@ -54,11 +54,10 @@ public abstract class ContentOpenableUIHandler<E extends IdDto, U extends Conten protected final String closeMessage; - public ContentOpenableUIHandler(U ui, - DataContextType parentType, + public ContentOpenableUIHandler(DataContextType parentType, DataContextType type, String closeMessage) { - super(ui, parentType, type); + super(parentType, type); this.closeMessage = closeMessage; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx index 22aaa39..0a5b0fd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx @@ -48,9 +48,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <ActivityLonglineUIHandler id='handler'/> - <!-- model --> <ActivityLonglineUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index c35bbfd..8608793 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -36,6 +36,7 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.data.longline.ActivityLonglineService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -52,7 +53,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglineDto, ActivityLonglineUI> { +class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglineDto, ActivityLonglineUI> implements UIHandler<ActivityLonglineUI> { /** Logger */ private static final Log log = LogFactory.getLog(ActivityLonglineUIHandler.class); @@ -65,11 +66,8 @@ class ActivityLonglineUIHandler extends ContentOpenableUIHandler<ActivityLonglin } - public ActivityLonglineUIHandler(ActivityLonglineUI ui) { - super(ui, - DataContextType.TripLongline, - DataContextType.ActivityLongline, - n("observe.storage.activityLongline.message.not.open")); + public ActivityLonglineUIHandler() { + super(DataContextType.TripLongline, DataContextType.ActivityLongline, n("observe.storage.activityLongline.message.not.open")); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx index d7355eb..fbc7f1b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx @@ -49,9 +49,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <TripLonglineUIHandler id='handler'/> - <!-- model --> <TripLonglineUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java index e0e4e93..5e683bf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -60,18 +61,15 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto,TripLonglineUI> { +class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, TripLonglineUI> implements UIHandler<TripLonglineUI> { /** Logger */ static private final Log log = LogFactory.getLog(TripLonglineUIHandler.class); private boolean buildTripMap = true; - public TripLonglineUIHandler(TripLonglineUI ui) { - super(ui, - DataContextType.Program, - DataContextType.TripLongline, - n("observe.content.tripLongline.message.not.open")); + public TripLonglineUIHandler() { + super(DataContextType.Program, DataContextType.TripLongline, n("observe.content.tripLongline.message.not.open")); } @Override @@ -84,10 +82,8 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto,Tri } @Override - public void initUI() { - super.initUI(); - - TripLonglineUI ui = getUi(); + public void afterInit(TripLonglineUI ui) { + super.afterInit(ui); TripMapUI tripMap = ui.getTripMap(); ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); @@ -120,9 +116,9 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto,Tri } }); - getUi().getVessel().getIndexes().setSelectedButton(1); - getUi().getDepartureHarbour().getIndexes().setSelectedButton(1); - getUi().getLandingHarbour().getIndexes().setSelectedButton(1); + ui.getVessel().getIndexes().setSelectedButton(1); + ui.getDepartureHarbour().getIndexes().setSelectedButton(1); + ui.getLandingHarbour().getIndexes().setSelectedButton(1); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx index b65709a..e2d2d4f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx @@ -57,9 +57,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <ActivitySeineUIHandler id='handler' constructorParams='this'/> - <!-- model --> <ActivitySeineUIModel id='model'/> @@ -77,18 +74,6 @@ </BeanValidator> - <script><![CDATA[ - -void $afterCompleteSetup() { - String label = getHandler().getActivity6Label(); - String text = t("observe.common.vesselActivitySeine.comment", label); - vesselActivityInformation.setText(text); - vesselActivityInformation.setToolTipText(text); -} - -]]> - </script> - <!-- formulaire --> <JPanel id="body"> <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java index dcfe28e..0987626 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -39,6 +39,7 @@ import fr.ird.observe.services.dto.seine.ActivitySeineHelper; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.ActivitySeineService; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; @@ -58,7 +59,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, ActivitySeineUI> { +class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, ActivitySeineUI> implements UIHandler<ActivitySeineUI> { /** Logger */ private static final Log log = LogFactory.getLog(ActivitySeineUIHandler.class); @@ -66,10 +67,8 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - ActivitySeineUIHandler(ActivitySeineUI ui) { - super(ui, - DataContextType.Route, - DataContextType.ActivitySeine, + ActivitySeineUIHandler() { + super(DataContextType.Route, DataContextType.ActivitySeine, n("observe.storage.activitySeine.message.not.open")); computeTabValidStateListener = e -> { @@ -160,15 +159,18 @@ class ActivitySeineUIHandler extends ContentOpenableUIHandler<ActivitySeineDto, } @Override - public void initUI() { - - super.initUI(); + public void afterInit(ActivitySeineUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) - getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add - getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); + String label = getActivity6Label(); + String text = t("observe.common.vesselActivitySeine.comment", label); + ui.vesselActivityInformation.setText(text); + ui.vesselActivityInformation.setToolTipText(text); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx index 7fecea6..4727756 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx @@ -36,9 +36,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <RouteUIHandler id='handler' constructorParams='this'/> - <!-- model --> <RouteUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java index 63b902b..39517b0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteHelper; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.RouteService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -55,16 +56,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -class RouteUIHandler extends ContentOpenableUIHandler<RouteDto, RouteUI> { +class RouteUIHandler extends ContentOpenableUIHandler<RouteDto, RouteUI> implements UIHandler<RouteUI> { /** Logger */ private static final Log log = LogFactory.getLog(RouteUIHandler.class); - RouteUIHandler(RouteUI ui) { - super(ui, - DataContextType.TripSeine, - DataContextType.Route, - n("observe.content.route.message.not.open")); + RouteUIHandler() { + super(DataContextType.TripSeine, DataContextType.Route, n("observe.content.route.message.not.open")); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx index 51dcc25..e2b45aa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -50,9 +50,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <TripSeineUIHandler id='handler' constructorParams='this'/> - <!-- model --> <TripSeineUIModel id='model'/> @@ -60,11 +57,8 @@ <TripSeineDto id='bean'/> <!-- validator --> - <BeanValidator id='validator' - beanClass='fr.ird.observe.services.dto.seine.TripSeineDto' - errorTableModel='{getErrorTableModel()}' - autoField='true' - context='ui-update'> + <BeanValidator id='validator' beanClass='fr.ird.observe.services.dto.seine.TripSeineDto' + errorTableModel='{getErrorTableModel()}' autoField='true' context='ui-update'> <field name='route' component='{actionDown}'/> </BeanValidator> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java index d790fe7..be379af 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -39,16 +39,13 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; import fr.ird.observe.services.service.data.seine.TripSeineService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; import javax.swing.JTabbedPane; -import javax.swing.LayoutFocusTraversalPolicy; import javax.swing.SwingUtilities; -import java.awt.Component; -import java.awt.Container; -import java.awt.FocusTraversalPolicy; import java.util.Collection; import java.util.Date; import java.util.LinkedList; @@ -61,18 +58,15 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSeineUI> { +class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSeineUI> implements UIHandler<TripSeineUI> { /** Logger */ static private final Log log = LogFactory.getLog(TripSeineUIHandler.class); private boolean buildTripMap = true; - TripSeineUIHandler(TripSeineUI ui) { - super(ui, - DataContextType.Program, - DataContextType.TripSeine, - n("observe.content.tripSeine.message.not.open")); + TripSeineUIHandler() { + super(DataContextType.Program, DataContextType.TripSeine, n("observe.content.tripSeine.message.not.open")); } @Override @@ -85,28 +79,25 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein } @Override - public void initUI() { - super.initUI(); + public void afterInit(TripSeineUI ui) { + super.afterInit(ui); - TripSeineUI ui = getUi(); TripMapUI tripMap = ui.getTripMap(); ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); tripMap.getHandler().setConfig(config); - getUi().getTripSeineTabPane().addChangeListener(e -> { + ui.getTripSeineTabPane().addChangeListener(e -> { JTabbedPane tripSeineTabPane = (JTabbedPane) e.getSource(); - TripSeineUI ui1 = getUi(); - TripMapUI tripMap1 = ui1.getTripMap(); + TripMapUI tripMap1 = ui.getTripMap(); if (tripSeineTabPane.getSelectedComponent().equals(tripMap1)) { - ui1.getActions().setVisible(false); + ui.getActions().setVisible(false); if (buildTripMap) { SwingUtilities.invokeLater(() -> { ObserveSwingApplicationContext.get().getMainUI().getModel().setBusy(true); try { - TripSeineUI ui11 = getUi(); - TripMapUI tripMap11 = ui11.getTripMap(); + TripMapUI tripMap11 = ui.getTripMap(); TripMapDto tripSeineMap = getTripSeineService().getTripSeineMap(getSelectedId()); tripMap11.getHandler().doOpenMap(tripSeineMap); } finally { @@ -117,14 +108,13 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein } } else { - ui1.getActions().setVisible(true); + ui.getActions().setVisible(true); } }); - getUi().getVessel().getIndexes().setSelectedButton(1); - getUi().getDepartureHarbour().getIndexes().setSelectedButton(1); - getUi().getLandingHarbour().getIndexes().setSelectedButton(1); - + ui.getVessel().getIndexes().setSelectedButton(1); + ui.getDepartureHarbour().getIndexes().setSelectedButton(1); + ui.getLandingHarbour().getIndexes().setSelectedButton(1); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jcss index a4ef0b7..f0c88ef 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentI18nReferenceUI.jcss @@ -1,3 +1,7 @@ +#editI18nTable { + visible:true; +} + #label1Label { text:"observe.common.label1"; labelFor:{label1}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx index 19de298..36c6205 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx @@ -33,6 +33,7 @@ fr.ird.observe.application.swing.ui.actions.content.CreateNewReferentialUIAction fr.ird.observe.application.swing.ui.actions.content.DeleteReferenceUIAction fr.ird.observe.application.swing.ui.actions.content.EditReferentialUIAction + fr.ird.observe.application.swing.ui.actions.content.EditReferentialFromListUIAction fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction fr.ird.observe.application.swing.ui.actions.content.SaveEditUIAction @@ -69,8 +70,6 @@ <ReferentialDto id='bean'/> - <ContentReferenceUIHandler id='handler' genericType='E, U' constructorParams='(U) this'/> - <BlockingLayerUI id='editKeyTableLayerUI'/> <CardLayout2Ext id='viewLayout' constructorParams='this, "body"'/> @@ -85,6 +84,9 @@ public abstract SwingValidator<E> getValidator(); public abstract JTextField getUri(); +@Override +public abstract ContentReferenceUIHandler<E, U> getHandler(); + public void decorateUniqueKeyTable(JTable table, TableCellRenderer renderer, JScrollPane pane) { @@ -156,10 +158,10 @@ viewLayout.addLayoutComponent(editView, DETAIL_VIEW); <JButton id='create'/> </cell> <cell> - <JButton id='modify' styleClass="edit"/> + <JButton id='modify'/> </cell> <cell> - <JButton id='detail' styleClass="edit"/> + <JButton id='detail'/> </cell> <cell> <JButton id='deleteFromList' styleClass='delete'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss index 15cacec..a5ba8db 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jcss @@ -20,11 +20,6 @@ * #L% */ -.edit { - _observeAction:{EditReferentialUIAction.ACTION_NAME}; - enabled:{model.getSelectedBean() != null}; -} - .delete { _observeAction:"DeleteReferenceUIAction.ACTION_NAME"; _globalAction:{DeleteDataGlobalUIAction.ACTION_NAME}; @@ -45,10 +40,6 @@ block:{model.isUpdatingMode()}; } -#viewLayout { - selected:{getHandler().updateView(model.isEditing())}; -} - #body { layout:{viewLayout}; } @@ -77,14 +68,15 @@ } #modify { - _text:{t("observe.action.modify")}; + _observeAction:{EditReferentialUIAction.ACTION_NAME}; _toolTipText:{modifyToolTip}; + enabled:{model.getSelectedBean() != null}; visible:{model.isUpdatingMode()}; } #detail { - _text:{t("observe.action.detail")}; - actionIcon:"go-detail"; + _observeAction:{EditReferentialFromListUIAction.ACTION_NAME}; + enabled:{model.getSelectedBean() != null}; visible:{model.isReadingMode()}; } @@ -98,7 +90,7 @@ #editI18nTable { border:{new TitledBorder(t("observe.common.libelles"))}; - visible:{getHandler().canSeeI18nTable(model.getBean())}; + visible:false; } #reset { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java index a727c25..e2cef8a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java @@ -42,7 +42,6 @@ import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.referential.ReferentialService; @@ -100,11 +99,10 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte private final Runnable revalidate; - private final ReferentialContentUIInitializer<E, U> uiInitializer; + private ReferentialContentUIInitializer<E, U> uiInitializer; - public ContentReferenceUIHandler(U ui) { - super(ui, null, null); - uiInitializer = new ReferentialContentUIInitializer<>(ui); + public ContentReferenceUIHandler() { + super(null, null); revalidate = () -> { @@ -123,6 +121,25 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte }; } + @Override + public void beforeInit(U ui) { + super.beforeInit(ui); + uiInitializer = new ReferentialContentUIInitializer<>(ui); + } + + @Override + public void afterInit(U ui) { + + uiInitializer.initUI(); + + ui.getViewLayout().addPropertyChangeListener(CardLayout2Ext.SELECTED_PROPERTY_NAME, + evt -> SwingUtilities.invokeLater(revalidate)); + + ObserveSwingApplicationContext.get().getFocusManager().installFocusTraversalPolicy(ui); + + ui.getModel().addPropertyChangeListener(ContentReferenceUIModel.PROPERTY_EDITING, e -> updateView((Boolean) e.getNewValue())); + } + private static <E extends ReferentialDto> Pair<Boolean, ReferentialReference<E>> showUsagesForDelete(JAXXContext tx, E entity, ReferenceMap usages, @@ -381,20 +398,6 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte } @Override - public void initUI() { - - uiInitializer.initUI(); - - U ui = getUi(); - - ui.getViewLayout().addPropertyChangeListener(CardLayout2Ext.SELECTED_PROPERTY_NAME, - evt -> SwingUtilities.invokeLater(revalidate)); - - ObserveSwingApplicationContext.get().getFocusManager().installFocusTraversalPolicy(ui); - - } - - @Override public void openUI() { super.openUI(); @@ -814,15 +817,11 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte return incomingReferences; } - boolean canSeeI18nTable(E bean) { - return bean instanceof I18nReferentialDto || bean instanceof VesselSizeCategoryDto; - } - - String updateView(boolean editing) { + void updateView(boolean editing) { if (log.isDebugEnabled()) { log.debug("Editing has changed : " + editing); } - return editing ? ContentReferenceUI.DETAIL_VIEW : ContentReferenceUI.LIST_VIEW; + getUi().getViewLayout().setSelected(editing ? ContentReferenceUI.DETAIL_VIEW : ContentReferenceUI.LIST_VIEW); } private void copyIntoBean(E source, E target) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jaxx index 3326f7c..6d3a065 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUI.jaxx @@ -28,8 +28,6 @@ <ReferenceHomeUIModel id='model'/> - <ReferenceHomeUIHandler id='handler' constructorParams='this'/> - <Table id='body' fill='both' weighty="1"> <row weighty="1" weightx="1"> <cell> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java index 1739471..5d4fad8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java @@ -27,6 +27,7 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.services.dto.referential.ProgramDto; +import jaxx.runtime.spi.UIHandler; /** * Created on 9/28/14. @@ -34,10 +35,10 @@ import fr.ird.observe.services.dto.referential.ProgramDto; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto, ReferenceHomeUI> { +public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto, ReferenceHomeUI> implements UIHandler<ReferenceHomeUI> { - public ReferenceHomeUIHandler(ReferenceHomeUI ui) { - super(ui, null, null); + public ReferenceHomeUIHandler() { + super(null, null); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java new file mode 100644 index 0000000..ceca600 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.CountryDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class CountryUIHandler extends ContentReferenceUIHandler<CountryDto, CountryUI> implements UIHandler<CountryUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java new file mode 100644 index 0000000..03dfe6f --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.FpaZoneDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class FpaZoneUIHandler extends ContentReferenceUIHandler<FpaZoneDto, FpaZoneUI> implements UIHandler<FpaZoneUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java new file mode 100644 index 0000000..4649c2b --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class GearCaracteristicTypeUIHandler extends ContentReferenceUIHandler<GearCaracteristicTypeDto, GearCaracteristicTypeUI> implements UIHandler<GearCaracteristicTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java new file mode 100644 index 0000000..f25d5ee --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class GearCaracteristicUIHandler extends ContentReferenceUIHandler<GearCaracteristicDto, GearCaracteristicUI> implements UIHandler<GearCaracteristicUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx index 88dbab2..8a0c9d0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx @@ -46,9 +46,6 @@ <!-- edit bean --> <GearDto id='bean'/> - <!-- handler --> - <GearUIHandler id='handler' constructorParams="this"/> - <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java index 82a8e69..8f7089f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; @@ -39,13 +40,13 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUIHandler extends ContentReferenceUIHandler<GearDto, GearUI> { +public class GearUIHandler extends ContentReferenceUIHandler<GearDto, GearUI> implements UIHandler<GearUI> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - public GearUIHandler(GearUI ui) { - super(ui); + public GearUIHandler() { + super(); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -55,15 +56,13 @@ public class GearUIHandler extends ContentReferenceUIHandler<GearDto, GearUI> { } @Override - public void initUI() { - - super.initUI(); + public void afterInit(GearUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) - getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add - getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); - + ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java new file mode 100644 index 0000000..465f0f4 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.HarbourDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class HarbourUIHandler extends ContentReferenceUIHandler<HarbourDto, HarbourUI> implements UIHandler<HarbourUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx index e61e3b3..4a25db9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx @@ -49,9 +49,6 @@ <!-- model --> <LengthLengthParameterUIModel id='model'/> - <!-- handler --> - <LengthLengthParameterUIHandler id='handler' constructorParams="this"/> - <!-- edit bean --> <LengthLengthParameterDto id='bean'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java index c171793..65012c7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; @@ -39,13 +40,13 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 6.0 */ -public class LengthLengthParameterUIHandler extends ContentReferenceUIHandler<LengthLengthParameterDto, LengthLengthParameterUI> { +public class LengthLengthParameterUIHandler extends ContentReferenceUIHandler<LengthLengthParameterDto, LengthLengthParameterUI> implements UIHandler<LengthLengthParameterUI> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - public LengthLengthParameterUIHandler(LengthLengthParameterUI ui) { - super(ui); + public LengthLengthParameterUIHandler() { + super(); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -55,15 +56,13 @@ public class LengthLengthParameterUIHandler extends ContentReferenceUIHandler<Le } @Override - public void initUI() { - - super.initUI(); + public void afterInit(LengthLengthParameterUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) - getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add - getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); - + ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx index 082a22b..eb5ce6c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx @@ -54,9 +54,6 @@ <!-- model --> <LengthWeightParameterUIModel id='model'/> - <!-- handler --> - <LengthWeightParameterUIHandler id='handler' constructorParams="this"/> - <!-- edit bean --> <LengthWeightParameterDto id='bean'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java index f059032..b89642a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; @@ -39,13 +40,13 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<LengthWeightParameterDto, LengthWeightParameterUI> { +public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<LengthWeightParameterDto, LengthWeightParameterUI> implements UIHandler<LengthWeightParameterUI> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - public LengthWeightParameterUIHandler(LengthWeightParameterUI ui) { - super(ui); + public LengthWeightParameterUIHandler() { + super(); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -55,16 +56,13 @@ public class LengthWeightParameterUIHandler extends ContentReferenceUIHandler<Le } @Override - public void initUI() { - - super.initUI(); + public void afterInit(LengthWeightParameterUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) - getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add - getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); - - } + ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); } @Override public void selectBean(ReferentialReference<LengthWeightParameterDto> selectedBean) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIHandler.java new file mode 100644 index 0000000..d79bbba --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.OceanDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class OceanUIHandler extends ContentReferenceUIHandler<OceanDto, OceanUI> implements UIHandler<OceanUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIHandler.java new file mode 100644 index 0000000..c2a26ae --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.OrganismDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class OrganismUIHandler extends ContentReferenceUIHandler<OrganismDto, OrganismUI> implements UIHandler<OrganismUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIHandler.java new file mode 100644 index 0000000..186c3c9 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.PersonDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class PersonUIHandler extends ContentReferenceUIHandler<PersonDto, PersonUI> implements UIHandler<PersonUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx index 9fc60ad..abf51e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx @@ -51,9 +51,6 @@ <!-- model --> <ProgramUIModel id='model'/> - <!-- handler --> - <ProgramUIHandler id='handler' constructorParams="this"/> - <!-- edit bean --> <ProgramDto id='bean'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java index 37d44e3..0f36833 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; @@ -39,13 +40,13 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto, ProgramUI> { +public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto, ProgramUI> implements UIHandler<ProgramUI> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - public ProgramUIHandler(ProgramUI ui) { - super(ui); + public ProgramUIHandler() { + super(); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -55,15 +56,12 @@ public class ProgramUIHandler extends ContentReferenceUIHandler<ProgramDto, Prog } @Override - public void initUI() { - - super.initUI(); - + public void afterInit(ProgramUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) - getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add - getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); - + ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIHandler.java new file mode 100644 index 0000000..a760197 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.SexDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SexUIHandler extends ContentReferenceUIHandler<SexDto, SexUI> implements UIHandler<SexUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUIHandler.java new file mode 100644 index 0000000..cf90e27 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.ShipOwnerDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ShipOwnerUIHandler extends ContentReferenceUIHandler<ShipOwnerDto, ShipOwnerUI> implements UIHandler<ShipOwnerUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIHandler.java new file mode 100644 index 0000000..846c93e --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SizeMeasureTypeUIHandler extends ContentReferenceUIHandler<SizeMeasureTypeDto, SizeMeasureTypeUI> implements UIHandler<SizeMeasureTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIHandler.java similarity index 50% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIHandler.java index 1739471..34839e1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIHandler.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.swing.ui.content.ref; +package fr.ird.observe.application.swing.ui.content.ref.impl; /* * #%L @@ -22,32 +22,15 @@ package fr.ird.observe.application.swing.ui.content.ref; * #L% */ -import fr.ird.observe.application.swing.db.DataContext; -import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.content.ContentMode; -import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.SpeciesGroupDto; +import jaxx.runtime.spi.UIHandler; /** - * Created on 9/28/14. + * Created on 1/11/15. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 3.11 */ -public class ReferenceHomeUIHandler extends ContentUIHandler<ProgramDto, ReferenceHomeUI> { - - public ReferenceHomeUIHandler(ReferenceHomeUI ui) { - super(ui, null, null); - } - - @Override - protected ContentMode getContentMode(DataContext dataContext) { - return null; - } - - @Override - protected boolean computeCanWrite(ObserveSwingDataSource source) { - return source.canWriteReferential(); - } - +public class SpeciesGroupUIHandler extends ContentReferenceUIHandler<SpeciesGroupDto, SpeciesGroupUI> implements UIHandler<SpeciesGroupUI> { } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx index 4f84b55..da5f700 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx @@ -53,9 +53,6 @@ <!-- edit bean --> <SpeciesListDto id='bean'/> - <!-- handler --> - <SpeciesListUIHandler id='handler' constructorParams="this"/> - <Table id="editView" insets="0" fill="both"> <row> <cell anchor="north" weightx="1"> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java index 8abdfac..5e1a7ab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesListDto; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; @@ -39,13 +40,12 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListDto, SpeciesListUI> { +public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListDto, SpeciesListUI> implements UIHandler<SpeciesListUI> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - public SpeciesListUIHandler(SpeciesListUI ui) { - super(ui); + public SpeciesListUIHandler() { computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -55,15 +55,12 @@ public class SpeciesListUIHandler extends ContentReferenceUIHandler<SpeciesListD } @Override - public void initUI() { - - super.initUI(); - + public void afterInit(SpeciesListUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); - } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx index 3578be0..789d484 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx @@ -49,9 +49,6 @@ <!-- model --> <SpeciesUIModel id='model'/> - <!-- handler --> - <SpeciesUIHandler id='handler' constructorParams="this"/> - <!-- edit bean --> <SpeciesDto id='bean'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java index 7d61a13..c4ea069 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; @@ -39,13 +40,12 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto, SpeciesUI> { +public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto, SpeciesUI> implements UIHandler<SpeciesUI> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - public SpeciesUIHandler(SpeciesUI ui) { - super(ui); + public SpeciesUIHandler() { computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -55,14 +55,13 @@ public class SpeciesUIHandler extends ContentReferenceUIHandler<SpeciesDto, Spec } @Override - public void initUI() { - - super.initUI(); + public void afterInit(SpeciesUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) - getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add - getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx index 6aef844..2967891 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx @@ -78,7 +78,7 @@ </row> </Table> - <Table id='editI18nTable'> + <Table id='editI18nTable' visible="true"> <!-- gaugeLabel --> <row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIHandler.java new file mode 100644 index 0000000..411ab86 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class VesselSizeCategoryUIHandler extends ContentReferenceUIHandler<VesselSizeCategoryDto, VesselSizeCategoryUI> implements UIHandler<VesselSizeCategoryUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIHandler.java new file mode 100644 index 0000000..86f716e --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.VesselTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class VesselTypeUIHandler extends ContentReferenceUIHandler<VesselTypeDto, VesselTypeUI> implements UIHandler<VesselTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx index 2e578a1..bcca0b5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx @@ -49,9 +49,6 @@ <!-- model --> <VesselUIModel id='model'/> - <!-- handler --> - <VesselUIHandler id='handler' constructorParams="this"/> - <!-- edit bean --> <VesselDto id='bean'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java index 4b9aaa6..99ae883 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselDto; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.nuiton.validator.NuitonValidatorScope; @@ -39,13 +40,12 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ -public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto, VesselUI> { +public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto, VesselUI> implements UIHandler<VesselUI> { // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - public VesselUIHandler(VesselUI ui) { - super(ui); + public VesselUIHandler() { computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -55,15 +55,12 @@ public class VesselUIHandler extends ContentReferenceUIHandler<VesselDto, Vessel } @Override - public void initUI() { - - super.initUI(); - + public void afterInit(VesselUI ui) { + super.afterInit(ui); // To be sure always remove listener (could prevent some leaks) - getUi().getErrorTableModel().removeTableModelListener(computeTabValidStateListener); + ui.getErrorTableModel().removeTableModelListener(computeTabValidStateListener); // listen messages to see if required to add - getUi().getErrorTableModel().addTableModelListener(computeTabValidStateListener); - + ui.getErrorTableModel().addTableModelListener(computeTabValidStateListener); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIHandler.java new file mode 100644 index 0000000..7fac30e --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class WeightMeasureTypeUIHandler extends ContentReferenceUIHandler<WeightMeasureTypeDto, WeightMeasureTypeUI> implements UIHandler<WeightMeasureTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIHandler.java new file mode 100644 index 0000000..1dfd7b6 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class BaitHaulingStatusUIHandler extends ContentReferenceUIHandler<BaitHaulingStatusDto, BaitHaulingStatusUI> implements UIHandler<BaitHaulingStatusUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIHandler.java new file mode 100644 index 0000000..458fcbe --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class BaitSettingStatusUIHandler extends ContentReferenceUIHandler<BaitSettingStatusDto, BaitSettingStatusUI> implements UIHandler<BaitSettingStatusUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java new file mode 100644 index 0000000..2387303 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java @@ -0,0 +1,15 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; +import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class BaitTypeUIHandler extends ContentReferenceUIHandler<BaitTypeDto, BaitTypeUI> implements UIHandler<BaitTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIHandler.java new file mode 100644 index 0000000..5ba2d74 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class CatchFateLonglineUIHandler extends ContentReferenceUIHandler<CatchFateLonglineDto, CatchFateLonglineUI> implements UIHandler<CatchFateLonglineUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIHandler.java new file mode 100644 index 0000000..57f65e8 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class EncounterTypeUIHandler extends ContentReferenceUIHandler<EncounterTypeDto, EncounterTypeUI> implements UIHandler<EncounterTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIHandler.java new file mode 100644 index 0000000..fad1783 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.HealthnessDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class HealthnessUIHandler extends ContentReferenceUIHandler<HealthnessDto, HealthnessUI> implements UIHandler<HealthnessUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIHandler.java new file mode 100644 index 0000000..995a254 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.HookPositionDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class HookPositionUIHandler extends ContentReferenceUIHandler<HookPositionDto, HookPositionUI> implements UIHandler<HookPositionUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIHandler.java new file mode 100644 index 0000000..497424f --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class HookSizeUIHandler extends ContentReferenceUIHandler<HookSizeDto, HookSizeUI> implements UIHandler<HookSizeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIHandler.java new file mode 100644 index 0000000..6e1b36d --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class HookTypeUIHandler extends ContentReferenceUIHandler<HookTypeDto, HookTypeUI> implements UIHandler<HookTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIHandler.java new file mode 100644 index 0000000..31004f8 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ItemHorizontalPositionUIHandler extends ContentReferenceUIHandler<ItemHorizontalPositionDto, ItemHorizontalPositionUI> implements UIHandler<ItemHorizontalPositionUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIHandler.java new file mode 100644 index 0000000..8cacfb7 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ItemVerticalPositionUIHandler extends ContentReferenceUIHandler<ItemVerticalPositionDto, ItemVerticalPositionUI> implements UIHandler<ItemVerticalPositionUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIHandler.java new file mode 100644 index 0000000..f34e425 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LightsticksColorUIHandler extends ContentReferenceUIHandler<LightsticksColorDto, LightsticksColorUI> implements UIHandler<LightsticksColorUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIHandler.java new file mode 100644 index 0000000..5fa052e --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LightsticksTypeUIHandler extends ContentReferenceUIHandler<LightsticksTypeDto, LightsticksTypeUI> implements UIHandler<LightsticksTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIHandler.java new file mode 100644 index 0000000..0bdacdf --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class LineTypeUIHandler extends ContentReferenceUIHandler<LineTypeDto, LineTypeUI> implements UIHandler<LineTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIHandler.java new file mode 100644 index 0000000..7ba4231 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class MaturityStatusUIHandler extends ContentReferenceUIHandler<MaturityStatusDto, MaturityStatusUI> implements UIHandler<MaturityStatusUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIHandler.java new file mode 100644 index 0000000..9c731ca --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class MitigationTypeUIHandler extends ContentReferenceUIHandler<MitigationTypeDto, MitigationTypeUI> implements UIHandler<MitigationTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIHandler.java new file mode 100644 index 0000000..67e215c --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SensorBrandUIHandler extends ContentReferenceUIHandler<SensorBrandDto, SensorBrandUI> implements UIHandler<SensorBrandUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIHandler.java new file mode 100644 index 0000000..2c9c35f --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SensorDataFormatUIHandler extends ContentReferenceUIHandler<SensorDataFormatDto, SensorDataFormatUI> implements UIHandler<SensorDataFormatUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIHandler.java new file mode 100644 index 0000000..3d7a89b --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SensorTypeUIHandler extends ContentReferenceUIHandler<SensorTypeDto, SensorTypeUI> implements UIHandler<SensorTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIHandler.java new file mode 100644 index 0000000..e9d0e8e --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SettingShapeUIHandler extends ContentReferenceUIHandler<SettingShapeDto, SettingShapeUI> implements UIHandler<SettingShapeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIHandler.java new file mode 100644 index 0000000..997794b --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class StomacFullnessUIHandler extends ContentReferenceUIHandler<StomacFullnessDto, StomacFullnessUI> implements UIHandler<StomacFullnessUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIHandler.java new file mode 100644 index 0000000..2fe2fec --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.TripTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class TripTypeUIHandler extends ContentReferenceUIHandler<TripTypeDto, TripTypeUI> implements UIHandler<TripTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIHandler.java new file mode 100644 index 0000000..c624214 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.longline; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class VesselActivityLonglineUIHandler extends ContentReferenceUIHandler<VesselActivityLonglineDto, VesselActivityLonglineUI> implements UIHandler<VesselActivityLonglineUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIHandler.java new file mode 100644 index 0000000..54c2a21 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class DetectionModeUIHandler extends ContentReferenceUIHandler<DetectionModeDto, DetectionModeUI> implements UIHandler<DetectionModeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java new file mode 100644 index 0000000..5bd97a3 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ObjectFateUIHandler extends ContentReferenceUIHandler<ObjectFateDto, ObjectFateUI> implements UIHandler<ObjectFateUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIHandler.java new file mode 100644 index 0000000..f64d586 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ObjectOperationUIHandler extends ContentReferenceUIHandler<ObjectOperationDto, ObjectOperationUI> implements UIHandler<ObjectOperationUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIHandler.java new file mode 100644 index 0000000..0f9a0fe --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ObjectTypeUIHandler extends ContentReferenceUIHandler<ObjectTypeDto, ObjectTypeUI> implements UIHandler<ObjectTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIHandler.java new file mode 100644 index 0000000..0978d68 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ObservedSystemUIHandler extends ContentReferenceUIHandler<ObservedSystemDto, ObservedSystemUI> implements UIHandler<ObservedSystemUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIHandler.java new file mode 100644 index 0000000..dd66b95 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ReasonForDiscardUIHandler extends ContentReferenceUIHandler<ReasonForDiscardDto, ReasonForDiscardUI> implements UIHandler<ReasonForDiscardUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIHandler.java new file mode 100644 index 0000000..2919464 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ReasonForNoFishingUIHandler extends ContentReferenceUIHandler<ReasonForNoFishingDto, ReasonForNoFishingUI> implements UIHandler<ReasonForNoFishingUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIHandler.java new file mode 100644 index 0000000..d868341 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class ReasonForNullSetUIHandler extends ContentReferenceUIHandler<ReasonForNullSetDto, ReasonForNullSetUI> implements UIHandler<ReasonForNullSetUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIHandler.java new file mode 100644 index 0000000..f6a6fcf --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SpeciesFateUIHandler extends ContentReferenceUIHandler<SpeciesFateDto, SpeciesFateUI> implements UIHandler<SpeciesFateUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIHandler.java new file mode 100644 index 0000000..78d1023 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SpeciesStatusUIHandler extends ContentReferenceUIHandler<SpeciesStatusDto, SpeciesStatusUI> implements UIHandler<SpeciesStatusUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIHandler.java new file mode 100644 index 0000000..9bb51d4 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class SurroundingActivityUIHandler extends ContentReferenceUIHandler<SurroundingActivityDto, SurroundingActivityUI> implements UIHandler<SurroundingActivityUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIHandler.java new file mode 100644 index 0000000..77da23e --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class TransmittingBuoyOperationUIHandler extends ContentReferenceUIHandler<TransmittingBuoyOperationDto, TransmittingBuoyOperationUI> implements UIHandler<TransmittingBuoyOperationUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIHandler.java new file mode 100644 index 0000000..e73ed7b --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class TransmittingBuoyTypeUIHandler extends ContentReferenceUIHandler<TransmittingBuoyTypeDto, TransmittingBuoyTypeUI> implements UIHandler<TransmittingBuoyTypeUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIHandler.java new file mode 100644 index 0000000..1e5ec99 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class VesselActivitySeineUIHandler extends ContentReferenceUIHandler<VesselActivitySeineDto, VesselActivitySeineUI> implements UIHandler<VesselActivitySeineUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIHandler.java new file mode 100644 index 0000000..fa02f80 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class WeightCategoryUIHandler extends ContentReferenceUIHandler<WeightCategoryDto, WeightCategoryUI> implements UIHandler<WeightCategoryUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIHandler.java new file mode 100644 index 0000000..03d6f09 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIHandler.java @@ -0,0 +1,14 @@ +package fr.ird.observe.application.swing.ui.content.ref.impl.seine; + +import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; +import fr.ird.observe.services.dto.referential.seine.WindDto; +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class WindUIHandler extends ContentReferenceUIHandler<WindDto, WindUI> implements UIHandler<WindUI> { +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx index dc143fc..f310a91 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx @@ -66,9 +66,6 @@ <String id='deleteEntryText' javaBean='n("observe.action.delete")'/> <String id='deleteEntryTip' javaBean='n("observe.action.delete.entry.tip")'/> - <!-- Handler --> - <ContentTableUIHandler id='handler' genericType='E, D, U'/> - <!-- Model --> <ContentTableUIModel id='model' genericType='E, D' initializer='ContentTableUIModel.newModel(this)'/> @@ -92,6 +89,9 @@ <script><![CDATA[ +@Override +public abstract ContentTableUIHandler<E, D, U> getHandler(); + public abstract SwingValidator<E> getValidator(); public abstract SwingValidator<D> getValidatorTable(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java index afc18c3..84c3908 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java @@ -73,8 +73,8 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U /** Logger */ private static final Log log = LogFactory.getLog(ContentTableUIHandler.class); - protected ContentTableUIHandler(U ui, DataContextType dataContextType) { - super(ui, dataContextType, null); + protected ContentTableUIHandler(DataContextType dataContextType) { + super(dataContextType, null); } /** @@ -213,15 +213,17 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto, U protected abstract void loadEditBean(String beanId); @Override - public void initUI() { + public void afterInit(U ui) { - ContentTableUIInitializer<E, D, U> uiInitializer = new ContentTableUIInitializer<>(getUi()); + ContentTableUIInitializer<E, D, U> uiInitializer = new ContentTableUIInitializer<>(ui); uiInitializer.initUI(); + ui.setTitle(t(updateTitle(ui.getContentTitle()))); + updateTitle(getModel().getMode()); + getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel()); installFocusTraversalPolicy(); - } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx index 5bab278..b6532e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx @@ -41,9 +41,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <BaitsCompositionUIHandler id='handler'/> - <!-- model --> <BaitsCompositionUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java index 3f152b8..670fcef 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,13 +44,13 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, BaitsCompositionDto, BaitsCompositionUI> { +public class BaitsCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, BaitsCompositionDto, BaitsCompositionUI> implements UIHandler<BaitsCompositionUI> { /** Logger */ private static final Log log = LogFactory.getLog(BaitsCompositionUIHandler.class); - public BaitsCompositionUIHandler(BaitsCompositionUI ui) { - super(ui, DataContextType.SetLongline); + public BaitsCompositionUIHandler() { + super(DataContextType.SetLongline); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx index 5994fbc..67af208 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx @@ -40,9 +40,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <BranchlinesCompositionUIHandler id='handler'/> - <!-- model --> <BranchlinesCompositionUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java index 2dec127..9d8a3a1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java @@ -29,6 +29,7 @@ import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,13 +44,13 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, BranchlinesCompositionDto, BranchlinesCompositionUI> { +public class BranchlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, BranchlinesCompositionDto, BranchlinesCompositionUI> implements UIHandler<BranchlinesCompositionUI> { /** Logger */ private static final Log log = LogFactory.getLog(BranchlinesCompositionUIHandler.class); - public BranchlinesCompositionUIHandler(BranchlinesCompositionUI ui) { - super(ui, DataContextType.SetLongline); + public BranchlinesCompositionUIHandler() { + super(DataContextType.SetLongline); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index 3449fb4..382c10f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -66,9 +66,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <CatchLonglineUIHandler id='handler'/> - <!-- model --> <CatchLonglineUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 39ed50f..eeb9401 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -62,6 +62,7 @@ import fr.ird.observe.services.service.data.longline.BranchlineService; import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; import fr.ird.observe.services.service.data.longline.TripLonglineService; import jaxx.runtime.context.JAXXContextEntryDef; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -97,7 +98,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCatchDto, CatchLonglineDto, CatchLonglineUI> { +public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCatchDto, CatchLonglineDto, CatchLonglineUI> implements UIHandler<CatchLonglineUI> { /** Logger */ private static final Log log = LogFactory.getLog(CatchLonglineUIHandler.class); @@ -120,8 +121,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat private static final String GROUPED_TRIP_TYPE_ID = "fr.ird.observe.entities.referentiel.longline.TripType#1239832686136#0.1"; - public CatchLonglineUIHandler(CatchLonglineUI ui) { - super(ui, DataContextType.SetLongline); + public CatchLonglineUIHandler() { + super(DataContextType.SetLongline); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -141,37 +142,42 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } @Override - public void initUI() { + public void afterInit(CatchLonglineUI ui) { - CatchLonglineContentTableUIInitializer uiInitializer = new CatchLonglineContentTableUIInitializer(getUi()); + CatchLonglineContentTableUIInitializer uiInitializer = new CatchLonglineContentTableUIInitializer(ui); uiInitializer.initUI(); + ui.setTitle(t(updateTitle(ui.getContentTitle()))); + updateTitle(getModel().getMode()); + installFocusTraversalPolicy(); - getModel().addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_SHOW_INDIVIDUAL_TABS, evt -> { + CatchLonglineUIModel model = ui.getModel(); + model.addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_SHOW_INDIVIDUAL_TABS, evt -> { Boolean newValue = (Boolean) evt.getNewValue(); showIndividualTabs(newValue); }); - getModel().addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_EDITABLE, evt -> { + model.addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_EDITABLE, evt -> { Boolean newValue = (Boolean) evt.getNewValue(); setTableModelEditable(newValue); }); - getModel().addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel()); + model.addPropertyChangeListener(ContentUIModel.PROPERTY_FORM, evt -> updateUiWithReferenceSetsFromModel()); - setTableModelEditable(getModel().isEditable()); + setTableModelEditable(model.isEditable()); LonglinePositionHelper<CatchLonglineDto> positionHelper = new LonglinePositionHelper<>( - getUi().getSection(), - getUi().getBasket(), - getUi().getBranchline(), + ui.getSection(), + ui.getBasket(), + ui.getBranchline(), getTableEditBean()); - POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); + POSITION_HELPER_ENTRY.setContextValue(ui, positionHelper); + + model.addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, + evt -> ui.getBranchlineValidator().setChanged(true)); - getModel().addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, - evt -> getUi().getBranchlineValidator().setChanged(true)); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx index 673ce69..8cf6b23 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx @@ -44,9 +44,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <EncounterUIHandler id='handler'/> - <!-- model --> <EncounterUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java index 76f9700..7d3b3c0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java @@ -39,6 +39,7 @@ import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; import fr.ird.observe.services.service.referential.ReferentialService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -56,13 +57,13 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEncounterDto, EncounterDto, EncounterUI> { +public class EncounterUIHandler extends ContentTableUIHandler<ActivityLonglineEncounterDto, EncounterDto, EncounterUI> implements UIHandler<EncounterUI> { /** Logger */ private static final Log log = LogFactory.getLog(EncounterUIHandler.class); - public EncounterUIHandler(EncounterUI ui) { - super(ui, DataContextType.ActivityLongline); + public EncounterUIHandler() { + super(DataContextType.ActivityLongline); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx index 2851019..ced011a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx @@ -40,9 +40,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <FloatlinesCompositionUIHandler id='handler'/> - <!-- model --> <FloatlinesCompositionUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java index beed1eb..baceadc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java @@ -28,6 +28,7 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,13 +43,13 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, FloatlinesCompositionDto, FloatlinesCompositionUI> { +public class FloatlinesCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, FloatlinesCompositionDto, FloatlinesCompositionUI> implements UIHandler<FloatlinesCompositionUI> { /** Logger */ private static final Log log = LogFactory.getLog(FloatlinesCompositionUIHandler.class); - public FloatlinesCompositionUIHandler(FloatlinesCompositionUI ui) { - super(ui, DataContextType.SetLongline); + public FloatlinesCompositionUIHandler() { + super(DataContextType.SetLongline); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx index 86b428e..f85b49e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx @@ -46,9 +46,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <GearUseFeaturesLonglineUIHandler id='handler' constructorParams='this'/> - <!-- model --> <GearUseFeaturesLonglineUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index 13b9f91..41359b0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -48,6 +48,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; import jaxx.runtime.SwingUtil; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; @@ -78,7 +79,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<TripLonglineGearUseDto, GearUseFeaturesLonglineDto, GearUseFeaturesLonglineUI> { +public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<TripLonglineGearUseDto, GearUseFeaturesLonglineDto, GearUseFeaturesLonglineUI> implements UIHandler<GearUseFeaturesLonglineUI> { /** Logger */ private static final Log log = LogFactory.getLog(GearUseFeaturesLonglineUIHandler.class); @@ -88,8 +89,8 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip private final PropertyChangeListener measurementsTableModelModified; - public GearUseFeaturesLonglineUIHandler(GearUseFeaturesLonglineUI ui) { - super(ui, DataContextType.TripLongline); + public GearUseFeaturesLonglineUIHandler() { + super(DataContextType.TripLongline); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -105,19 +106,18 @@ public class GearUseFeaturesLonglineUIHandler extends ContentTableUIHandler<Trip } @Override - public void initUI() { + public void afterInit(GearUseFeaturesLonglineUI ui) { + super.afterInit(ui); - super.initUI(); + GearUseFeaturesLonglineUIModel model = ui.getModel(); - getModel().addPropertyChangeListener(GearUseFeaturesLonglineUIModel.PROPERTY_EDITABLE, evt -> { + model.addPropertyChangeListener(GearUseFeaturesLonglineUIModel.PROPERTY_EDITABLE, evt -> { Boolean newValue = (Boolean) evt.getNewValue(); setTableModelEditable(newValue); }); - setTableModelEditable(getModel().isEditable()); - + setTableModelEditable(model.isEditable()); getTableModel().setGearUseFeaturesLonglineUIHandler(this); - } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx index 8448aa5..45da996 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx @@ -41,9 +41,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <HooksCompositionUIHandler id='handler'/> - <!-- model --> <HooksCompositionUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java index 4c942b7..5cb0f7b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java @@ -23,20 +23,19 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; */ import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.FocusTraversalPolicy; - import static org.nuiton.i18n.I18n.n; /** @@ -45,13 +44,13 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ -public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, HooksCompositionDto, HooksCompositionUI> { +public class HooksCompositionUIHandler extends ContentTableUIHandler<SetLonglineGlobalCompositionDto, HooksCompositionDto, HooksCompositionUI> implements UIHandler<HooksCompositionUI> { /** Logger */ private static final Log log = LogFactory.getLog(HooksCompositionUIHandler.class); - public HooksCompositionUIHandler(HooksCompositionUI ui) { - super(ui, DataContextType.SetLongline); + public HooksCompositionUIHandler() { + super(DataContextType.SetLongline); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx index c32c54e..a538943 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx @@ -44,9 +44,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <SensorUsedUIHandler id='handler'/> - <!-- model --> <SensorUsedUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java index fcda169..8e3455b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -38,17 +38,14 @@ import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.runtime.JaxxFileChooser; import javax.swing.JOptionPane; import javax.swing.JTable; -import javax.swing.LayoutFocusTraversalPolicy; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.Component; -import java.awt.Container; -import java.awt.FocusTraversalPolicy; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -62,13 +59,13 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ -public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineSensorUsedDto, SensorUsedDto, SensorUsedUI> { +public class SensorUsedUIHandler extends ContentTableUIHandler<ActivityLonglineSensorUsedDto, SensorUsedDto, SensorUsedUI> implements UIHandler<SensorUsedUI> { /** Logger */ private static final Log log = LogFactory.getLog(SensorUsedUIHandler.class); - public SensorUsedUIHandler(SensorUsedUI ui) { - super(ui, DataContextType.ActivityLongline); + public SensorUsedUIHandler() { + super(DataContextType.ActivityLongline); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx index 3e7c8e5..9a2377c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx @@ -51,9 +51,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <TdrUIHandler id='handler'/> - <!-- model --> <TdrUIModel id='model'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java index 29f01c8..38ee769 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java @@ -43,6 +43,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TdrService; import fr.ird.observe.services.service.data.longline.TripLonglineService; import jaxx.runtime.context.JAXXContextEntryDef; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.HidorButton; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; @@ -56,7 +57,6 @@ import javax.swing.JOptionPane; import javax.swing.JTable; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; -import java.awt.Component; import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; @@ -77,7 +77,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since XXX */ -public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDto, TdrUI> { +public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDto, TdrUI> implements UIHandler<TdrUI> { /** Logger */ private static final Log log = LogFactory.getLog(TdrUIHandler.class); @@ -93,8 +93,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt private static final JAXXContextEntryDef<LonglinePositionHelper<TdrDto>> POSITION_HELPER_ENTRY = UIHelper.newContextEntryDef("TdrUI-positionHelper", LonglinePositionHelper.class); - public TdrUIHandler(TdrUI ui) { - super(ui, DataContextType.SetLongline); + public TdrUIHandler() { + super(DataContextType.SetLongline); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -185,22 +185,21 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt } @Override - public void initUI() { - - super.initUI(); + public void afterInit(TdrUI ui) { + super.afterInit(ui); LonglinePositionHelper<TdrDto> positionHelper = new LonglinePositionHelper<>( - getUi().getSection(), - getUi().getBasket(), - getUi().getBranchline(), - getTableEditBean()); + ui.getSection(), + ui.getBasket(), + ui.getBranchline(), + ui.getTableEditBean()); - POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); + POSITION_HELPER_ENTRY.setContextValue(ui, positionHelper); - getUi().getDeployementStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - getUi().getDeployementEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - getUi().getFishingStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - getUi().getFishingEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getDeployementStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getDeployementEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getFishingStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getFishingEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java index 8f4b3f6..5ff2b8d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java @@ -67,8 +67,8 @@ public abstract class AbstractSampleUIHandler<E extends IdDto, D extends IdDto, */ protected final PropertyChangeListener speciesChanged; - protected AbstractSampleUIHandler(U ui) { - super(ui, DataContextType.SetSeine); + protected AbstractSampleUIHandler() { + super(DataContextType.SetSeine); weightChanged = evt -> { onWeightChanged((Float) evt.getNewValue()); }; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index 291995d..cdfdeab 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -46,9 +46,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <GearUseFeaturesSeineUIHandler id='handler' constructorParams='this'/> - <!-- model --> <GearUseFeaturesSeineUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 06f1bda..f770ffa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -48,6 +48,7 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseHelper; import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; import jaxx.runtime.SwingUtil; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.logging.Log; @@ -78,7 +79,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ -public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSeineGearUseDto, GearUseFeaturesSeineDto, GearUseFeaturesSeineUI> { +public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSeineGearUseDto, GearUseFeaturesSeineDto, GearUseFeaturesSeineUI> implements UIHandler<GearUseFeaturesSeineUI> { /** Logger */ private static final Log log = LogFactory.getLog(GearUseFeaturesSeineUIHandler.class); @@ -88,8 +89,8 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei private final PropertyChangeListener measurementsTableModelModified; - public GearUseFeaturesSeineUIHandler(GearUseFeaturesSeineUI ui) { - super(ui, DataContextType.TripSeine); + public GearUseFeaturesSeineUIHandler() { + super(DataContextType.TripSeine); computeTabValidStateListener = e -> { SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); @@ -105,16 +106,16 @@ public class GearUseFeaturesSeineUIHandler extends ContentTableUIHandler<TripSei } @Override - public void initUI() { + public void afterInit(GearUseFeaturesSeineUI ui) { + super.afterInit(ui); - super.initUI(); - - getModel().addPropertyChangeListener(GearUseFeaturesSeineUIModel.PROPERTY_EDITABLE, evt -> { + GearUseFeaturesSeineUIModel model = ui.getModel(); + model.addPropertyChangeListener(GearUseFeaturesSeineUIModel.PROPERTY_EDITABLE, evt -> { Boolean newValue = (Boolean) evt.getNewValue(); setTableModelEditable(newValue); }); - setTableModelEditable(getModel().isEditable()); + setTableModelEditable(model.isEditable()); getTableModel().setGearUseFeaturesSeineUIHandler(this); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx index 473ea0f..b68efe1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -49,9 +49,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <NonTargetCatchUIHandler id='handler' constructorParams='this'/> - <!-- model --> <NonTargetCatchUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index 4968380..9258954 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -45,6 +45,7 @@ import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper; import fr.ird.observe.services.service.data.seine.NonTargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -66,7 +67,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTargetCatchDto, NonTargetCatchDto, NonTargetCatchUI> { +public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTargetCatchDto, NonTargetCatchDto, NonTargetCatchUI> implements UIHandler<NonTargetCatchUI> { /** Logger */ private static final Log log = LogFactory.getLog(NonTargetCatchUIHandler.class); @@ -107,8 +108,8 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa */ protected final PropertyChangeListener meanLengthChanged; - public NonTargetCatchUIHandler(NonTargetCatchUI ui) { - super(ui, DataContextType.SetSeine); + public NonTargetCatchUIHandler() { + super(DataContextType.SetSeine); totalCountChanged = evt -> { NonTargetCatchDto source = (NonTargetCatchDto) evt.getSource(); source.setTotalCountComputedSource(null); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index f741966..e731157 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -50,9 +50,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <NonTargetSampleUIHandler id='handler' constructorParams='this'/> - <!-- model --> <NonTargetSampleUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index efb230b..903e5a8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -40,6 +40,7 @@ import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.NonTargetSampleHelper; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.data.seine.NonTargetSampleService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorScope; @@ -60,15 +61,11 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetSampleDto, NonTargetLengthDto, NonTargetSampleUI> { +public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetSampleDto, NonTargetLengthDto, NonTargetSampleUI> implements UIHandler<NonTargetSampleUI> { /** Logger */ private static final Log log = LogFactory.getLog(NonTargetSampleUIHandler.class); - public NonTargetSampleUIHandler(NonTargetSampleUI ui) { - super(ui); - } - @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx index 1e6d6cb..ad8fbce 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx @@ -46,9 +46,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <ObjectObservedSpeciesUIHandler id='handler' constructorParams='this'/> - <!-- model --> <ObjectObservedSpeciesUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 611678b..a5906df 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -39,6 +39,7 @@ import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; import fr.ird.observe.services.service.referential.ReferentialService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -54,13 +55,13 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto, ObjectObservedSpeciesUI> { +public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<FloatingObjectObservedSpeciesDto, ObjectObservedSpeciesDto, ObjectObservedSpeciesUI> implements UIHandler<ObjectObservedSpeciesUI> { /** Logger */ private static final Log log = LogFactory.getLog(ObjectObservedSpeciesUIHandler.class); - public ObjectObservedSpeciesUIHandler(ObjectObservedSpeciesUI ui) { - super(ui, DataContextType.SetSeine); + public ObjectObservedSpeciesUIHandler() { + super(DataContextType.SetSeine); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx index ac22112..1aa43fa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx @@ -45,9 +45,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <ObjectSchoolEstimateUIHandler id='handler' constructorParams='this'/> - <!-- model --> <ObjectSchoolEstimateUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index 9a52183..1cd6a6a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -37,6 +37,7 @@ import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateHelper; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; import fr.ird.observe.services.service.referential.ReferentialService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -52,14 +53,14 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto, ObjectSchoolEstimateUI> { +public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto, ObjectSchoolEstimateUI> implements UIHandler<ObjectSchoolEstimateUI> { /** Logger */ private static final Log log = LogFactory.getLog(ObjectSchoolEstimateUIHandler.class); - public ObjectSchoolEstimateUIHandler(ObjectSchoolEstimateUI ui) { - super(ui, DataContextType.SetSeine); + public ObjectSchoolEstimateUIHandler() { + super(DataContextType.SetSeine); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx index 6a03201..25a25f0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx @@ -45,9 +45,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <SchoolEstimateUIHandler id='handler' constructorParams='this'/> - <!-- model --> <SchoolEstimateUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index 62b0afe..103ce33 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -38,6 +38,7 @@ import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateHelper; import fr.ird.observe.services.service.data.seine.SchoolEstimateService; import fr.ird.observe.services.service.data.seine.TripSeineService; +import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -57,13 +58,13 @@ import static org.nuiton.i18n.I18n.n; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoolEstimateDto, SchoolEstimateDto, SchoolEstimateUI> { +public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoolEstimateDto, SchoolEstimateDto, SchoolEstimateUI> implements UIHandler<SchoolEstimateUI> { /** Logger */ private static final Log log = LogFactory.getLog(SchoolEstimateUIHandler.class); - public SchoolEstimateUIHandler(SchoolEstimateUI ui) { - super(ui, DataContextType.SetSeine); + public SchoolEstimateUIHandler() { + super(DataContextType.SetSeine); } @Override diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx index 08a308a..7e79e8a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx @@ -48,9 +48,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <TargetCatchUIHandler id='handler' constructorParams='this'/> - <!-- model --> <TargetCatchUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java index 33a17bb..db949f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -43,6 +43,7 @@ import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; import fr.ird.observe.services.service.data.seine.TargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.editor.bean.BeanComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -65,24 +66,24 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCatchDto, TargetCatchDto, TargetCatchUI> { +public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCatchDto, TargetCatchDto, TargetCatchUI> implements UIHandler<TargetCatchUI> { /** Logger */ private static final Log log = LogFactory.getLog(TargetCatchUIHandler.class); - public TargetCatchUIHandler(TargetCatchUI ui) { - super(ui, DataContextType.SetSeine); + public TargetCatchUIHandler() { + super(DataContextType.SetSeine); } @Override - public void initUI() { - super.initUI(); + public void afterInit(TargetCatchUI ui) { + super.afterInit(ui); // lors de la modification d'une species (sur une entree non sauvee) // - on recalcule la liste des categories pour cette species. // - on reinitialiser la categorie selectionnee - getUi().getSpecies().addPropertyChangeListener( + ui.getSpecies().addPropertyChangeListener( BeanComboBox.PROPERTY_SELECTED_ITEM, evt -> { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx index a6de31a..4ad5a1e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx @@ -50,9 +50,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <TargetDiscardCatchUIHandler id='handler' constructorParams='this'/> - <!-- model --> <TargetDiscardCatchUIModel id='model' constructorParams='this'/> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index a8469c7..e8ff611 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -44,6 +44,7 @@ import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchHelper; import fr.ird.observe.services.service.data.seine.TargetCatchService; import fr.ird.observe.services.service.data.seine.TripSeineService; +import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.editor.bean.BeanComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,21 +69,19 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCatchDto, TargetCatchDto, TargetDiscardCatchUI> { +public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCatchDto, TargetCatchDto, TargetDiscardCatchUI> implements UIHandler<TargetDiscardCatchUI> { /** Logger */ private static final Log log = LogFactory.getLog(TargetDiscardCatchUIHandler.class); - public TargetDiscardCatchUIHandler(TargetDiscardCatchUI ui) { - super(ui, DataContextType.SetSeine); + public TargetDiscardCatchUIHandler() { + super(DataContextType.SetSeine); } @Override - public void initUI() { + public void afterInit(TargetDiscardCatchUI ui) { - super.initUI(); - - TargetDiscardCatchUI ui = getUi(); + super.afterInit(ui); // lors de la modification d'une species (sur une entree non sauvee) // - on recalcule la liste des categories pour cette species. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx index 49e14a1..7205586 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUI.jaxx @@ -30,7 +30,4 @@ <JLabel id='hideFormInformation'/> - <!-- handler --> - <TargetSampleUIHandler id='handler' constructorParams='this, false'/> - </TargetSampleUI> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUIHandler.java new file mode 100644 index 0000000..913303d --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUIHandler.java @@ -0,0 +1,26 @@ +package fr.ird.observe.application.swing.ui.content.table.impl.seine; + +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class TargetSampleCaptureUIHandler extends TargetSampleUIHandler implements UIHandler<TargetSampleCaptureUI> { + + public TargetSampleCaptureUIHandler() { + super(false); + } + + @Override + public void beforeInit(TargetSampleCaptureUI ui) { + super.beforeInit(ui); + } + + @Override + public void afterInit(TargetSampleCaptureUI ui) { + super.afterInit(ui); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx index a80c9de..6c0ac5d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUI.jaxx @@ -30,7 +30,4 @@ <JLabel id='hideFormInformation'/> - <!-- handler --> - <TargetSampleUIHandler id='handler' constructorParams='this, true'/> - </TargetSampleUI> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUIHandler.java new file mode 100644 index 0000000..31b35d0 --- /dev/null +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUIHandler.java @@ -0,0 +1,26 @@ +package fr.ird.observe.application.swing.ui.content.table.impl.seine; + +import jaxx.runtime.spi.UIHandler; + +/** + * Created on 06/12/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 6.0 + */ +public class TargetSampleRejeteUIHandler extends TargetSampleUIHandler implements UIHandler<TargetSampleRejeteUI> { + + public TargetSampleRejeteUIHandler() { + super(true); + } + + @Override + public void beforeInit(TargetSampleRejeteUI targetSampleRejeteUI) { + super.beforeInit(targetSampleRejeteUI); + } + + @Override + public void afterInit(TargetSampleRejeteUI targetSampleRejeteUI) { + super.afterInit(targetSampleRejeteUI); + } +} diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx index 717e3d1..3bf9e72 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -44,9 +44,6 @@ static org.nuiton.i18n.I18n.n </import> - <!-- handler --> - <TargetSampleUIHandler id='handler' initializer='null'/> - <!-- model --> <TargetSampleUIModel id='model' constructorParams='this'/> @@ -81,6 +78,9 @@ public static final String POIDS_OBSERVED_TIP = n("observe.common.weight.observe public static final String LONGUEUR_COMPUTED_TIP = n("observe.common.length.computed.tip"); public static final String LONGUEUR_OBSERVED_TIP = n("observe.common.length.observed.tip"); +@Override +public abstract TargetSampleUIHandler getHandler(); + public String getWeightDataTip(boolean computed) { return computed ? t(POIDS_COMPUTED_TIP) : t(POIDS_OBSERVED_TIP); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 8525acb..69804de 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -26,6 +26,7 @@ import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -59,7 +60,7 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit - chemit@codelutin.com * @since 1.0 */ -public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleDto, TargetLengthDto, TargetSampleUI> { +public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, TargetLengthDto, U>> extends AbstractSampleUIHandler<TargetSampleDto, TargetLengthDto, U> { /** Logger */ private static final Log log = LogFactory.getLog(TargetSampleUIHandler.class); @@ -72,21 +73,25 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD */ protected final boolean discarded; - public TargetSampleUIHandler(TargetSampleUI ui, boolean discarded) { - super(ui); + public TargetSampleUIHandler(boolean discarded) { this.discarded = discarded; } @Override + public void afterInit(U ui) { + super.afterInit(ui); + } + + @Override public void resetIsWeightComputed() { getTableEditBean().setIsWeightComputed(false); - getUi().getWeight().grabFocus(); + ((TargetSampleUI) getUi()).getWeight().grabFocus(); } @Override public void resetIsLengthComputed() { getTableEditBean().setIsLengthComputed(false); - getUi().getLength().grabFocus(); + ((TargetSampleUI) getUi()).getLength().grabFocus(); } @Override @@ -100,7 +105,7 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD // on utilise le code par defaut de l'espèce Optional<ReferentialReference<SizeMeasureTypeDto>> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); - getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); + ((TargetSampleUI) getUi()).getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); } @@ -118,7 +123,7 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD protected void onSelectedRowChanged(int editingRow, TargetLengthDto bean, boolean create) { ContentTableModel<TargetSampleDto, TargetLengthDto> model = getTableModel(); - TargetSampleUI ui = getUi(); + TargetSampleUI ui = (TargetSampleUI) getUi(); if (!model.isEditable()) { return; } @@ -152,9 +157,9 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); if (!sizeMeasureType.isPresent()) { // au cas où, on repasse toujours sur lf - sizeMeasureType = Optional.of(SizeMeasureTypeHelper.getLf(getUi().getSizeMeasureType().getData())); + sizeMeasureType = Optional.of(SizeMeasureTypeHelper.getLf(ui.getSizeMeasureType().getData())); } - getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); + ui.getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); } requestFocus = ui.getSpecies(); @@ -205,7 +210,7 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD if (data.size() != 2) { throw new IllegalStateException("WHY???"); } - getUi().getSizeMeasureType().setData(data); + ((TargetSampleUI) getUi()).getSizeMeasureType().setData(data); } @@ -282,7 +287,7 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD return; } - TargetSampleUI ui = getUi(); + TargetSampleUI ui = (TargetSampleUI) getUi(); boolean createMode = ui.getTableModel().isCreate(); @@ -331,8 +336,9 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD } public void resetDefaultSizeMeasureType() { - getUi().getSizeMeasureType().setSelectedItem(null); - getUi().getSizeMeasureType().setSelectedItem(getUi().getModel().getDefaultSizeMeasureType()); + TargetSampleUI ui = (TargetSampleUI) getUi(); + ui.getSizeMeasureType().setSelectedItem(null); + ui.getSizeMeasureType().setSelectedItem(ui.getModel().getDefaultSizeMeasureType()); } @Override @@ -396,8 +402,8 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD if (species != null) { String sizeMeasureId = (String) species.getPropertyValue(SpeciesDto.PROPERTY_SIZE_MEASURE_TYPE + "Id"); - result = getUi().getSizeMeasureType().getData().stream() - .filter(s -> s.getId().equals(sizeMeasureId)).findFirst(); + result = ((TargetSampleUI) getUi()).getSizeMeasureType().getData().stream() + .filter(s -> s.getId().equals(sizeMeasureId)).findFirst(); } return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 93a4470d9e7ef8a84a0b66ba7047bf5de13cf866 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 7 14:48:38 2016 +0100 Ajout d'un clic droit/ajouter sur le tableau LL de définition des templates de section (Fixes #8847) --- .../content/impl/longline/LonglineDetailCompositionUI.jaxx | 2 ++ .../content/impl/longline/LonglineDetailCompositionUI.jcss | 12 ++++++++++++ .../impl/longline/LonglineDetailCompositionUIHandler.java | 9 +++++++++ .../longline/LonglineDetailCompositionUIInitializer.java | 11 +++++++---- .../main/resources/i18n/application-swing_en_GB.properties | 4 ++++ .../main/resources/i18n/application-swing_es_ES.properties | 4 ++++ .../main/resources/i18n/application-swing_fr_FR.properties | 4 ++++ 7 files changed, 42 insertions(+), 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx index a373263..f0a574c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jaxx @@ -83,6 +83,8 @@ </BeanValidator> <JPopupMenu id='sectionTemplatesPopup'> + <JMenuItem id='insertBeforeSelectedSectionTemplate' onActionPerformed='getHandler().insertBeforeSelectedSectionTemplate()'/> + <JMenuItem id='insertAfterSelectedSectionTemplate' onActionPerformed='getHandler().insertAfterSelectedSectionTemplate()'/> <JMenuItem id='deleteSelectedSectionTemplate' onActionPerformed='getHandler().deleteSelectedSectionTemplate()'/> </JPopupMenu> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss index 4bc3373..f24e5bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUI.jcss @@ -45,6 +45,18 @@ selected:{model.isCanGenerate()}; } +#insertBeforeSelectedSectionTemplate { + text: "observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate"; + toolTipText: "observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate.tip"; + actionIcon: insert-before; +} + +#insertAfterSelectedSectionTemplate { + text: "observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate"; + toolTipText: "observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate.tip"; + actionIcon: insert-after; +} + #deleteSelectedSectionTemplate { text: "observe.content.longlineDetailComposition.action.deleteSelectedSectionTemplate"; toolTipText: "observe.content.longlineDetailComposition.action.deleteSelectedSectionTemplate.tip"; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index c2d56f8..0508bf9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -635,6 +635,15 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong } + public void insertBeforeSelectedSectionTemplate() { + getSectionTemplatesTableModel().insertBeforeSelectedRow(); + } + + public void insertAfterSelectedSectionTemplate() { + getSectionTemplatesTableModel().insertAfterSelectedRow(); + } + + public void deleteSelectedSectionTemplate() { SectionTemplatesTableModel tableModel = getSectionTemplatesTableModel(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java index 48f4594..5e456b5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIInitializer.java @@ -22,13 +22,13 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.SectionTemplate; -import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; import fr.ird.observe.application.swing.ui.util.table.AutotSelectRowAndShowPopupActionSupport; import fr.ird.observe.application.swing.ui.util.table.EditableTableModelSupport; +import fr.ird.observe.services.dto.longline.SectionTemplate; +import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; import org.nuiton.decorator.Decorator; @@ -197,9 +197,8 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer // init branchlineDetail tab BranchlineUI compositionUI = ui.getBranchlineDetailUI(); -// compositionUI.init(); Container parent = ui.getBranchlineDetailPanel(); - parent .removeAll(); + parent.removeAll(); parent.add(compositionUI.getBody()); } @@ -224,6 +223,8 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer EditableTableModelSupport model = (EditableTableModelSupport) getTable().getModel(); + boolean canInsertBefore = model.isEmpty() || model.getSelectedRowIndex() > 0; + boolean canInsertAfter = true; boolean canDelete = !model.isSelectionEmpty(); if (canDelete) { @@ -235,6 +236,8 @@ public class LonglineDetailCompositionUIInitializer extends ContentUIInitializer } ui.getDeleteSelectedSectionTemplate().setEnabled(canDelete); + ui.getInsertBeforeSelectedSectionTemplate().setEnabled(canInsertBefore); + ui.getInsertAfterSelectedSectionTemplate().setEnabled(canInsertAfter); } diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 584f3fd..6857797 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -947,12 +947,16 @@ observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline=I observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline.tip=Insert after selected branchline observe.content.longlineDetailComposition.action.insertAfterSelectedSection=Insert after observe.content.longlineDetailComposition.action.insertAfterSelectedSection.tip=Insert after selected section +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate=Insert after +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate.tip=Insert after selected section observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket=Insert before observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket.tip=Insert before selected basket observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline=Insert before observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip=Insert before selected branchline observe.content.longlineDetailComposition.action.insertBeforeSelectedSection=Insert before observe.content.longlineDetailComposition.action.insertBeforeSelectedSection.tip=Insert before selected section +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate=Insert before +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate.tip=Insert before selected section template observe.content.longlineDetailComposition.baskets=Baskets observe.content.longlineDetailComposition.basketsTable.floatline1Length=Floatline 1 length (m) observe.content.longlineDetailComposition.basketsTable.floatline1Length.tip=Floatline 1 length (m) diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index bc08238..d51f134 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -947,12 +947,16 @@ observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline=I observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline.tip=Insertar después del arponcillo seleccionado observe.content.longlineDetailComposition.action.insertAfterSelectedSection=Insertar después observe.content.longlineDetailComposition.action.insertAfterSelectedSection.tip=Insertar después de la sección seleccionada +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate=Insertar después +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate.tip=Insertar después de la sección template seleccionada observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket=Insertar antes observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket.tip=Insertar antes de la cesta seleccionada observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline=Insertar antes observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip=Insertar antes del arponcillo seleccionado observe.content.longlineDetailComposition.action.insertBeforeSelectedSection=Insertar antes observe.content.longlineDetailComposition.action.insertBeforeSelectedSection.tip=Insertar antes de la sección seleccionada +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate=Insertar antes +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate.tip=Insertar antes de la sección template seleccionada observe.content.longlineDetailComposition.baskets=Cestas observe.content.longlineDetailComposition.basketsTable.floatline1Length=Orinque 1 (m) observe.content.longlineDetailComposition.basketsTable.floatline1Length.tip=Longitud Orinque 1 (m) diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 529b960..f0e5fac 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -947,12 +947,16 @@ observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline=I observe.content.longlineDetailComposition.action.insertAfterSelectedBranchline.tip=Insérer après l'avançon sélectionné observe.content.longlineDetailComposition.action.insertAfterSelectedSection=Insérer après observe.content.longlineDetailComposition.action.insertAfterSelectedSection.tip=Insérer après la section sélectionnée +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate=Insérer après +observe.content.longlineDetailComposition.action.insertAfterSelectedSectionTemplate.tip=Insérer après la template de section sélectionnée observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket=Insérer avant observe.content.longlineDetailComposition.action.insertBeforeSelectedBasket.tip=Insérer avant le panier sélectionné observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline=Insérer avant observe.content.longlineDetailComposition.action.insertBeforeSelectedBranchline.tip=Insérer avant l'avançon sélectionné observe.content.longlineDetailComposition.action.insertBeforeSelectedSection=Insérer avant observe.content.longlineDetailComposition.action.insertBeforeSelectedSection.tip=Insérer avant la section sélectionnée +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate=Insérer avant +observe.content.longlineDetailComposition.action.insertBeforeSelectedSectionTemplate.tip=Insérer avant la template de section sélectionnée observe.content.longlineDetailComposition.baskets=Paniers observe.content.longlineDetailComposition.basketsTable.floatline1Length=Orin 1 (m) observe.content.longlineDetailComposition.basketsTable.floatline1Length.tip=Longueur Orin 1 (m) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 139e56c83da673e5de6f69583d3bb7d58e99e005 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 7 16:31:58 2016 +0100 Forcer l'utilisation de localhost pour le serveur web H2 (Fixes #8765) --- .../swing/ui/actions/menu/storage/StartH2WebServerAction.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java index a7027da..3988308 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartH2WebServerAction.java @@ -76,8 +76,7 @@ public class StartH2WebServerAction extends AbstractUIAction { Server server = Server.createWebServer("-webAllowOthers"); server.start(); - - Server.openBrowser(server.getURL()); + Server.openBrowser("http://localhost:" + server.getPort()); // On mémorise l'instance du server dans le contexte applicatif afin de pouvoir la récupérer plus tard, // par exemple lorsque l'on souhaitera arrêter le server. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.