GitLab

at 2020-02-27T13:26:05+01:00

* migration du code pour être compatible avec java > 8
* mise à jour de jaxx (à tester plus en profondeur)

     </dependency>

     <dependency>

       <groupId>com.vladsch.flexmark</groupId>

-      <artifactId>flexmark-util</artifactId>

+      <artifactId>flexmark-util-ast</artifactId>

     </dependency>

 

     <!-- Logging -->

         beanList.setI18nPrefix("observe.common.");

         Class referenceType = beanList.getBeanType();

 //        beanList.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType));

-        beanList.getAddButton().setFocusable(false);

-        beanList.getRemoveButton().setFocusable(false);

+        beanList.getAddAction().setFocusable(false);

+        beanList.getRemoveAction().setFocusable(false);

 

         log.debug("init list for " + beanList.getBeanType());

     }

         beanList.setI18nPrefix("observe.common.");

         Class referenceType = beanList.getBeanType();

 //        beanList.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType));

-        beanList.getAddButton().setFocusable(false);

-        beanList.getRemoveButton().setFocusable(false);

+        beanList.getAddAction().setFocusable(false);

+        beanList.getRemoveAction().setFocusable(false);

 

         log.debug("init list for " + beanList.getBeanType());

 

         if (deep) {

             // repaint childs nodes

             @SuppressWarnings("unchecked")

-            Enumeration<NavigationTreeNodeSupport<?>> e = node.children();

+            Enumeration e = node.children();

             while (e.hasMoreElements()) {

-                NavigationTreeNodeSupport<?> child = e.nextElement();

+                NavigationTreeNodeSupport<?> child = (NavigationTreeNodeSupport<?>)e.nextElement();

                 reloadNode(child, true);

             }

         }

             // au final le noeud est une feuille, donc ne convient pas

             return null;

         }

-        Enumeration<NavigationTreeNodeSupport> children = children();

+        Enumeration children = children();

         while (children.hasMoreElements()) {

-            NavigationTreeNodeSupport node = children.nextElement();

+            NavigationTreeNodeSupport node = (NavigationTreeNodeSupport) children.nextElement();

             if (id.equals(node.getId()) || (node.getUserObject() instanceof String && id.equals(node.getUserObject()))) {

                 return node;

             }

             // au final le noeud est une feuille, donc ne convient pas

             return null;

         }

-        Enumeration<NavigationTreeNodeSupport<?>> children = children();

+        Enumeration children = children();

         while (children.hasMoreElements()) {

-            NavigationTreeNodeSupport<?> node = children.nextElement();

+            NavigationTreeNodeSupport<?> node = (NavigationTreeNodeSupport<?>) children.nextElement();

             if (childType.isAssignableFrom(node.getClass())) {

                 return node;

             }

             // au final le noeud est une feuille, donc ne convient pas

             return null;

         }

-        Enumeration<NavigationTreeNodeSupport<?>> children = children();

+        Enumeration children = children();

         while (children.hasMoreElements()) {

-            NavigationTreeNodeSupport<?> node = children.nextElement();

+            NavigationTreeNodeSupport<?> node = (NavigationTreeNodeSupport<?>) children.nextElement();

             if (childType.isAssignableFrom(node.getDataType())) {

                 return node;

             }

 

     @Override

     public Iterator<TripLonglineNavigationTreeNode> iterator() {

-        return EnumerationUtils.toList(children()).iterator();

+        return (Iterator)EnumerationUtils.toList(children()).iterator();

     }

 }
 

     @Override

     public Iterator<TripSeineNavigationTreeNode> iterator() {

-        return EnumerationUtils.toList(children()).iterator();

+        return (Iterator)EnumerationUtils.toList(children()).iterator();

     }

 }
 

     public abstract void setSelected(boolean selected);

 

-    @Override

-    public Enumeration<SelectionTreeNodeSupport> children() {

-        return (Enumeration) super.children();

-    }

-

     public ReferenceSelectionTreeNodeSupport findById(String id) {

-        Enumeration<SelectionTreeNodeSupport> children = children();

+        Enumeration children = children();

         while (children.hasMoreElements()) {

             ReferenceSelectionTreeNodeSupport<?, ?> child = (ReferenceSelectionTreeNodeSupport) children.nextElement();

             if (id.equals(child.getData().getId())) {

       <scope>test</scope>

     </dependency>

 

+    <dependency>

+      <groupId>javax.annotation</groupId>

+      <artifactId>jsr250-api</artifactId>

+      <scope>provided</scope>

+    </dependency>

+

   </dependencies>

 

   <build>

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>2020.8.7</version>

+    <version>2020.3</version>

   </parent>

 

   <groupId>fr.ird.observe</groupId>

     <!--can't use 1.4.197 (date has changed + blob also-->

     <lib.version.h2>1.4.196</lib.version.h2>

     <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene>

-    <lib.version.java4all.jaxx>3.0-alpha-56</lib.version.java4all.jaxx>

+<!--    <lib.version.java4all.jaxx>3.0-alpha-56</lib.version.java4all.jaxx>-->

     <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->

     <lib.version.java4all.topia>1.1.16</lib.version.java4all.topia>

     <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils>

                 <reports>

                   <report>dependency-updates-report</report>

                   <report>plugin-updates-report</report>

-                  <report>property-updates-report</report>

                 </reports>

               </reportSet>

             </reportSets>

       </exclusions>

     </dependency>

 

+    <dependency>

+      <groupId>com.thoughtworks.paranamer</groupId>

+      <artifactId>paranamer</artifactId>

+      <scope>runtime</scope>

+    </dependency>

+

     <dependency>

       <groupId>javax.servlet</groupId>

       <artifactId>javax.servlet-api</artifactId>

       <groupId>junit</groupId>

       <artifactId>junit</artifactId>

     </dependency>

+    <dependency>

+      <groupId>javax.annotation</groupId>

+      <artifactId>jsr250-api</artifactId>

+      <scope>provided</scope>

+    </dependency>

 

   </dependencies>

 

 import org.debux.webmotion.server.call.Call;

 import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;

 import org.debux.webmotion.server.mapping.Mapping;

-import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;

 

+import java.lang.reflect.ParameterizedType;

 import java.lang.reflect.Type;

 import java.util.Collection;

 import java.util.Objects;

                 String[] values = (String[]) parameterTree.getValue();

                 StringBuilder value = new StringBuilder(values[0]);

                 if ((value.length() > 0) && !value.toString().contains("[")) {

-                    if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) {

+                    if (((ParameterizedType) generic).getActualTypeArguments()[0].equals(String.class)) {

                         value = new StringBuilder();

                         for (String s : values) {

                             value.append(", \"").append(s).append("\"");

       <artifactId>junit</artifactId>

     </dependency>

 

-

+    <dependency>

+      <groupId>javax.annotation</groupId>

+      <artifactId>jsr250-api</artifactId>

+      <scope>provided</scope>

+    </dependency>

   </dependencies>

 

   <build>

-package fr.ird.observe.services.client.referential;

-

-/*-

- * #%L

- * ObServe :: Services client implementation

- * %%

- * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io

- * %%

- * This program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as

- * published by the Free Software Foundation, either version 3 of the

- * License, or (at your option) any later version.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public

- * License along with this program.  If not, see

- * <http://www.gnu.org/licenses/gpl-3.0.html>.

- * #L%

- */

-

-import fr.ird.observe.dto.reference.ReferentialDtoReference;

-import fr.ird.observe.dto.referential.ReferentialDto;

-import org.apache.http.HttpStatus;

-

-import java.util.concurrent.TimeUnit;

-

-public class ReferentialServiceClient extends GeneratedReferentialServiceClient {

-

-    @Override

-    public <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> R loadReference(Class<R> type, String id) {

-        return executeRequest(create("loadReference")

-                                      .addParameter("type", type)

-                                      .addParameter("id", id)

-                                      .addAuthToken()

-                                      .setTimeout(TimeUnit.MINUTES, 1)

-                                      .get(), HttpStatus.SC_OK).toJson(type);

-    }

-}

...	...	@@ -77,6 +77,6 @@ public class ProgramLonglineNavigationTreeNode extends ReferenceNavigationTreeNo
77	77
78	78	@Override
79	79	public Iterator<TripLonglineNavigationTreeNode> iterator() {
80		- return EnumerationUtils.toList(children()).iterator();
	80	+ return (Iterator)EnumerationUtils.toList(children()).iterator();
81	81	}
82	82	}

...	...	@@ -76,6 +76,6 @@ public class ProgramSeineNavigationTreeNode extends ReferenceNavigationTreeNodeS
76	76
77	77	@Override
78	78	public Iterator<TripSeineNavigationTreeNode> iterator() {
79		- return EnumerationUtils.toList(children()).iterator();
	79	+ return (Iterator)EnumerationUtils.toList(children()).iterator();
80	80	}
81	81	}

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

14 changed files:

Changes: