March 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted branch develop-7
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT deleted branch develop-7 at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch master-7
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT deleted branch master-7 at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch master-o
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT deleted branch master-o at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: fix dependency version
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a00d55a2 by Tony CHEMIT at 2018-03-28T11:07:05Z fix dependency version - - - - - 3368d62e by Tony CHEMIT at 2018-03-28T11:07:22Z use next tooltit version - - - - - ba0c1ba6 by Tony CHEMIT at 2018-03-28T11:07:45Z can create new data at last - - - - - 84d9c371 by Tony CHEMIT at 2018-03-28T11:08:03Z fix measurement render - - - - - 4 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - pom.xml Changes: ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -626,7 +626,7 @@ <dependency> <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> - <version>RELEASE</version> + <version>15.0</version> </dependency> </dependencies> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/table/GearUseFeatureMeasurementCellRenderer.java @@ -23,7 +23,6 @@ package fr.ird.observe.client.ui.content.table; */ import fr.ird.observe.client.ui.util.UIHelper; -import fr.ird.observe.dto.referential.GearCaracteristicDto; import fr.ird.observe.dto.referential.GearCaracteristicReference; import fr.ird.observe.dto.referential.GearCaracteristicTypeHelper; import java.awt.Component; @@ -41,9 +40,8 @@ import javax.swing.table.TableCellRenderer; */ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer { - protected final int caracteristicColumn; - - protected final Map<String, TableCellRenderer> renderersByCaracteristicTypeId; + private final int caracteristicColumn; + private final Map<String, TableCellRenderer> renderersByCaracteristicTypeId; public GearUseFeatureMeasurementCellRenderer(int caracteristicColumn, DefaultTableCellRenderer renderer) { @@ -90,7 +88,7 @@ public class GearUseFeatureMeasurementCellRenderer implements TableCellRenderer tableCellRenderer = table.getDefaultRenderer(Object.class); } else { - String gearCaracteristicTypeId = caracteristicRef.getPropertyValue(GearCaracteristicDto.PROPERTY_GEAR_CARACTERISTIC_TYPE); + String gearCaracteristicTypeId = caracteristicRef.getGearCaracteristicTypeId(); tableCellRenderer = renderersByCaracteristicTypeId.get(gearCaracteristicTypeId); ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java +++ b/client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java @@ -10,19 +10,18 @@ package fr.ird.observe.client.ui.tree.navigation; * 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.spi.DtoModelHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.db.ClientDataContext; import fr.ird.observe.client.db.ObserveSwingDataSource; @@ -43,7 +42,6 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.seine.RoutesSeineNavigatio import fr.ird.observe.client.ui.tree.navigation.nodes.seine.SetSeineNavigationTreeNode; import fr.ird.observe.client.ui.tree.navigation.nodes.seine.TripSeineNavigationTreeNode; import fr.ird.observe.dto.IdDto; -import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.data.longline.ActivityLonglineDto; import fr.ird.observe.dto.data.longline.ActivityLonglineReference; import fr.ird.observe.dto.data.longline.SetLonglineDto; @@ -63,12 +61,13 @@ import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.referential.ProgramDto; import fr.ird.observe.dto.referential.ProgramHelper; import fr.ird.observe.dto.referential.ProgramReference; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import fr.ird.observe.dto.referential.ReferentialLocale; +import fr.ird.observe.spi.DtoModelHelper; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTree; + import javax.swing.SwingUtilities; import javax.swing.event.TreeExpansionEvent; import javax.swing.event.TreeWillExpandListener; @@ -76,10 +75,12 @@ import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.ExpandVetoException; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTree; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.List; +import java.util.Objects; +import java.util.Set; /** * Created on 14/11/16. @@ -112,7 +113,7 @@ public class NavigationTree extends JXTree { addTreeWillExpandListener(new TreeWillExpandListener() { @Override - public void treeWillExpand(TreeExpansionEvent event) throws ExpandVetoException { + public void treeWillExpand(TreeExpansionEvent event) { if (!(getModel() instanceof NavigationTreeModel)) { return; } @@ -357,6 +358,7 @@ public class NavigationTree extends JXTree { getTreeModel().nodeChanged(node); if (deep) { // repaint childs nodes + @SuppressWarnings("unchecked") Enumeration<NavigationTreeNodeSupport<?>> e = node.children(); while (e.hasMoreElements()) { NavigationTreeNodeSupport<?> child = e.nextElement(); @@ -397,31 +399,22 @@ public class NavigationTree extends JXTree { // noeud en mode creation NavigationTreeNodeSupport result; - //FIXME Create empty reference if (TripSeineDto.class.equals(type)) { -// result = new TripSeineNavigationTreeNode(new TripSeineReference(null, null, null, 0, null, null)); - result = null; + result = new TripSeineNavigationTreeNode(new TripSeineReference(new TripSeineDto(), null, null, parentNode.getId(), 0, null, null)); } else if (RouteDto.class.equals(type)) { -// result = new RouteSeineNavigationTreeNode(new RouteReference(null, null)); - result = null; + result = new RouteSeineNavigationTreeNode(new RouteReference(new RouteDto(), null, null)); } else if (ActivitySeineDto.class.equals(type)) { -// result = new ActivitySeineNavigationTreeNode(new ActivitySeineReference(null, null, null, null)); - result = null; + result = new ActivitySeineNavigationTreeNode(new ActivitySeineReference(new ActivitySeineDto(), null, null, null, null)); } else if (SetSeineDto.class.equals(type)) { -// result = new SetSeineNavigationTreeNode(new SetSeineReference(null)); - result = null; + result = new SetSeineNavigationTreeNode(new SetSeineReference(new SetSeineDto(), null)); } else if (FloatingObjectDto.class.equals(type)) { -// result = new FloatingObjectSeineNavigationTreeNode(new FloatingObjectReference(null)); - result = null; + result = new FloatingObjectSeineNavigationTreeNode(new FloatingObjectReference(new FloatingObjectDto(), null)); } else if (TripLonglineDto.class.equals(type)) { -// result = new TripLonglineNavigationTreeNode(new TripLonglineReference(null, null, null, null, 0, null, null)); - result = null; + result = new TripLonglineNavigationTreeNode(new TripLonglineReference(new TripLonglineDto(), null, null, parentNode.getId(), null, 0, null, null)); } else if (ActivityLonglineDto.class.equals(type)) { -// result = new ActivityLonglineNavigationTreeNode(new ActivityLonglineReference(null, null, null, null)); - result = null; + result = new ActivityLonglineNavigationTreeNode(new ActivityLonglineReference(new ActivityLonglineDto(), null, null, null, null)); } else if (SetLonglineDto.class.equals(type)) { -// result = new SetLonglineNavigationTreeNode(new SetLonglineReference(null)); - result = null; + result = new SetLonglineNavigationTreeNode(new SetLonglineReference(new SetLonglineDto(), null)); } else { throw new IllegalStateException("Can't use type to create unsaved node: " + type.getName()); } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>1.4</observeToolkitVersion> + <observeToolkitVersion>1.5-SNAPSHOT</observeToolkitVersion> <eugenePluginVersion>3.0-alpha-13</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7f8c7c2d523d3b580f131b8e41… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7f8c7c2d523d3b580f131b8e41… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] Deleted 22 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-9-SNAPSHOT development[skip ci]
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 84479565 by 166231 at 2017-09-11T11:19:07Z [jgitflow-maven-plugin]updating poms for 7.0-RC-9-SNAPSHOT development[skip ci] - - - - - 4ad06e3c by 166231 at 2017-09-11T11:35:03Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 782d0874 by 166231 at 2017-09-11T11:35:05Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 745f5026 by 166231 at 2017-09-11T11:35:07Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 72fc3de0 by 166231 at 2017-09-11T11:41:09Z Update changelog after stage of milestone 7.0-rc-8 [skip ci] - - - - - d1e8fb91 by Tony CHEMIT at 2017-09-11T11:51:01Z Update changelog after stage of milestone 7.0-rc-8 [skip ci] - - - - - 7c9acf7b by Tony CHEMIT at 2017-09-11T11:52:32Z update changelog - - - - - 2ec5c505 by Tony CHEMIT at 2017-09-12T20:38:03Z rename models (build but tests are dead) [skip ci] - - - - - af24ebd8 by Tony CHEMIT at 2017-09-12T20:41:10Z fix typo - - - - - 3d8a84e6 by Tony CHEMIT at 2017-09-13T10:54:46Z Revert lost commit, somewhere in 7.0-RC-8 - - - - - cc459a56 by Tony CHEMIT at 2017-09-14T12:22:40Z Renommage de certaines tables du modèle palangre en les suffixant par Obs (see #873) (migration et adaptations) - - - - - 95e06f56 by Tony CHEMIT at 2017-09-14T12:23:50Z Merge branch 'feature/873' into 'develop' See #873 See merge request ultreiaio/ird-observe!4 - - - - - 2cc074d0 by Tony CHEMIT at 2017-09-14T15:08:41Z Déplacer le référentiel Wind dans le schema commun (See #874) + fix obs migration for pg (See #873) - - - - - 08b08fdc by Tony CHEMIT at 2017-09-14T15:48:36Z Tranductions du référentiel Wind (See #875) - - - - - 699b45af by Tony CHEMIT at 2017-09-18T19:31:10Z fix some replication pb (for extra columns) + use new entity context api - - - - - 15fad292 by Tony CHEMIT at 2017-09-19T10:13:57Z use last eugene version - - - - - 08df2e60 by Tony CHEMIT at 2017-09-19T10:43:46Z use last pom - - - - - 778ed522 by Tony CHEMIT at 2017-09-19T10:44:08Z let's use very last spi api - - - - - 0be8b4f1 by Tony CHEMIT at 2017-09-19T11:38:18Z prepare next release - - - - - d2fa4fce by Tony CHEMIT at 2017-09-19T11:52:08Z [jgitflow-maven-plugin]updating poms for 7.0-RC-9 branch with snapshot versions[skip ci] - - - - - ea6d4813 by Tony CHEMIT at 2017-09-19T11:52:28Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-9' with non-snapshot versions[skip ci] - - - - - dae5c61e by Tony CHEMIT at 2017-09-19T11:59:19Z [jgitflow-maven-plugin]merging 'release/7.0-RC-9' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client-configuration/pom.xml - client/pom.xml - client/src/main/assembly/dist/obstuna-admin/extra/create-postgis-4-activity-longine.sql - client/src/main/java/fr/ird/observe/client/db/constants/DataContextType.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObssUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ObserveFocusManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglinesUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglinesUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglinesUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglinesUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/HooksCompositionUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BasketsTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6fedb21f3bb9f29859dd7f83e1… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6fedb21f3bb9f29859dd7f83e1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch master-RC-10
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed new branch master-RC-10 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/master-RC-10 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch develop-RC-10
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed new branch develop-RC-10 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/develop-RC-10 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch master-7
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed new branch master-7 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/master-7 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch develop-7
by Tony CHEMIT 28 Mar '18

28 Mar '18

Tony CHEMIT pushed new branch develop-7 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/develop-7 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] remove ssl check
by Tony CHEMIT 19 Mar '18

19 Mar '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 8175f52b by Tony CHEMIT at 2018-03-19T10:24:29Z remove ssl check - - - - - 2 changed files: - .gitlab-ci.yml - − .well-known/acme-challenge/zS-Mbmi38IYrIjtZlKBQbpGDqhnkk5GJEEUMGlQZXhA Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,6 @@ pages: script: - mkdir .public - cp -r * .public - - cp -r .well-known .public/ - mv .public public artifacts: paths: ===================================== .well-known/acme-challenge/zS-Mbmi38IYrIjtZlKBQbpGDqhnkk5GJEEUMGlQZXhA deleted ===================================== --- a/.well-known/acme-challenge/zS-Mbmi38IYrIjtZlKBQbpGDqhnkk5GJEEUMGlQZXhA +++ /dev/null @@ -1 +0,0 @@ -zS-Mbmi38IYrIjtZlKBQbpGDqhnkk5GJEEUMGlQZXhA.oelQdCyXr-2gAmuGCJP0WQ-uvkrVlzA5z1ce7kkNJCw \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8175f52b0795d1f910920799f89… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8175f52b0795d1f910920799f89… You're receiving this email because of your account on gitlab.com.

1 0