GitLab

at 2018-10-01T13:23:36Z

Petit renommage de libellé - Closes #1099

Fix some memory leaks (some content were not closed properly

Extension de fichier du rapport de validation - Closes #1102

up to version 7.0.0-SNAPSHOT

Widget température °C/°F : message de validation perfectible - Closes #960 (il restait une validation de température au niveau des routes)

Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - See #1100

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>client-configuration</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>client</artifactId>

 import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage;

 import fr.ird.observe.services.validation.ValidatorDto;

 import org.apache.commons.lang3.mutable.MutableInt;

-import org.apache.logging.log4j.Logger;

 import org.apache.logging.log4j.LogManager;

+import org.apache.logging.log4j.Logger;

 import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;

 import org.nuiton.validator.NuitonValidatorScope;

 

     static final String PROPERTY_VALIDATION_RESULT = "validationResult";

 

     /** le pattern du fichier de rapport après validation */

-    private static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.txt";

+    private static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.html";

 

     /** Logger */

     private static final Logger log = LogManager.getLogger(ValidateModel.class);

         SwingValidatorUtil.setValidatorChanged(ui, false);

     }

 

-    protected void closeSafeUI() {

+    public void closeSafeUI() {

 

         removeAllMessages(ui);

         ContentUIModel<E> model = getModel();

-

+        getUi().getErrorTableModel().clearValidators();

         boolean create = model.isCreatingMode();

         if (create && model.isEditable()) {

             // remove node

 import fr.ird.observe.dto.result.SaveResultDto;

 import fr.ird.observe.spi.DtoModelHelper;

 import org.apache.commons.lang3.BooleanUtils;

-import org.apache.logging.log4j.Logger;

 import org.apache.logging.log4j.LogManager;

+import org.apache.logging.log4j.Logger;

 import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef;

 import org.nuiton.jaxx.runtime.spi.UIHandler;

 import org.nuiton.jaxx.validator.swing.SwingValidator;

 import org.nuiton.util.DateUtil;

 import org.nuiton.validator.NuitonValidatorScope;

 

-import javax.swing.*;

+import javax.swing.JComponent;

+import javax.swing.JOptionPane;

+import javax.swing.JTable;

+import javax.swing.SwingUtilities;

 import javax.swing.event.TableModelListener;

 import javax.swing.table.DefaultTableCellRenderer;

 import java.awt.Component;

     }

 

     @Override

-    protected void closeSafeUI() {

+    public void closeSafeUI() {

 

         if (log.isInfoEnabled()) {

             log.info("CloseUI: " + getModel());

 import fr.ird.observe.dto.result.SaveResultDto;

 import fr.ird.observe.services.service.referential.ReferentialService;

 import org.apache.commons.lang3.StringUtils;

-import org.apache.logging.log4j.Logger;

 import org.apache.logging.log4j.LogManager;

+import org.apache.logging.log4j.Logger;

 import org.nuiton.jaxx.runtime.spi.UIHandler;

 import org.nuiton.jaxx.runtime.swing.JTables;

 import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;

     }

 

     @Override

-    protected void closeSafeUI() {

+    public void closeSafeUI() {

 

         if (log.isInfoEnabled()) {

             log.info("CloseUI: " + getModel());

     }

 

     @Override

-    protected void closeSafeUI() {

+    public void closeSafeUI() {

 

         if (log.isInfoEnabled()) {

             log.info("CloseUI: " + getModel());

 import fr.ird.observe.dto.referential.SpeciesReference;

 import fr.ird.observe.dto.referential.longline.SensorBrandReference;

 import fr.ird.observe.dto.result.SaveResultDto;

-import org.apache.logging.log4j.Logger;

 import org.apache.logging.log4j.LogManager;

+import org.apache.logging.log4j.Logger;

 import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef;

 import org.nuiton.jaxx.runtime.spi.UIHandler;

 import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;

     }

 

     @Override

-    protected void closeSafeUI() {

+    public void closeSafeUI() {

         if (log.isInfoEnabled()) {

             log.info("CloseUI: " + getModel());

         }

 import fr.ird.observe.dto.result.SaveResultDto;

 import fr.ird.observe.services.service.referential.ReferentialService;

 import org.apache.commons.lang3.StringUtils;

-import org.apache.logging.log4j.Logger;

 import org.apache.logging.log4j.LogManager;

+import org.apache.logging.log4j.Logger;

 import org.nuiton.jaxx.runtime.spi.UIHandler;

 import org.nuiton.jaxx.runtime.swing.JTables;

 import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;

     }

 

     @Override

-    protected void closeSafeUI() {

+    public void closeSafeUI() {

 

         if (log.isInfoEnabled()) {

             log.info("CloseUI: " + getModel());

 import fr.ird.observe.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.db.ClientDataContext;

 import fr.ird.observe.client.db.ObserveSwingDataSource;

+import fr.ird.observe.client.ui.content.ContentUI;

 import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport;

 import fr.ird.observe.client.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport;

 import fr.ird.observe.client.ui.tree.navigation.nodes.RootNavigationTreeNode;

     public NavigationTree() {

         super(new NavigationTreeModel());

         setSelectionModel(new DefaultTreeSelectionModel() {

+//            @Override

+//            public void setSelectionPath(TreePath path) {

+//                boolean canChange = skipCheckPreviousContent || (!Objects.equals(path, getSelectionPath()) && ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI());

+//                if (!canChange) {

+//                    // cancel the change of node

+//                    log.warn(String.format("Do not change selection path: %s against: %s", path, getSelectionPath()));

+//                    return;

+//                }

+//                if (skipCheckPreviousContent) {

+//                    ContentUI selectedContentUI = ObserveSwingApplicationContext.get().getContentUIManager().getSelectedContentUI();

+//                    if (selectedContentUI != null) {

+//                        selectedContentUI.getHandler().closeSafeUI();

+//                    }

+//                }

+//                super.setSelectionPath(path);

+//            }

+

             @Override

-            public void setSelectionPath(TreePath path) {

+            public void setSelectionPaths(TreePath[] pPaths) {

+                if (pPaths.length > 1) {

+                    return;

+                }

+                TreePath path = pPaths[0];

                 boolean canChange = skipCheckPreviousContent || (!Objects.equals(path, getSelectionPath()) && ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI());

                 if (!canChange) {

                     // cancel the change of node

+                    log.warn(String.format("Do not change selection path: %s against: %s", path, getSelectionPath()));

                     return;

                 }

-                super.setSelectionPath(path);

+                if (skipCheckPreviousContent) {

+                    ContentUI selectedContentUI = ObserveSwingApplicationContext.get().getContentUIManager().getSelectedContentUI();

+                    if (selectedContentUI != null) {

+                        selectedContentUI.getHandler().closeSafeUI();

+                    }

+                }

+                super.setSelectionPaths(pPaths);

             }

         });

         setLargeModel(true);

 observe.ui.tree.seine.nonTargetCatchRelease=Non target released catches

 observe.ui.tree.seine.nonTargetSample=Non target samples

 observe.ui.tree.seine.objectObservedSpecies=Object observed species

-observe.ui.tree.seine.objectOperation=Object operations

+observe.ui.tree.seine.objectOperation=Beacon

 observe.ui.tree.seine.objectSchoolEstimate=Object school estimates

 observe.ui.tree.seine.routes=Routes

 observe.ui.tree.seine.schoolEstimate=School estimates

 observe.ui.tree.seine.nonTargetCatchRelease=Faunes accessoires libérées \#TODO

 observe.ui.tree.seine.nonTargetSample=Muestreos de fauna accesoria

 observe.ui.tree.seine.objectObservedSpecies=Fauna observada

-observe.ui.tree.seine.objectOperation=Operaciones sobre el objeto

+observe.ui.tree.seine.objectOperation=Baliza

 observe.ui.tree.seine.objectSchoolEstimate=Estimaciones banco de objetos

 observe.ui.tree.seine.routes=Rutas

 observe.ui.tree.seine.schoolEstimate=Estimaciones banco

 observe.ui.tree.seine.nonTargetCatchRelease=Espèces accessoires libérées

 observe.ui.tree.seine.nonTargetSample=Échantillons espèces accessoires

 observe.ui.tree.seine.objectObservedSpecies=Faune observée

-observe.ui.tree.seine.objectOperation=Opérations sur l'objet

+observe.ui.tree.seine.objectOperation=Balise

 observe.ui.tree.seine.objectSchoolEstimate=Estimations banc objet

 observe.ui.tree.seine.routes=Routes

 observe.ui.tree.seine.schoolEstimate=Estimation banc

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>dto</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>observe</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>persistence</artifactId>

 

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

   <artifactId>ird-observe</artifactId>

-  <version>7.0-RC-23-SNAPSHOT</version>

+  <version>7.0.0-SNAPSHOT</version>

   <packaging>pom</packaging>

 

   <name>ObServe :: Pom</name>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>server-configuration</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>server</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>services-client</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>services-local</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>services</artifactId>

 import fr.ird.observe.dto.data.seine.ActivitySeineStubDto;

 import fr.ird.observe.dto.data.seine.RouteDto;

 import fr.ird.observe.dto.decoration.DecoratorService;

-import org.apache.logging.log4j.Logger;

 import org.apache.logging.log4j.LogManager;

+import org.apache.logging.log4j.Logger;

 

+import java.util.Comparator;

+import java.util.LinkedList;

+import java.util.List;

 import java.util.Objects;

 

 /**

 

         Objects.requireNonNull(route, " could not find currentRoute in valueStack");

 

-        ActivitySeineStubDto previousActivity = route.getPreviousActivity(activity.getId());

-

+        ActivitySeineStubDto previousActivity;

+

+        if (activity.isNotPersisted()) {

+            // since there is no id, can't use the later method, must find out by our self previous activity

+            List<ActivitySeineStubDto> activitySeine = new LinkedList<>(route.getActivitySeine());

+            ActivitySeineStubDto activityStub = new ActivitySeineStubDto();

+            activityStub.setTime(activity.getTime());

+            activitySeine.add(activityStub);

+            activitySeine.sort(Comparator.comparing(ActivitySeineStubDto::getTimeSecond));

+            int index = activitySeine.indexOf(activityStub);

+            if (index > 0) {

+                previousActivity = activitySeine.get(index - 1);

+            } else {

+                previousActivity = null;

+            }

+        } else {

+            previousActivity = route.getPreviousActivity(activity.getId());

+        }

         if (previousActivity == null) {

 

             // pas d'activity avant, rien à valider

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>test</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.0-RC-23-SNAPSHOT</version>

+    <version>7.0.0-SNAPSHOT</version>

   </parent>

 

   <artifactId>validation</artifactId>

       <message>observe.validation.route.invalid.time##${index}</message>

     </field-validator>

 

-    <!-- coherence seaSurfaceTemperature des activitys (moins de 12 de delta) -->

-    <field-validator type="collectionFieldExpression">

-      <param name="mode">ALL</param>

-      <param name="useSensitiveContext">true</param>

-      <param name="expression"><![CDATA[

-                previous == null || previous.seaSurfaceTemperature == null || current.seaSurfaceTemperature == null

-                || (previous.seaSurfaceTemperature > current.seaSurfaceTemperature ?

-                previous.seaSurfaceTemperature - current.seaSurfaceTemperature <= 12.0

-                :  current.seaSurfaceTemperature - previous.seaSurfaceTemperature <= 12.0

-                )

-            ]]>

-      </param>

-      <message>observe.validation.route.invalid.seaSurfaceTemperature##${index}</message>

-    </field-validator>

-

     <!-- coherence quadrant des activitys -->

     <field-validator type="collectionFieldExpression">

       <param name="mode">ALL</param>

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

Commits:

26 changed files:

Changes: