...
 
Commits (8)
## Sprint 54 - v5.1.4
- Pas de mise à jour de modèle
## Sprint 53 - v5.1.2 & v5.1.3
- Pas de mise à jour de modèle
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>fr.ifremer.dali</groupId>
<artifactId>dali</artifactId>
<version>5.1.3</version>
<version>5.1.4</version>
</parent>
<artifactId>dali-core</artifactId>
......
......@@ -406,8 +406,9 @@ public class DaliStrategyDaoImpl extends StrategyDaoImpl implements DaliStrategy
} else {
if (CollectionUtils.isNotEmpty(target.getPmfmStrategies())) {
target.getPmfmStrategies().clear();
// collect pmfmStrategyIds before clearing collection (Mantis #51602)
List<Integer> pmfmStrategyIds = DaliBeans.collectProperties(target.getPmfmStrategies(), "pmfmStratId");
target.getPmfmStrategies().clear();
deletePmfmStrategies(pmfmStrategyIds);
}
}
......@@ -747,17 +748,14 @@ public class DaliStrategyDaoImpl extends StrategyDaoImpl implements DaliStrategy
Set<Integer> idsToDelete = pmfmStrategyIds.stream().filter(Objects::nonNull).collect(Collectors.toSet());
if (CollectionUtils.isEmpty(idsToDelete)) return;
// call dao instead of bulk delete to allow delete checks
idsToDelete.forEach(idToDelete -> pmfmStrategyDao.remove(idToDelete));
getSession().flush();
// Execute deletion by query (Mantis #51602)
Query query = createQuery("deletePmfmAppliedStrategiesByPmfmStrategyIds");
query.setParameterList("pmfmStrategyIds", idsToDelete);
query.executeUpdate();
// Query query = createQuery("deletePmfmAppliedStrategiesByPmfmStrategyIds");
// query.setParameterList("pmfmStrategyIds", idsToDelete);
// query.executeUpdate();
//
// query = createQuery("deletePmfmStrategiesByIds");
// query.setParameterList("pmfmStrategyIds", idsToDelete);
// query.executeUpdate();
query = createQuery("deletePmfmStrategiesByIds");
query.setParameterList("pmfmStrategyIds", idsToDelete);
query.executeUpdate();
}
/** {@inheritDoc} */
......
......@@ -4,7 +4,7 @@
<parent>
<groupId>fr.ifremer.dali</groupId>
<artifactId>dali</artifactId>
<version>5.1.3</version>
<version>5.1.4</version>
</parent>
<artifactId>dali-ui-swing</artifactId>
......
......@@ -51,7 +51,7 @@
# Please fill the missing licenses for dependencies :
#
#
#Fri Mar 13 10:21:37 CET 2020
#Mon May 04 10:05:19 CEST 2020
com.oracle--ojdbc7--12.1.0.2.0=OTN license
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.6.1=BSD License
......
......@@ -226,10 +226,11 @@ public class SurveysMapBuilder implements MapBuilder {
// location line style
TextSymbolizer textLineSymbolizer = SF.createTextSymbolizer(fillBlack, new Font[]{font}, haloWhite, FF.property(LABEL), labelLinePlacement, null);
textLineSymbolizer.setPriority(FF.literal(1));
// Invert both symbolizer to conserve text rendering on too small line (Mantis #51902)
styleLocationLine = createStyle(
"styleLocationLine",
createLineSymbolizer("symbolizerLocationLine", stroke),
textLineSymbolizer);
textLineSymbolizer,
createLineSymbolizer("symbolizerLocationLine", stroke));
// location Polygon style
TextSymbolizer textPolygonSymbolizer = SF.createTextSymbolizer(fillBlack, new Font[]{font}, haloWhite, FF.property(LABEL), middleTopPlacement, null);
......
......@@ -151,7 +151,9 @@ public class SurveysMapUIHandler extends AbstractDaliUIHandler<SurveysMapUIModel
checkVisibleEnvelope(Maps.transformReferencedEnvelope(envelope, DefaultGeographicCRS.WGS84));
// for test
// getUI().getMapEnvelopeLabel().setText(envelope.toString());
// DataMapPane map = getUI().getMapPane();
// double scale = RendererUtilities.calculateOGCScale(envelope, map.getWidth(), map.getRenderer().getRendererHints());
// getUI().getMapEnvelopeLabel().setText(envelope.toString() + " | scale=" + scale);
}
});
......
......@@ -535,6 +535,8 @@ public abstract class AbstractDaliTableUIHandler<R extends AbstractDaliRowUIMode
protected void removePmfmColumns() {
removeColumns(getModel().getPmfmColumns());
// Reset pmfm columns in model to avoid duplication (Mantis #51850)
getModel().getPmfmColumns().clear();
}
/**
......
......@@ -10,7 +10,7 @@
<groupId>fr.ifremer.dali</groupId>
<artifactId>dali</artifactId>
<version>5.1.3</version>
<version>5.1.4</version>
<packaging>pom</packaging>
<name>DaLi</name>
<description>Data Litter database</description>
......@@ -137,7 +137,7 @@
<maven.compiler.debug>true</maven.compiler.debug>
<!-- Quadrige3 Core -->
<quadrige3-core.version>3.6.13</quadrige3-core.version>
<quadrige3-core.version>3.6.15</quadrige3-core.version>
<!-- Last Dali launcher version -->
<launcherVersion>2.1</launcherVersion>
......@@ -175,7 +175,7 @@
<junit.version>4.12</junit.version>
<!-- gitflow release plugin -->
<gitflowPluginVersion>1.12.0-EIS</gitflowPluginVersion>
<gitflowPluginVersion>1.14.0</gitflowPluginVersion>
<!-- 2.0.0 failed on Third Parties report -->
<licensePluginVersion>1.20</licensePluginVersion>
......
......@@ -31,6 +31,21 @@
</properties>
<body>
<release version="5.1.4" date="2020-05-04" description="Stable release">
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51602">
DaliStrategyDao: Change the way to delete pmfm strategies without hibernate
</action>
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51902">
Map: change symbolizer order for location with line geometry
</action>
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51850">
Table with pmfm columns is correctly reset after a save action
</action>
<action dev="ludovic.pecquot@e-is.pro" type="fix">
Upgrade quadrige3-core to version 3.6.15
</action>
</release>
<release version="5.1.3" date="2020-03-13" description="Stable release">
<action dev="ludovic.pecquot@e-is.pro" type="fix" issue="51493">
Upgrade quadrige3-core to version 3.6.13
......