Isis-fish-commits
Threads by month
- ----- 2026 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- 3175 discussions
Author: echatellier
Date: 2017-03-17 17:43:07 +0100 (Fri, 17 Mar 2017)
New Revision: 4412
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4412
Log:
[maven-release-plugin] prepare for next development iteration
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2017-03-17 16:43:05 UTC (rev 4411)
+++ trunk/pom.xml 2017-03-17 16:43:07 UTC (rev 4412)
@@ -11,7 +11,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>isis-fish</artifactId>
- <version>4.4.1.0-rc-1</version>
+ <version>4.4.1.0-SNAPSHOT</version>
<!-- POM Relationships : Inheritance : Dependencies -->
<dependencies>
@@ -827,9 +827,9 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
<scm>
- <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.1.0-rc-1</connection>
- <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.1.0-rc-1</developerConnection>
- <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.1.0-rc-1</url>
+ <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection>
+ <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection>
+ <url>https://svn.codelutin.com/isis-fish/trunk</url>
</scm>
<repositories>
1
0
Author: echatellier
Date: 2017-03-17 17:43:05 +0100 (Fri, 17 Mar 2017)
New Revision: 4411
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4411
Log:
[maven-release-plugin] copy for tag isis-fish-4.4.1.0-rc-1
Added:
tags/isis-fish-4.4.1.0-rc-1/
1
0
Author: echatellier
Date: 2017-03-17 17:42:26 +0100 (Fri, 17 Mar 2017)
New Revision: 4410
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4410
Log:
[maven-release-plugin] prepare release isis-fish-4.4.1.0-rc-1
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2017-03-17 16:09:55 UTC (rev 4409)
+++ trunk/pom.xml 2017-03-17 16:42:26 UTC (rev 4410)
@@ -11,7 +11,7 @@
<groupId>fr.ifremer</groupId>
<artifactId>isis-fish</artifactId>
- <version>4.4.1.0-SNAPSHOT</version>
+ <version>4.4.1.0-rc-1</version>
<!-- POM Relationships : Inheritance : Dependencies -->
<dependencies>
@@ -827,9 +827,9 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
<scm>
- <connection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</connection>
- <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/trunk</developerConnection>
- <url>https://svn.codelutin.com/isis-fish/trunk</url>
+ <connection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.1.0-rc-1</connection>
+ <developerConnection>scm:svn:https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.1.0-rc-1</developerConnection>
+ <url>https://svn.codelutin.com/isis-fish/tags/isis-fish-4.4.1.0-rc-1</url>
</scm>
<repositories>
1
0
r4409 - in trunk/src: main/java/fr/ifremer/isisfish/map main/java/fr/ifremer/isisfish/ui/input/spatial test/java/fr/ifremer/isisfish/logging
by echatellier＠users.forge.codelutin.com March 17, 2017
by echatellier＠users.forge.codelutin.com March 17, 2017
March 17, 2017
Author: echatellier
Date: 2017-03-17 17:09:55 +0100 (Fri, 17 Mar 2017)
New Revision: 4409
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4409
Log:
Fix headers
Modified:
trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java
trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java
trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java
trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java
trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java
trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java
trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-17 14:33:31 UTC (rev 4408)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-17 16:09:55 UTC (rev 4409)
@@ -1,5 +1,27 @@
package fr.ifremer.isisfish.map;
+/*
+ * #%L
+ * ISIS-Fish
+ * %%
+ * Copyright (C) 1999 - 2017 Ifremer, Codelutin
+ * %%
+ * 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.ifremer.isisfish.IsisFishDAOHelper;
import fr.ifremer.isisfish.IsisFishRuntimeException;
import fr.ifremer.isisfish.entities.Cell;
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java 2017-03-17 14:33:31 UTC (rev 4408)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java 2017-03-17 16:09:55 UTC (rev 4409)
@@ -8,13 +8,13 @@
* 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 createNewCells copy of the GNU General Public
+ *
+ * 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%
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-17 14:33:31 UTC (rev 4408)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-17 16:09:55 UTC (rev 4409)
@@ -16,7 +16,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received createNewCells copy of the GNU General Public
+ * 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%
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java 2017-03-17 14:33:31 UTC (rev 4408)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java 2017-03-17 16:09:55 UTC (rev 4409)
@@ -8,12 +8,12 @@
* 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>.
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-17 14:33:31 UTC (rev 4408)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-17 16:09:55 UTC (rev 4409)
@@ -8,12 +8,12 @@
* 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>.
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java 2017-03-17 14:33:31 UTC (rev 4408)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/SpatialChangeDataProvider.java 2017-03-17 16:09:55 UTC (rev 4409)
@@ -8,12 +8,12 @@
* 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>.
Modified: trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java 2017-03-17 14:33:31 UTC (rev 4408)
+++ trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java 2017-03-17 16:09:55 UTC (rev 4409)
@@ -1,5 +1,27 @@
package fr.ifremer.isisfish.logging;
+/*
+ * #%L
+ * ISIS-Fish
+ * %%
+ * Copyright (C) 2017 Ifremer, Codelutin
+ * %%
+ * 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.ifremer.isisfish.AbstractIsisFishTest;
import fr.ifremer.isisfish.IsisFishDAOHelper;
import fr.ifremer.isisfish.datastore.RegionStorage;
1
0
r4408 - trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial
by echatellier＠users.forge.codelutin.com March 17, 2017
by echatellier＠users.forge.codelutin.com March 17, 2017
March 17, 2017
Author: echatellier
Date: 2017-03-17 15:33:31 +0100 (Fri, 17 Mar 2017)
New Revision: 4408
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4408
Log:
fixes #8734: Affichage des mailles s?\195?\169lectionn?\195?\169es
Modified:
trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java
trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java
trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewUI.jaxx
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java 2017-03-17 14:32:17 UTC (rev 4407)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/AskNewSpatialHandler.java 2017-03-17 14:33:31 UTC (rev 4408)
@@ -27,13 +27,16 @@
import fr.ifremer.isisfish.entities.Port;
import fr.ifremer.isisfish.entities.Zone;
import fr.ifremer.isisfish.util.CellPointcomparator;
+import org.nuiton.topia.persistence.TopiaId;
import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* Handler for new fishery region resolution dialog.
@@ -98,6 +101,7 @@
// n'existe pas on la cree
Cell cell = new CellImpl();
+ cell.setTopiaId(TopiaId.create(Cell.class));
cell.setName("La" + lati + "Lo" + longi);
cell.setLatitude(lati);
cell.setLongitude(longi);
@@ -135,7 +139,7 @@
Rectangle2D.Float intersect = new Rectangle2D.Float();
for (Zone zone : zones) {
- List<Cell> zoneNewCells = new ArrayList<>();
+ Set<Cell> zoneNewCells = new HashSet<>();
for (Cell newCell : newCells) {
Rectangle2D.Float newCellRect = new Rectangle2D.Float(newCell.getLatitude(), newCell.getLongitude(),
newFisheryRegion.getCellLengthLatitude(), newFisheryRegion.getCellLengthLongitude());
@@ -148,7 +152,7 @@
}
}
}
- zonesAndNewCells.put(zone, zoneNewCells);
+ zonesAndNewCells.put(zone, new ArrayList<>(zoneNewCells));
}
return zonesAndNewCells;
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-17 14:32:17 UTC (rev 4407)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-17 14:33:31 UTC (rev 4408)
@@ -21,8 +21,6 @@
*/
package fr.ifremer.isisfish.ui.input.spatial;
-import static org.nuiton.i18n.I18n.t;
-
import com.bbn.openmap.event.SelectMouseMode;
import fr.ifremer.isisfish.IsisFishDAOHelper;
import fr.ifremer.isisfish.entities.Cell;
@@ -37,12 +35,16 @@
import fr.ifremer.isisfish.ui.input.InputUI;
import fr.ifremer.isisfish.ui.models.common.GenericComboModel;
import jaxx.runtime.JAXXUtil;
+import org.apache.commons.lang3.StringUtils;
import javax.swing.JOptionPane;
import java.awt.event.MouseEvent;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import static org.nuiton.i18n.I18n.t;
+
/**
* Handler fro preview spatial change UI.
*/
@@ -108,8 +110,9 @@
new OpenMapEvents(inputUI.newZoneMap, new SelectMouseMode(false), CellSelectionLayer.MULT_SELECTION) {
@Override
public boolean mouseClicked(MouseEvent e) {
- Zone selectedValue = (Zone)inputUI.currentZones.getSelectedItem();
+ Zone selectedValue = (Zone) inputUI.currentZones.getSelectedItem();
zoneMap.put(selectedValue, inputUI.newZoneMap.getSelectedCells());
+ updateZoneCellDetails();
return false;
}
};
@@ -116,11 +119,12 @@
new OpenMapEvents(inputUI.newPortMap, new SelectMouseMode(false), CellSelectionLayer.SINGLE_SELECTION) {
@Override
public boolean mouseClicked(MouseEvent e) {
- Port selectedValue = (Port)inputUI.currentPorts.getSelectedItem();
+ Port selectedValue = (Port) inputUI.currentPorts.getSelectedItem();
List<Cell> selectedCells = inputUI.newPortMap.getSelectedCells();
if (!selectedCells.isEmpty()) {
portMap.put(selectedValue, selectedCells.get(0));
}
+ updatePortCellDetails();
return false;
}
};
@@ -151,19 +155,55 @@
List<Cell> newCells = zoneMap.get(selectedValue);
inputUI.newZoneMap.setSelectedCells(newCells);
+ updateZoneCellDetails();
}
+ protected void updateZoneCellDetails() {
+ Zone selectedValue = (Zone) inputUI.currentZones.getSelectedItem();
+ if (selectedValue != null) {
+ List<Cell> currentCells = selectedValue.getCell();
+ inputUI.currentZoneCells.setText(cellToString(currentCells));
+
+ List<Cell> newCells = zoneMap.get(selectedValue);
+ inputUI.newZoneCells.setText(cellToString(newCells));
+ }
+ }
+
+ protected String cellToString(List<Cell> cells) {
+ List<String> strings = new ArrayList<>();
+ for (Cell cell : cells) {
+ strings.add(cell.getName());
+ }
+ return StringUtils.join(strings, ", ");
+ }
+
/**
* Action when a port is selected in combo.
*/
public void currentPortChanged() {
- Port selectedValue = (Port)inputUI.currentPorts.getSelectedItem();
+ Port selectedValue = (Port) inputUI.currentPorts.getSelectedItem();
inputUI.currentPortMap.setSelectedCells(selectedValue.getCell());
Cell newPort = portMap.get(selectedValue);
inputUI.newPortMap.setSelectedCells(newPort);
+ updatePortCellDetails();
}
+ protected void updatePortCellDetails() {
+ Port selectedValue = (Port) inputUI.currentPorts.getSelectedItem();
+ if (selectedValue != null) {
+ Cell cell = selectedValue.getCell();
+ if (cell != null) {
+ inputUI.currentPortCell.setText(cell.getName());
+ }
+
+ Cell newPort = portMap.get(selectedValue);
+ if (newPort != null) {
+ inputUI.newPortCell.setText(newPort.getName());
+ }
+ }
+ }
+
/**
* Ask fro user to perform database change and commit.
*/
@@ -217,11 +257,11 @@
// update current zones
for (Map.Entry<Zone, List<Cell>> zoneListEntry : zoneMap.entrySet()) {
- Zone zone = zoneListEntry.getKey();
- List<Cell> newCell = zoneListEntry.getValue();
+ Zone zone = zoneListEntry.getKey();
+ List<Cell> newCell = zoneListEntry.getValue();
- zone.clearCell();
- zone.addAllCell(newCell);
+ zone.clearCell();
+ zone.addAllCell(newCell);
}
// update current ports
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewUI.jaxx 2017-03-17 14:32:17 UTC (rev 4407)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewUI.jaxx 2017-03-17 14:33:31 UTC (rev 4408)
@@ -42,7 +42,9 @@
javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}"
decorator='boxed' constraints='BorderLayout.CENTER'/>
- <JLabel id="currentZoneCells" constraints='BorderLayout.SOUTH' text="" />
+ <JScrollPane constraints='BorderLayout.SOUTH'>
+ <JTextArea id="currentZoneCells" editable="false" rows="3" />
+ </JScrollPane>
</JPanel>
<JPanel layout='{new BorderLayout()}'>
<fr.ifremer.isisfish.map.IsisMapBean id='newZoneMap'
@@ -49,7 +51,9 @@
javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}"
decorator='boxed' constraints='BorderLayout.CENTER'/>
- <JLabel id="newZoneCells" constraints='BorderLayout.SOUTH' text="" />
+ <JScrollPane constraints='BorderLayout.SOUTH'>
+ <JTextArea id="newZoneCells" editable="false" rows="3" />
+ </JScrollPane>
</JPanel>
</JSplitPane>
</JPanel>
@@ -67,7 +71,9 @@
javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}"
decorator='boxed' constraints='BorderLayout.CENTER'/>
- <JLabel id="currentPortCell" constraints='BorderLayout.SOUTH' text="" />
+ <JScrollPane constraints='BorderLayout.SOUTH'>
+ <JTextArea id="currentPortCell" editable="false" />
+ </JScrollPane>
</JPanel>
<JPanel layout='{new BorderLayout()}'>
<fr.ifremer.isisfish.map.IsisMapBean id='newPortMap'
@@ -74,7 +80,9 @@
javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}"
decorator='boxed' constraints='BorderLayout.CENTER'/>
- <JLabel id="newPortCell" constraints='BorderLayout.SOUTH' text="" />
+ <JScrollPane constraints='BorderLayout.SOUTH'>
+ <JTextArea id="newPortCell" editable="false" />
+ </JScrollPane>
</JPanel>
</JSplitPane>
</JPanel>
1
0
Author: echatellier
Date: 2017-03-17 15:32:17 +0100 (Fri, 17 Mar 2017)
New Revision: 4407
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4407
Log:
Utilisation des releases des libs
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2017-03-17 09:57:57 UTC (rev 4406)
+++ trunk/pom.xml 2017-03-17 14:32:17 UTC (rev 4407)
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.nuiton.matrix</groupId>
<artifactId>nuiton-matrix</artifactId>
- <version>2.5.2-SNAPSHOT</version>
+ <version>2.5.2</version>
<scope>compile</scope>
</dependency>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.nuiton.matrix</groupId>
<artifactId>nuiton-matrix-gui</artifactId>
- <version>2.5.2-SNAPSHOT</version>
+ <version>2.5.2</version>
<scope>compile</scope>
</dependency>
@@ -185,7 +185,7 @@
<dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-j2r</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.2</version>
<scope>compile</scope>
</dependency>
@@ -561,7 +561,7 @@
<!-- Dependencies version -->
<jaxxVersion>2.41</jaxxVersion>
- <topiaVersion>2.12-SNAPSHOT</topiaVersion>
+ <topiaVersion>2.12</topiaVersion>
<hibernateVersion>5.1.5.Final</hibernateVersion>
<nuitonI18nVersion>3.6.3</nuitonI18nVersion>
@@ -577,7 +577,7 @@
<jarPluginVersion>3.0.2</jarPluginVersion>
<surefirePluginVersion>2.19.1</surefirePluginVersion>
<sitePluginVersion>3.6</sitePluginVersion>
- <jrstPluginVersion>2.3-SNAPSHOT</jrstPluginVersion>
+ <jrstPluginVersion>2.2</jrstPluginVersion>
<maven.javadoc.skip>false</maven.javadoc.skip>
<animalSnifferPluginVersion>1.15</animalSnifferPluginVersion>
<sonarPluginVersion>3.2</sonarPluginVersion>
1
0
r4406 - in trunk: . src/main/java/fr/ifremer/isisfish/actions src/main/java/fr/ifremer/isisfish/datastore src/main/java/fr/ifremer/isisfish/logging/console src/main/java/fr/ifremer/isisfish/mexico src/main/java/fr/ifremer/isisfish/mexico/export src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/simulator/sensitivity src/main/java/fr/ifremer/isisfish/ui/logging src/main/java/fr/ifremer/isisfish/ui/sensitivity src/main/java/fr/ifremer/isisfish/util src/m
by echatellier＠users.forge.codelutin.com March 17, 2017
by echatellier＠users.forge.codelutin.com March 17, 2017
March 17, 2017
Author: echatellier
Date: 2017-03-17 10:57:57 +0100 (Fri, 17 Mar 2017)
New Revision: 4406
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4406
Log:
Mise ?\195?\160 jour des libs
Retrait des deprecated (commons-io)
Modified:
trunk/pom.xml
trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java
trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java
trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java
trunk/src/main/java/fr/ifremer/isisfish/actions/ValidateSimulationAction.java
trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java
trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java
trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java
trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java
trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java
trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java
trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java
trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java
trunk/src/main/java/fr/ifremer/isisfish/ui/logging/LoggingFrame.java
trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassHandler.java
trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java
trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java
trunk/src/main/resources/i18n/isis-fish_fr_FR.properties
trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java
trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java
trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java
trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java
trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java
trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java
trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java
trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/pom.xml 2017-03-17 09:57:57 UTC (rev 4406)
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-widgets</artifactId>
- <version>${nuitonWidgetsVersion}</version>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
@@ -229,7 +229,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.24</version>
+ <version>1.7.25</version>
<scope>runtime</scope>
</dependency>
@@ -561,11 +561,9 @@
<!-- Dependencies version -->
<jaxxVersion>2.41</jaxxVersion>
- <eugeneVersion>2.14</eugeneVersion>
<topiaVersion>2.12-SNAPSHOT</topiaVersion>
- <hibernateVersion>5.1.4.Final</hibernateVersion>
+ <hibernateVersion>5.1.5.Final</hibernateVersion>
<nuitonI18nVersion>3.6.3</nuitonI18nVersion>
- <nuitonWidgetsVersion>1.1.1</nuitonWidgetsVersion>
<redmine.releaseFiles>target/isis-fish-${project.version}-bin.zip</redmine.releaseFiles>
<skipPostRelease>false</skipPostRelease>
@@ -615,7 +613,7 @@
<plugin>
<groupId>org.nuiton.eugene</groupId>
<artifactId>eugene-maven-plugin</artifactId>
- <version>${eugeneVersion}</version>
+ <version>2.14</version>
</plugin>
<plugin>
Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -28,6 +28,7 @@
import static org.nuiton.i18n.I18n.t;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -202,7 +203,7 @@
throw new IllegalArgumentException(t("could not found %s", name));
}
String content = storage.getContent();
- FileUtils.writeStringToFile(file, content);
+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
}
@Step(IsisConfig.STEP_AFTER_INIT_VCS)
@@ -215,7 +216,7 @@
throw new IllegalArgumentException(t("could not found %s", name));
}
String content = storage.getContent();
- FileUtils.writeStringToFile(file, content);
+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
}
@Step(IsisConfig.STEP_AFTER_INIT_VCS)
@@ -228,7 +229,7 @@
throw new IllegalArgumentException(t("could not found %s", name));
}
String content = storage.getContent();
- FileUtils.writeStringToFile(file, content);
+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
}
@Step(IsisConfig.STEP_AFTER_INIT_VCS)
@@ -241,7 +242,7 @@
throw new IllegalArgumentException(t("could not found %s", name));
}
String content = storage.getContent();
- FileUtils.writeStringToFile(file, content);
+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
}
@Step(IsisConfig.STEP_AFTER_INIT_VCS)
@@ -254,7 +255,7 @@
throw new IllegalArgumentException(t("could not found %s", name));
}
String content = storage.getContent();
- FileUtils.writeStringToFile(file, content);
+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
}
@Step(IsisConfig.STEP_AFTER_INIT_VCS)
@@ -267,7 +268,7 @@
throw new IllegalArgumentException(t("could not found %s", name));
}
String content = storage.getContent();
- FileUtils.writeStringToFile(file, content);
+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
}
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -28,6 +28,7 @@
import static org.nuiton.i18n.I18n.t;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
@@ -64,7 +65,7 @@
if(!force && storage.exists()) {
throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile()));
}
- String content = FileUtils.readFileToString(file);
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
storage.setContent(content);
}
@@ -74,7 +75,7 @@
if(!force && storage.exists()) {
throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile()));
}
- String content = FileUtils.readFileToString(file);
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
storage.setContent(content);
}
@@ -84,7 +85,7 @@
if(!force && storage.exists()) {
throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile()));
}
- String content = FileUtils.readFileToString(file);
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
storage.setContent(content);
}
@@ -94,7 +95,7 @@
if(!force && storage.exists()) {
throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile()));
}
- String content = FileUtils.readFileToString(file);
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
storage.setContent(content);
}
@@ -104,7 +105,7 @@
if(!force && storage.exists()) {
throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile()));
}
- String content = FileUtils.readFileToString(file);
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
storage.setContent(content);
}
@@ -117,7 +118,7 @@
if(!force && storage.exists()) {
throw new IllegalArgumentException(t("destination already exists %s use \'force\' argument to force overwrite", storage.getFile()));
}
- String content = FileUtils.readFileToString(file);
+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
storage.setContent(content);
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -29,6 +29,7 @@
import java.io.File;
import java.io.FileInputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Properties;
import org.apache.commons.io.FileUtils;
@@ -140,7 +141,7 @@
//simulation.getStorage().closeContext();
String generatedPrescriptContent = null;
if (simulationPrescript != null && simulationPrescript.canRead()) {
- generatedPrescriptContent = FileUtils.readFileToString(simulationPrescript);
+ generatedPrescriptContent = FileUtils.readFileToString(simulationPrescript, StandardCharsets.UTF_8);
}
SimulationControl control = new SimulationControl(name);
@@ -220,7 +221,7 @@
//simulation.getStorage().closeContext();
String generatedPrescriptContent = null;
if (simulationPrescript != null && simulationPrescript.canRead()) {
- generatedPrescriptContent = FileUtils.readFileToString(simulationPrescript);
+ generatedPrescriptContent = FileUtils.readFileToString(simulationPrescript, StandardCharsets.UTF_8);
}
SimulationControl control = new SimulationControl(name);
Modified: trunk/src/main/java/fr/ifremer/isisfish/actions/ValidateSimulationAction.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/actions/ValidateSimulationAction.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/actions/ValidateSimulationAction.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -41,6 +41,7 @@
import org.nuiton.math.matrix.MatrixND;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -125,7 +126,7 @@
//simulation.getStorage().closeContext();
String generatedPrescriptContent = null;
if (simulationPrescript != null && simulationPrescript.canRead()) {
- generatedPrescriptContent = FileUtils.readFileToString(simulationPrescript);
+ generatedPrescriptContent = FileUtils.readFileToString(simulationPrescript, StandardCharsets.UTF_8);
}
SimulationControl control = new SimulationControl(name);
Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -27,6 +27,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
@@ -194,7 +195,7 @@
content = "";
} else {
try {
- content = FileUtils.readFileToString(getFile());
+ content = FileUtils.readFileToString(getFile(), StandardCharsets.UTF_8);
lastContentUpdate = System.nanoTime();
lastContentLength = getFile().length();
} catch (IOException eee) {
Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -44,6 +44,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -106,7 +107,7 @@
public String getCommentForNextCommit() throws IOException {
commentForNextCommitFile.createNewFile();
String result;
- result = FileUtils.readFileToString(commentForNextCommitFile);
+ result = FileUtils.readFileToString(commentForNextCommitFile, StandardCharsets.UTF_8);
return result;
}
@@ -116,7 +117,7 @@
*/
public void setCommentForNextCommit(String commentForNextCommit) throws IOException {
commentForNextCommitFile.createNewFile();
- FileUtils.writeStringToFile(commentForNextCommitFile, commentForNextCommit);
+ FileUtils.writeStringToFile(commentForNextCommitFile, commentForNextCommit, StandardCharsets.UTF_8);
}
/**
@@ -124,7 +125,7 @@
* must be used in user application after commit
*/
public void clearCommentForNextCommit() {
- String date = DateFormatUtils.ISO_DATETIME_FORMAT.format(new Date());
+ String date = DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT.format(new Date());
File dest = new File(commentForNextCommitFile, date);
commentForNextCommitFile.renameTo(dest);
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -31,6 +31,7 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -223,7 +224,7 @@
if (objective == null) {
File ObjFile = getObjectiveFile();
if (file.exists()) {
- String s = FileUtils.readFileToString(ObjFile);
+ String s = FileUtils.readFileToString(ObjFile, StandardCharsets.UTF_8);
objective = Double.parseDouble(s);
}
}
@@ -232,7 +233,7 @@
public void setObjective(double d) throws IOException {
objective = d;
- FileUtils.writeStringToFile(getObjectiveFile(), String.valueOf(d));
+ FileUtils.writeStringToFile(getObjectiveFile(), String.valueOf(d), StandardCharsets.UTF_8);
}
/**
Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -39,6 +39,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.Properties;
import java.util.zip.ZipEntry;
@@ -170,7 +171,7 @@
ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream);
BufferedWriter zipWriter = new BufferedWriter(new OutputStreamWriter(zipOutputStream));
zipOutputStream.putNextEntry(new ZipEntry(zipFile.getName()));
- String content = FileUtils.readFileToString(zipFile);
+ String content = FileUtils.readFileToString(zipFile, StandardCharsets.UTF_8);
zipWriter.write(content);
zipWriter.flush();
Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -30,6 +30,7 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -118,7 +119,7 @@
public static void writeDesignPlanToFile(File file, DesignPlan designPlan) {
String content = getDesignPlanAsXML(designPlan);
try {
- FileUtils.writeStringToFile(file, content);
+ FileUtils.writeStringToFile(file, content, StandardCharsets.UTF_8);
} catch (IOException ex) {
throw new IsisFishRuntimeException("Can't export factors to xml file", ex);
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -27,6 +27,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.RandomStringUtils;
@@ -150,7 +151,7 @@
String xml = MexicoHelper.formatXML(stringBuffer.toString());
try {
- FileUtils.writeStringToFile(outputFile, xml);
+ FileUtils.writeStringToFile(outputFile, xml, StandardCharsets.UTF_8);
} catch (IOException ex) {
if (log.isErrorEnabled()) {
log.error("Can't wrtie xml content to output file", ex);
Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -34,6 +34,7 @@
import java.io.InputStream;
import java.io.StringWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.rmi.RemoteException;
import java.util.HashMap;
import java.util.List;
@@ -395,7 +396,7 @@
if (md5ControlFile != null) {
control.setText(t("isisfish.simulation.remote.message.downloadresults"));
- String md5sum = FileUtils.readFileToString(md5ControlFile);
+ String md5sum = FileUtils.readFileToString(md5ControlFile, StandardCharsets.UTF_8);
if (log.isDebugEnabled()) {
log.debug("MD5 Control file have been downloaded : " + md5ControlFile.getAbsolutePath());
@@ -616,7 +617,7 @@
try {
// use usefull readLines from commons-io
- List<String> contents = FileUtils.readLines(publicKey);
+ List<String> contents = FileUtils.readLines(publicKey, StandardCharsets.UTF_8);
// only one line
if (contents != null && contents.size() == 1) {
Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -29,6 +29,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -375,7 +376,7 @@
String simulResult = "";
try {
- simulResult = FileUtils.readFileToString(importFile);
+ simulResult = FileUtils.readFileToString(importFile, StandardCharsets.UTF_8);
} catch (IOException ioe) {
log.error("An error occured trying to read a result file : ", ioe);
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/logging/LoggingFrame.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/logging/LoggingFrame.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/logging/LoggingFrame.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -27,6 +27,7 @@
import java.awt.Frame;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import javax.swing.JFrame;
import javax.swing.JMenu;
@@ -82,7 +83,7 @@
SimulationStorage storage = SimulationStorage.getSimulation(simulationName);
File logFile = new File(storage.getSimulationLogFile());
- String content = FileUtils.readFileToString(logFile);
+ String content = FileUtils.readFileToString(logFile, StandardCharsets.UTF_8);
editor.setText(content);
}
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassHandler.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassHandler.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassHandler.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -25,6 +25,7 @@
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.SortedMap;
@@ -123,7 +124,7 @@
for(File file : files) {
content += "Fichier " + file.getName() + "\n";
content += "------------------------------\n";
- content += FileUtils.readFileToString(file) + "\n";
+ content += FileUtils.readFileToString(file, StandardCharsets.UTF_8) + "\n";
content += "\n";
}
sensitivitySecondPassUI.textAreaSensitivitySecondpassResult.setText(content);
Modified: trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -31,6 +31,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -84,7 +85,7 @@
// on verifie dans le fichier
if (fileCheckSum.exists()) {
try {
- result = FileUtils.readFileToString(fileCheckSum);
+ result = FileUtils.readFileToString(fileCheckSum, StandardCharsets.UTF_8);
} catch (IOException eee) {
log.info("Can't read old checkSum: " + fileCheckSum, eee);
}
@@ -107,7 +108,7 @@
// on est pas dans une simulation
// on ecrit dans le fichier
try {
- FileUtils.writeStringToFile(fileCheckSum, hashcode);
+ FileUtils.writeStringToFile(fileCheckSum, hashcode, StandardCharsets.UTF_8);
} catch (IOException eee) {
log.info("Can't write checkSum: " + fileCheckSum, eee);
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/java/fr/ifremer/isisfish/util/RUtil.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -29,6 +29,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import org.apache.commons.io.IOUtils;
@@ -66,7 +67,7 @@
// R trouvé, mais la commande R a échoué
InputStream err = process.getErrorStream();
if (log.isErrorEnabled()) {
- log.error("Can't call Rscript : " + IOUtils.toString(err));
+ log.error("Can't call Rscript : " + IOUtils.toString(err, StandardCharsets.UTF_8));
}
}
} catch (IOException ex) {
@@ -88,7 +89,7 @@
* @throws IOException
*/
protected static void parseRscriptOutput(InputStream is) throws IOException {
- List<String> output = IOUtils.readLines(is);
+ List<String> output = IOUtils.readLines(is, StandardCharsets.UTF_8);
// 1 lignes = commande OK, mais rJava n'est pas installé
// 2 lignes = commande OK et rJava est installé
Modified: trunk/src/main/resources/i18n/isis-fish_fr_FR.properties
===================================================================
--- trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/main/resources/i18n/isis-fish_fr_FR.properties 2017-03-17 09:57:57 UTC (rev 4406)
@@ -1,3 +1,4 @@
+%s\ has\ a\ discrete\ domain,\ this\ is\ not\ acceptable\ for\ this\ method.=
%s\ has\ a\ non\ uniform\ distribution,\ this\ is\ not\ acceptable\ for\ this\ method.=
Add\ to\ default\ queue=
Analyse\ plan\ error,\ too\ many\ simulation\ for\ %s\ \:\ %s=
Modified: trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -152,7 +152,7 @@
* @return freemarker {@link Configuration}
*/
protected static Configuration getFreemarkerConfiguration() {
- Configuration freemarkerConfiguration = new Configuration();
+ Configuration freemarkerConfiguration = new Configuration(Configuration.VERSION_2_3_25);
// needed to overwrite "Defaults to default system encoding."
// fix encoding issue on some systems
@@ -162,7 +162,7 @@
ClassTemplateLoader templateLoader = new ClassTemplateLoader(AbstractIsisFishTest.class, "/");
freemarkerConfiguration.setTemplateLoader(templateLoader);
- freemarkerConfiguration.setObjectWrapper(new BeansWrapper());
+ freemarkerConfiguration.setObjectWrapper(new BeansWrapper(Configuration.VERSION_2_3_25));
return freemarkerConfiguration;
}
Modified: trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -27,6 +27,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
import org.junit.Assert;
@@ -55,7 +56,7 @@
File batFile = new File("src" + File.separator + "main" + File.separator + "assembly" + File.separator + "isisfish.bat");
batFile = batFile.getAbsoluteFile(); // for maven
- String content = FileUtils.readFileToString(batFile);
+ String content = FileUtils.readFileToString(batFile, StandardCharsets.UTF_8);
System.out.println(content);
String[] lines = content.split("\n");
Modified: trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -27,6 +27,7 @@
import java.io.StringWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -84,7 +85,7 @@
//System.out.println("Content: '" + script.getContent() + "'");
Assert.assertEquals(content1, script.getContent());
- FileUtils.writeStringToFile(script.getFile(), content2);
+ FileUtils.writeStringToFile(script.getFile(), content2, StandardCharsets.UTF_8);
//System.out.println("Content: '" + script.getContent() + "'");
Assert.assertEquals(content2, script.getContent());
} finally {
Modified: trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -24,10 +24,9 @@
* Test que les evenements sur les entités existantes sont bien logués.
*
* @throws IOException si le fichier ne peux pas être lu
- * @throws StorageException
*/
@Test
- public void testLoggingOnExistingEntities() throws IOException, StorageException {
+ public void testLoggingOnExistingEntities() throws IOException {
RegionStorage regionStorage = RegionStorage.getRegion("BaseMotosICA");
TopiaContext storage = regionStorage.getStorage();
TopiaContext topiaContext = storage.beginTransaction();
@@ -58,7 +57,7 @@
*/
@Test
public void testLoggingOnNewEntities() throws IOException, StorageException {
- RegionStorage regionStorage = RegionStorage.getRegion("BaseMotosICA");
+ RegionStorage regionStorage = RegionStorage.create("test");
TopiaContext storage = regionStorage.getStorage();
TopiaContext topiaContext = storage.beginTransaction();
RegionChangeLogger regionChangeLogger = new RegionChangeLogger(regionStorage, topiaContext);
Modified: trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -26,6 +26,7 @@
package fr.ifremer.isisfish.logging;
import java.io.File;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -116,7 +117,7 @@
File logFile = new File(loggerFile);
- String logFileContent = FileUtils.readFileToString(logFile);
+ String logFileContent = FileUtils.readFileToString(logFile, StandardCharsets.UTF_8);
log.info("++ File content ----------------------------------------------------------");
for (Object o : logFileContent.split("\n")) {
@@ -207,7 +208,7 @@
File logFile = new File(loggerFile);
- String logFileContent = FileUtils.readFileToString(logFile);
+ String logFileContent = FileUtils.readFileToString(logFile, StandardCharsets.UTF_8);
log.info("++ File content ----------------------------------------------------------");
for (Object o : logFileContent.split("\n")) {
Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -29,6 +29,7 @@
import java.io.IOException;
import java.io.StringReader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -489,7 +490,7 @@
String content = MexicoHelper.getDesignPlanAsXML(testDesignPlan);
File tempFile = File.createTempFile("testdesignplan", ".xml");
tempFile.deleteOnExit();
- FileUtils.writeStringToFile(tempFile, content);
+ FileUtils.writeStringToFile(tempFile, content, StandardCharsets.UTF_8);
// test to read it and get content
DesignPlan plan = MexicoHelper.getDesignPlanFromXML(tempFile, null);
@@ -528,7 +529,7 @@
File tempFile = File.createTempFile("testdesignplan", ".xml");
tempFile.deleteOnExit();
- FileUtils.writeStringToFile(tempFile, content);
+ FileUtils.writeStringToFile(tempFile, content, StandardCharsets.UTF_8);
// test to read it and get content
DesignPlan plan = MexicoHelper.getDesignPlanFromXML(tempFile, null);
Modified: trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -27,6 +27,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
@@ -79,7 +80,7 @@
// explore region (export as xml)
RegionExplorer explorer = new RegionExplorer();
explorer.explore(fisheryRegion, xmlFactorExport);
- String xmlExport = FileUtils.readFileToString(file);
+ String xmlExport = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
if (log.isDebugEnabled()) {
log.debug("Export xml is : \n" + xmlExport);
@@ -123,7 +124,7 @@
// explore region (export as xml)
RegionExplorer explorer = new RegionExplorer();
explorer.explore(fisheryRegion, xmlFactorExport);
- String xmlExport = FileUtils.readFileToString(file);
+ String xmlExport = FileUtils.readFileToString(file, StandardCharsets.UTF_8);
// test that all sensitivity properties appear in xml content
// entity part and property part must appear in factors names
Modified: trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -29,6 +29,7 @@
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -109,7 +110,7 @@
File f = File.createTempFile("testCompile", ".java", getTestDirectory());
String filename = FileUtil.basename(f, ".java");
String code = getFirstClassContent(filename);
- FileUtils.writeStringToFile(f, code);
+ FileUtils.writeStringToFile(f, code, StandardCharsets.UTF_8);
List<File> classpath = new ArrayList<>();
classpath.add(f.getParentFile());
@@ -143,12 +144,12 @@
File fA = File.createTempFile("testCompileA", ".java", getTestDirectory());
String filenameA = FileUtil.basename(fA, ".java");
String codeA = getFirstClassContent(filenameA);
- FileUtils.writeStringToFile(fA, codeA);
+ FileUtils.writeStringToFile(fA, codeA, StandardCharsets.UTF_8);
File fB = File.createTempFile("testCompileB", ".java", getTestDirectory());
String filenameB = FileUtil.basename(fB, ".java");
String codeB = getSecondClassContent(filenameB, filenameA);
- FileUtils.writeStringToFile(fB, codeB);
+ FileUtils.writeStringToFile(fB, codeB, StandardCharsets.UTF_8);
File dest = new File(fB.getParentFile(), "testCompile");
Modified: trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2017-03-17 09:15:03 UTC (rev 4405)
+++ trunk/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2017-03-17 09:57:57 UTC (rev 4406)
@@ -51,6 +51,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -128,7 +129,7 @@
new File(template, "scripts").mkdirs();
FileUtils.writeStringToFile(new File(template, "scripts" + File.separator
- + "version.txt"), FILECONTENTTAG);
+ + "version.txt"), FILECONTENTTAG, StandardCharsets.UTF_8);
// creation du repo pour les tests
SVNRepositoryFactory.createLocalRepository(remoteRepo, false, true);
@@ -298,12 +299,12 @@
File version = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
Assert.assertTrue(version.exists());
- Assert.assertEquals(FILECONTENTTAG, FileUtils.readFileToString(version));
+ Assert.assertEquals(FILECONTENTTAG, FileUtils.readFileToString(version, StandardCharsets.UTF_8));
// modification du fichier version.txt
- FileUtils.writeStringToFile(version, FILECONTENTTRUNK);
+ FileUtils.writeStringToFile(version, FILECONTENTTRUNK, StandardCharsets.UTF_8);
vcs.commit(null, "modif du fichier version");
- Assert.assertEquals(FILECONTENTTRUNK, FileUtils.readFileToString(version));
+ Assert.assertEquals(FILECONTENTTRUNK, FileUtils.readFileToString(version, StandardCharsets.UTF_8));
// recuperation de DemoRegion
File demo = new File(vcs.getLocalRepository(), "regions"
@@ -318,13 +319,13 @@
// ajout d'un fichier sur le trunk avant passage sur le tag
File fileToAdd = new File(vcs.getLocalRepository(), "newfile.txt");
String lecontent = "Le nouveau fichier";
- FileUtils.writeStringToFile(fileToAdd, lecontent);
+ FileUtils.writeStringToFile(fileToAdd, lecontent, StandardCharsets.UTF_8);
vcs.add(Arrays.asList(fileToAdd), "ajout d'un fichier");
// test switchTag
vcs.setTag(Versions.valueOf("3.1.0"));
Assert.assertTrue(vcs.getTag().startsWith("/tags/3.1.0"));
- Assert.assertEquals(FILECONTENTTAG, FileUtils.readFileToString(version));
+ Assert.assertEquals(FILECONTENTTAG, FileUtils.readFileToString(version, StandardCharsets.UTF_8));
Assert.assertTrue(demo.exists());
// recherche du status des fichiers
@@ -341,7 +342,7 @@
Assert.assertTrue(map.containsKey(newfileAdded));
// modif dans repo trunk de version pour qu'il y ait un conflit
- FileUtils.writeStringToFile(fileVersion, "Le nouveau content de version");
+ FileUtils.writeStringToFile(fileVersion, "Le nouveau content de version", StandardCharsets.UTF_8);
// update global du repo trunk
List<File> conflictFile = trunk.update(null, true);
@@ -352,7 +353,7 @@
Assert.assertTrue(conflictFile.contains(fileVersion));
File fileAdded = new File(trunk.getLocalRepository(), "newfile.txt");
- Assert.assertEquals(lecontent, FileUtils.readFileToString(fileAdded));
+ Assert.assertEquals(lecontent, FileUtils.readFileToString(fileAdded, StandardCharsets.UTF_8));
Assert.assertFalse(fileDeleted.exists());
// recherche du status des fichiers en remote, il ne doit plus y avoir de diff
@@ -397,7 +398,7 @@
// now, make a modification, on LOCAL repo
File firstFile = new File(vcs.getLocalRepository() + File.separator
+ "scripts" + File.separator + "version.txt");
- FileUtils.writeStringToFile(firstFile, "Version 3.2.1");
+ FileUtils.writeStringToFile(firstFile, "Version 3.2.1", StandardCharsets.UTF_8);
List<File> files = Collections.singletonList(firstFile);
@@ -462,8 +463,8 @@
vcs.checkout(null, true);
// now, make a modification, on LOCAL repo
- FileUtils.writeStringToFile(firstFile, "version 3.2.1");
- FileUtils.writeStringToFile(secondFile, "name = test1");
+ FileUtils.writeStringToFile(firstFile, "version 3.2.1", StandardCharsets.UTF_8);
+ FileUtils.writeStringToFile(secondFile, "name = test1", StandardCharsets.UTF_8);
SVNClientManager svnManager = SVNClientManager.newInstance();
svnManager.getWCClient().doAdd(secondFile, // File path
true, // boolean force
@@ -504,7 +505,7 @@
vcs.checkout(null, true);
// now, make a modification, on LOCAL repo
- FileUtils.writeStringToFile(firstFile, "Version 3.2.1");
+ FileUtils.writeStringToFile(firstFile, "Version 3.2.1", StandardCharsets.UTF_8);
String result = vcs.getDiff(firstFile);
@@ -860,7 +861,7 @@
// modif on local repo
File file = new File(vcs.getLocalRepository() + File.separator
+ "test.txt");
- FileUtils.writeStringToFile(file, "name = test1");
+ FileUtils.writeStringToFile(file, "name = test1", StandardCharsets.UTF_8);
SVNClientManager svnManager = SVNClientManager.newInstance();
svnManager.getWCClient().doAdd(file, // File path
true, // boolean force
@@ -934,7 +935,7 @@
// modif on local repo
File file = new File(vcs.getLocalRepository() + File.separator
+ "test.txt");
- FileUtils.writeStringToFile(file, "name = test1");
+ FileUtils.writeStringToFile(file, "name = test1", StandardCharsets.UTF_8);
SVNClientManager svnManager = SVNClientManager.newInstance();
svnManager.getWCClient().doAdd(file, // File path
true, // boolean force
@@ -1009,7 +1010,7 @@
// modif on remote repo
File file = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
- FileUtils.writeStringToFile(file, "aaaaaz");
+ FileUtils.writeStringToFile(file, "aaaaaz", StandardCharsets.UTF_8);
SVNClientManager svnManager = SVNClientManager.newInstance();
SVNCommitInfo rev = svnManager.getCommitClient().doCommit(
new File[] { file },// File[] paths,
@@ -1079,7 +1080,7 @@
// modif on remote repo
File file = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
- FileUtils.writeStringToFile(file, "aaaaaz");
+ FileUtils.writeStringToFile(file, "aaaaaz", StandardCharsets.UTF_8);
SVNClientManager svnManager = SVNClientManager.newInstance();
SVNCommitInfo rev = svnManager.getCommitClient().doCommit(
new File[] { file },// File[] paths,
@@ -1108,7 +1109,7 @@
// modify one file
File file2 = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
- FileUtils.writeStringToFile(file2, "oooooo");
+ FileUtils.writeStringToFile(file2, "oooooo", StandardCharsets.UTF_8);
// try to update...
List<File> filesInConflict = vcs.update(null, true);
@@ -1145,7 +1146,7 @@
// modif on remote repo on tag :)
File file = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
- FileUtils.writeStringToFile(file, "aaaaaz");
+ FileUtils.writeStringToFile(file, "aaaaaz", StandardCharsets.UTF_8);
SVNClientManager svnManager = SVNClientManager.newInstance();
SVNCommitInfo rev = svnManager.getCommitClient().doCommit(
new File[] { file },// File[] paths,
@@ -1166,7 +1167,7 @@
// modify one file
File file2 = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
- FileUtils.writeStringToFile(file2, "oooooo");
+ FileUtils.writeStringToFile(file2, "oooooo", StandardCharsets.UTF_8);
// try to update...
List<File> filesInConflict = vcs.setTag(Versions.valueOf("3.1.0"));
@@ -1203,7 +1204,7 @@
// modif on remote repo
File file = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
- FileUtils.writeStringToFile(file, "aaaaaz");
+ FileUtils.writeStringToFile(file, "aaaaaz", StandardCharsets.UTF_8);
SVNClientManager svnManager = SVNClientManager.newInstance();
SVNCommitInfo rev = svnManager.getCommitClient().doCommit(
new File[] { file },// File[] paths,
@@ -1232,7 +1233,7 @@
// modify one file
File file2 = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
- FileUtils.writeStringToFile(file2, "oooooo");
+ FileUtils.writeStringToFile(file2, "oooooo", StandardCharsets.UTF_8);
// try to update...
List<File> filesInConflict = vcs.checkFileStatus();
@@ -1272,7 +1273,7 @@
// modif on remote repo
File file = new File(vcs.getLocalRepository(), "scripts"
+ File.separator + "version.txt");
- FileUtils.writeStringToFile(file, "modified content");
+ FileUtils.writeStringToFile(file, "modified content", StandardCharsets.UTF_8);
Assert.assertEquals(Status.STATUS_MODIFIED, vcs.getLocalStatus(file));
}
1
0
r4405 - in trunk/src: main/java/fr/ifremer/isisfish/logging test/java/fr/ifremer/isisfish/logging
by echatellier＠users.forge.codelutin.com March 17, 2017
by echatellier＠users.forge.codelutin.com March 17, 2017
March 17, 2017
Author: echatellier
Date: 2017-03-17 10:15:03 +0100 (Fri, 17 Mar 2017)
New Revision: 4405
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4405
Log:
refs #8451: Log de toutes les modifications de la base
Added:
trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java
Modified:
trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java
Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-03-16 13:42:46 UTC (rev 4404)
+++ trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-03-17 09:15:03 UTC (rev 4405)
@@ -64,9 +64,13 @@
/** Context. */
protected TopiaContext context;
+ /** Output log file. */
+ protected File logFile;
+
public RegionChangeLogger(RegionStorage regionStorage, TopiaContext context) {
this.regionStorage = regionStorage;
this.context = context;
+ logFile = new File(regionStorage.getDirectory(), CHANGES_FILE_NAME);
}
@Override
@@ -94,7 +98,11 @@
String oldValueString = oldValue != null ? oldValue.toString() : "";
Object newValue = event.getState()[dirtyProperty];
String newValueString = newValue != null ? newValue.toString() : "";
- addLogLine("UPDATE", clazz, event.getEntity(), fieldName, oldValueString, newValueString);
+
+ // on ne log que s'il y a vraiment un changement
+ if (!StringUtils.equals(oldValueString, newValueString)) {
+ addLogLine("UPDATE", clazz, event.getEntity(), fieldName, oldValueString, newValueString);
+ }
}
}
}
@@ -110,12 +118,9 @@
protected void addLogLine(String changeType, Class<? extends TopiaEntity> clazz,
Object entity, String field, String oldValue, String newValue) {
- // on ne log que s'il y a vraiment un changement
- if (!StringUtils.equals(oldValue, newValue)) {
- String date = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss");
- String entityDisplayInfo = getEntityDisplayInfo(entity);
- addLine(date, changeType, clazz.getSimpleName().replace("Impl", ""), entityDisplayInfo, field, oldValue, newValue);
- }
+ String date = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss");
+ String entityDisplayInfo = getEntityDisplayInfo(entity);
+ addLine(date, changeType, clazz.getSimpleName().replace("Impl", ""), entityDisplayInfo, field, oldValue, newValue);
}
@@ -127,13 +132,12 @@
* @param data data to add
*/
protected void addLine(String... data) {
- File outFile = new File(regionStorage.getDirectory(), CHANGES_FILE_NAME);
- boolean fileExists = outFile.length() > 0;
+ boolean fileExists = logFile.length() > 0;
- try (CSVWriter out = new CSVWriter(new BufferedWriter(new FileWriter(outFile, true)), CSV_SEPARATOR)) {
+ try (CSVWriter out = new CSVWriter(new BufferedWriter(new FileWriter(logFile, true)), CSV_SEPARATOR)) {
// add header if necessary
if (!fileExists) {
- out.writeNext(new String[] {"date","class","entity","field","oldvalue","newvalue"});
+ out.writeNext(new String[] {"date","type","entity","name","field","oldvalue","newvalue"});
}
out.writeNext(data);
Added: trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java
===================================================================
--- trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java (rev 0)
+++ trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java 2017-03-17 09:15:03 UTC (rev 4405)
@@ -0,0 +1,88 @@
+package fr.ifremer.isisfish.logging;
+
+import fr.ifremer.isisfish.AbstractIsisFishTest;
+import fr.ifremer.isisfish.IsisFishDAOHelper;
+import fr.ifremer.isisfish.datastore.RegionStorage;
+import fr.ifremer.isisfish.datastore.StorageException;
+import fr.ifremer.isisfish.entities.Cell;
+import fr.ifremer.isisfish.entities.CellDAO;
+import fr.ifremer.isisfish.entities.CellImpl;
+import fr.ifremer.isisfish.entities.FisheryRegion;
+import fr.ifremer.isisfish.entities.FisheryRegionDAO;
+import org.apache.commons.io.FileUtils;
+import org.junit.Assert;
+import org.junit.Test;
+import org.nuiton.topia.TopiaContext;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+public class RegionChangeLoggerTest extends AbstractIsisFishTest {
+
+ /**
+ * Test que les evenements sur les entités existantes sont bien logués.
+ *
+ * @throws IOException si le fichier ne peux pas être lu
+ * @throws StorageException
+ */
+ @Test
+ public void testLoggingOnExistingEntities() throws IOException, StorageException {
+ RegionStorage regionStorage = RegionStorage.getRegion("BaseMotosICA");
+ TopiaContext storage = regionStorage.getStorage();
+ TopiaContext topiaContext = storage.beginTransaction();
+ RegionChangeLogger regionChangeLogger = new RegionChangeLogger(regionStorage, topiaContext);
+ topiaContext.addTopiaEntityListener(regionChangeLogger);
+
+ FisheryRegionDAO fisheryRegionDAO = IsisFishDAOHelper.getFisheryRegionDAO(topiaContext);
+ FisheryRegion baseMotosICA = fisheryRegionDAO.findByName("BaseMotosICA");
+ baseMotosICA.setCellLengthLongitude(0.25f);
+ baseMotosICA.setCellLengthLatitude(0.25f);
+ baseMotosICA.update();
+ topiaContext.commitTransaction();
+ regionStorage.closeStorage();
+
+ List<String> lines = FileUtils.readLines(regionChangeLogger.logFile, StandardCharsets.UTF_8);
+ Assert.assertEquals(3, lines.size());
+ Assert.assertTrue(lines.get(0).contains("\"date\";\"type\";\"entity\";\"name\";\"field\";\"oldvalue\";\"newvalue\""));
+ Assert.assertTrue(lines.get(1).contains("\"cellLengthLongitude\";\"0.5\";\"0.25\""));
+ Assert.assertTrue(lines.get(2).contains("\"cellLengthLatitude\";\"0.5\";\"0.25\""));
+ }
+
+ /**
+ * Test que les evenements sur les nouvelles entités sont bien logués (ca ne fonctionnait pas à la première
+ * implémentation pour les nouvelles entités).
+ *
+ * @throws IOException si le fichier ne peux pas être lu
+ * @throws StorageException
+ */
+ @Test
+ public void testLoggingOnNewEntities() throws IOException, StorageException {
+ RegionStorage regionStorage = RegionStorage.getRegion("BaseMotosICA");
+ TopiaContext storage = regionStorage.getStorage();
+ TopiaContext topiaContext = storage.beginTransaction();
+ RegionChangeLogger regionChangeLogger = new RegionChangeLogger(regionStorage, topiaContext);
+ topiaContext.addTopiaEntityListener(regionChangeLogger);
+ CellDAO cellDAO = IsisFishDAOHelper.getCellDAO(topiaContext);
+
+ Cell cell = new CellImpl();
+ cell.setName("test");
+ cellDAO.create(cell);
+
+ Cell cell2 = cellDAO.create("name", "test 2");
+ cell2.setName("test 2 (bis)");
+ cellDAO.update(cell2);
+ topiaContext.commitTransaction();
+
+ cellDAO.delete(cell);
+ cellDAO.delete(cell2);
+ topiaContext.commitTransaction();
+ regionStorage.closeStorage();
+
+ List<String> lines = FileUtils.readLines(regionChangeLogger.logFile, StandardCharsets.UTF_8);
+ Assert.assertEquals(6, lines.size());
+ Assert.assertTrue(lines.get(0).contains("\"date\";\"type\";\"entity\";\"name\";\"field\";\"oldvalue\";\"newvalue\""));
+ Assert.assertTrue(lines.get(1).contains("\"CREATE\";\"Cell\";\"test\""));
+ Assert.assertTrue(lines.get(5).contains("\"DELETE\";\"Cell\";\"test 2 (bis)\""));
+ }
+}
Property changes on: trunk/src/test/java/fr/ifremer/isisfish/logging/RegionChangeLoggerTest.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision HeadURL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
1
0
r4404 - trunk/src/main/java/fr/ifremer/isisfish/map
by echatellier＠users.forge.codelutin.com March 16, 2017
by echatellier＠users.forge.codelutin.com March 16, 2017
March 16, 2017
Author: echatellier
Date: 2017-03-16 14:42:46 +0100 (Thu, 16 Mar 2017)
New Revision: 4404
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4404
Log:
fixes #8734: Correction d'une erreur de compilation jaxx (ne comprend pas Java)
Added:
trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java
Modified:
trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java
trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java
trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java
trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 13:42:46 UTC (rev 4404)
@@ -111,8 +111,8 @@
}
private void fireEvent() {
- List<ProviderChangeListener> listeners = new ArrayList<>(providerChangeListeners);
- for (ProviderChangeListener listener : listeners) {
+ List<MapDataListener> listeners = new ArrayList<>(mapDataListeners);
+ for (MapDataListener listener : listeners) {
listener.regionChanged();
}
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 12:08:04 UTC (rev 4403)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 13:42:46 UTC (rev 4404)
@@ -31,7 +31,6 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import java.util.Properties;
@@ -68,7 +67,7 @@
/**
* IsisMapBean.
*/
-public class IsisMapBean extends OverlayMapPanel implements MapDataProvider.ProviderChangeListener {
+public class IsisMapBean extends OverlayMapPanel implements MapDataListener {
/** serialVersionUID. */
private static final long serialVersionUID = -4162103384132928473L;
Added: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java (rev 0)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java 2017-03-16 13:42:46 UTC (rev 4404)
@@ -0,0 +1,33 @@
+/*
+ * #%L
+ * ISIS-Fish
+ * %%
+ * Copyright (C) 2017 Ifremer, Codelutin
+ * %%
+ * 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 createNewCells copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+package fr.ifremer.isisfish.map;
+
+/**
+ * Listener to listen for change in data related to map.
+ */
+public interface MapDataListener {
+
+ /**
+ * Region or cell changed.
+ */
+ void regionChanged();
+}
Property changes on: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataListener.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision HeadURL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 13:42:46 UTC (rev 4404)
@@ -24,7 +24,6 @@
import fr.ifremer.isisfish.entities.Cell;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -31,7 +30,7 @@
public abstract class MapDataProvider {
- protected Set<ProviderChangeListener> providerChangeListeners = new HashSet<>();
+ protected Set<MapDataListener> mapDataListeners = new HashSet<>();
public abstract float getMinLongitude();
@@ -51,15 +50,11 @@
public abstract List<Cell> getCell();
- void addProviderChangeListener(ProviderChangeListener listener) {
- providerChangeListeners.add(listener);
+ void addProviderChangeListener(MapDataListener listener) {
+ mapDataListeners.add(listener);
}
- void removeProviderChangeListener(ProviderChangeListener listener) {
- providerChangeListeners.remove(listener);
+ void removeProviderChangeListener(MapDataListener listener) {
+ mapDataListeners.remove(listener);
}
-
- interface ProviderChangeListener {
- void regionChanged();
- }
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 12:08:04 UTC (rev 4403)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 13:42:46 UTC (rev 4404)
@@ -48,7 +48,7 @@
* @author <a href="mailto:seb.regnier@free.fr"></a>
* @version $Revision$
*/
-public class ZoneDelimiterLayer extends Layer implements MapDataProvider.ProviderChangeListener { //ZoneDelimiterLayer
+public class ZoneDelimiterLayer extends Layer implements MapDataListener { //ZoneDelimiterLayer
/** serialVersionUID. */
private static final long serialVersionUID = 1127201121371123690L;
1
0
r4403 - in trunk/src/main/java/fr/ifremer/isisfish: map simulator/sensitivity ui/input ui/input/port ui/input/spatial util
by echatellier＠users.forge.codelutin.com March 16, 2017
by echatellier＠users.forge.codelutin.com March 16, 2017
March 16, 2017
Author: echatellier
Date: 2017-03-16 13:08:04 +0100 (Thu, 16 Mar 2017)
New Revision: 4403
Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4403
Log:
fixes #9085: Les shapes charg?\195?\169s dans l'onglet de d?\195?\169finition de la p?\195?\170cherie, n'apparaissents pas dans l'onglet zones
Modified:
trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java
trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java
trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java
trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java
trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java
trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java
trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java
trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java
trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -57,8 +57,7 @@
* Last update : $Date$
* By : $Author$
*/
-public class CellSelectionLayer extends ZoneDelimiterLayer implements
- MapMouseListener {
+public class CellSelectionLayer extends ZoneDelimiterLayer implements MapMouseListener {
/** serialVersionUID */
private static final long serialVersionUID = 6952137313443302883L;
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/DatabaseDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -7,15 +7,23 @@
import fr.ifremer.isisfish.entities.FisheryRegion;
import org.nuiton.topia.TopiaContext;
import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.event.TopiaTransactionEvent;
+import org.nuiton.topia.event.TopiaTransactionListener;
+import org.nuiton.topia.persistence.TopiaEntity;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
-public class DatabaseDataProvider extends MapDataProvider {
+public class DatabaseDataProvider extends MapDataProvider implements TopiaTransactionListener {
+ protected IsisMapBean isisMapBean;
protected FisheryRegion fisheryRegion;
- public DatabaseDataProvider(FisheryRegion fisheryRegion) {
+ public DatabaseDataProvider(IsisMapBean isisMapBean, FisheryRegion fisheryRegion) {
+ this.isisMapBean = isisMapBean;
this.fisheryRegion = fisheryRegion;
+ fisheryRegion.getTopiaContext().addTopiaTransactionListener(this);
}
@Override
@@ -76,4 +84,42 @@
protected CellDAO getCellDAO() throws TopiaException {
return IsisFishDAOHelper.getCellDAO(getTopiaContext());
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ DatabaseDataProvider that = (DatabaseDataProvider) o;
+ return Objects.equals(isisMapBean, that.isisMapBean) &&
+ Objects.equals(fisheryRegion, that.fisheryRegion);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(isisMapBean, fisheryRegion);
+ }
+
+ public void commit(TopiaTransactionEvent event) {
+ for (TopiaEntity e : event.getEntities()) {
+ if (event.isModification(e) && Cell.class.isAssignableFrom(e.getClass())
+ || FisheryRegion.class.isAssignableFrom(e.getClass())) {
+ // on rafraichi que si on commit au moins un Cell
+ fireEvent();
+ break;
+ }
+ }
+ }
+
+ private void fireEvent() {
+ List<ProviderChangeListener> listeners = new ArrayList<>(providerChangeListeners);
+ for (ProviderChangeListener listener : listeners) {
+ listener.regionChanged();
+ }
+ }
+
+
+ @Override
+ public void rollback(TopiaTransactionEvent event) {
+ // nothing to do
+ }
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -31,6 +31,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import java.util.Properties;
@@ -67,7 +68,7 @@
/**
* IsisMapBean.
*/
-public class IsisMapBean extends OverlayMapPanel {
+public class IsisMapBean extends OverlayMapPanel implements MapDataProvider.ProviderChangeListener {
/** serialVersionUID. */
private static final long serialVersionUID = -4162103384132928473L;
@@ -155,7 +156,7 @@
*/
@Deprecated
public void setFisheryRegion(FisheryRegion fisheryRegion) {
- setMapDataProvider(new DatabaseDataProvider(fisheryRegion));
+ setMapDataProvider(fisheryRegion != null ? new DatabaseDataProvider(this, fisheryRegion) : null);
}
public void setMapDataProvider(MapDataProvider mapDataProvider) {
@@ -168,15 +169,13 @@
this.mapDataProvider = mapDataProvider;
if (mapDataProvider == null) {
layerHandler.removeAll();
+ if (oldDataProvider != null) {
+ oldDataProvider.removeProviderChangeListener(this);
+ }
} else {
if (!mapDataProvider.equals(oldDataProvider)) {
- pasMailleLatitude = mapDataProvider.getCellLengthLatitude();
- pasMailleLongitude = mapDataProvider.getCellLengthLongitude();
- minLatitude = mapDataProvider.getMinLatitude();
- minLongitude = mapDataProvider.getMinLongitude();
- maxLatitude = mapDataProvider.getMaxLatitude();
- maxLongitude = mapDataProvider.getMaxLongitude();
- initMap();
+ mapDataProvider.addProviderChangeListener(this);
+ refreshMap();
}
}
} catch (Exception eee) {
@@ -186,6 +185,21 @@
}
}
+ @Override
+ public void regionChanged() {
+ refreshMap();
+ }
+
+ protected void refreshMap() {
+ pasMailleLatitude = mapDataProvider.getCellLengthLatitude();
+ pasMailleLongitude = mapDataProvider.getCellLengthLongitude();
+ minLatitude = mapDataProvider.getMinLatitude();
+ minLongitude = mapDataProvider.getMinLongitude();
+ maxLatitude = mapDataProvider.getMaxLatitude();
+ maxLongitude = mapDataProvider.getMaxLongitude();
+ initMap();
+ }
+
/**
* Retourne la liste des mailles selectionnées.
*
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/MapDataProvider.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -60,6 +60,6 @@
}
interface ProviderChangeListener {
- void cellsChanged(Collection<Cell> cells);
+ void regionChanged();
}
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -81,6 +81,11 @@
generateGraphics();
}
+ @Override
+ protected void finalize() {
+ mapDataProvider.removeProviderChangeListener(this);
+ }
+
/**
* Set the projection.
* @param proj Projection
@@ -168,26 +173,9 @@
}
@Override
- public void cellsChanged(Collection<Cell> cells) {
+ public void regionChanged() {
// on rafraichi que si on commit au moins un Cell
refresh();
}
- /*public void commit(TopiaTransactionEvent event) {
- for (TopiaEntity e : event.getEntities()) {
- if (event.isModification(e) && Cell.class.isAssignableFrom(e.getClass())) {
- // on rafraichi que si on commit au moins un Cell
- refresh();
- break;
- }
- }
- }*/
-
-
-
- /*@Override
- public void rollback(TopiaTransactionEvent event) {
- // nothing to do
- }*/
-
} // ZoneDelimiterLayer
Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -372,7 +372,6 @@
File importFile = new File(directoryPath, name + extension);
- System.out.println("result=" + importFile);
String simulResult = "";
try {
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2017-03-16 12:08:04 UTC (rev 4403)
@@ -99,6 +99,10 @@
public InputSaveVerifier getSaveVerifier() {
return getContextValue(InputSaveVerifier.class);
}
+/**
+ * @deprecated since 4.4.1. Pas pratique, on ne peux pas ecouter les changements de region ou de proprietes.
+ */
+@Deprecated
public FisheryRegion getFisheryRegion() {
return getContextValue(FisheryRegion.class);
}
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/port/PortHandler.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -73,7 +73,7 @@
inputContentUI.setButtonTitle(t("isisfish.input.continueSpecies"));
inputContentUI.setNextPath(n("isisfish.input.tree.species"));
-
+
inputContentUI.addPropertyChangeListener(PortUI.PROPERTY_BEAN, new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getNewValue() == null) {
Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/spatial/ChangeSpatialPreviewHandler.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -133,9 +133,9 @@
List<Zone> zones = oldFisheryRegion.getZone();
List<Port> ports = oldFisheryRegion.getPort();
inputUI.currentZones.setModel(new GenericComboModel<>(zones));
- inputUI.currentZoneMap.setMapDataProvider(new DatabaseDataProvider(oldFisheryRegion));
+ inputUI.currentZoneMap.setMapDataProvider(new DatabaseDataProvider(inputUI.currentZoneMap, oldFisheryRegion));
inputUI.currentPorts.setModel(new GenericComboModel<>(ports));
- inputUI.currentPortMap.setMapDataProvider(new DatabaseDataProvider(oldFisheryRegion));
+ inputUI.currentPortMap.setMapDataProvider(new DatabaseDataProvider(inputUI.currentPortMap, oldFisheryRegion));
SpatialChangeDataProvider spatialChangeDataProvider = new SpatialChangeDataProvider(newFisheryRegion, cells);
inputUI.newZoneMap.setMapDataProvider(spatialChangeDataProvider);
Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2017-03-16 10:47:47 UTC (rev 4402)
+++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2017-03-16 12:08:04 UTC (rev 4403)
@@ -349,7 +349,6 @@
} else {
stringTypes = new String[names.length];
Class<?>[] types = interfaceMethod.getParameterTypes();
- System.out.println(Arrays.toString(types));
for (int i = 0; i < types.length; i++) {
stringTypes[i] = types[i].getName();
}
1
0