Author: echatellier Date: 2017-02-22 14:32:34 +0100 (Wed, 22 Feb 2017) New Revision: 4393 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4393 Log: Fix build Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java trunk/src/main/java/fr/ifremer/isisfish/util/EntitySemanticsDecorator.java trunk/src/main/java/fr/ifremer/isisfish/util/MatrixCSVHelper.java Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java 2017-02-22 13:19:06 UTC (rev 4392) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/RegionExportJson.java 2017-02-22 13:32:34 UTC (rev 4393) @@ -1,5 +1,27 @@ package fr.ifremer.isisfish.entities; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2016 - 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 com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; @@ -9,6 +31,13 @@ import fr.ifremer.isisfish.types.TimeUnit; import fr.ifremer.isisfish.util.EntitySemanticsDecorator; import fr.ifremer.isisfish.util.MatrixCSVHelper; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.persistence.EntityVisitor; +import org.nuiton.topia.persistence.TopiaEntity; + import java.io.IOException; import java.io.Writer; import java.util.ArrayList; @@ -19,12 +48,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.topia.persistence.EntityVisitor; -import org.nuiton.topia.persistence.TopiaEntity; /** * Classe permettant d'exporter en Json une region @@ -40,12 +63,12 @@ * "rootId": id of root entity * }, * "#entities": { - * " <id>": {<entity field>}, + * " <id>": {<entity field>}, * ... * }, - * "FisheryRegion" : [<id>], - * "Cell": [<id>, ...], - * "Zone": [<id>, ...], + * "FisheryRegion" : [<id>], + * "Cell": [<id>, ...], + * "Zone": [<id>, ...], * ... * } * @@ -76,12 +99,12 @@ JsonFactory f = new JsonFactory(); g = f.createGenerator(w); - toVisit = new LinkedList<TopiaEntity>(); - visited = new HashSet<String>(); + toVisit = new LinkedList<>(); + visited = new HashSet<>(); matrixCSVHelper = new MatrixCSVHelper( decorator = new EntitySemanticsDecorator()); - isisEntities = new LinkedHashMap<String, List<String>>(); + isisEntities = new LinkedHashMap<>(); isisEntities.put("FisheryRegion", new ArrayList<String>()); isisEntities.put("Cell", new ArrayList<String>()); isisEntities.put("Zone", new ArrayList<String>()); Modified: trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java 2017-02-22 13:19:06 UTC (rev 4392) +++ trunk/src/main/java/fr/ifremer/isisfish/entities/RegionImportJson.java 2017-02-22 13:32:34 UTC (rev 4393) @@ -1,6 +1,28 @@ package fr.ifremer.isisfish.entities; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2016 - 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 com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -10,6 +32,22 @@ import fr.ifremer.isisfish.types.TimeUnit; import fr.ifremer.isisfish.util.EntitySemanticsDecorator; import fr.ifremer.isisfish.util.MatrixCSVHelper; +import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.lang3.ClassUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.EntityVisitor; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaId; + +import javax.swing.ButtonGroup; +import javax.swing.JComboBox; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButton; import java.awt.GridLayout; import java.io.IOException; import java.io.Reader; @@ -26,21 +64,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import javax.swing.ButtonGroup; -import javax.swing.JComboBox; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang3.ClassUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.persistence.EntityVisitor; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; /** * Classe permettant d'importer des données dans une region a partir d'un Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-02-22 13:19:06 UTC (rev 4392) +++ trunk/src/main/java/fr/ifremer/isisfish/logging/RegionChangeLogger.java 2017-02-22 13:32:34 UTC (rev 4393) @@ -11,12 +11,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>. @@ -24,16 +24,13 @@ */ package fr.ifremer.isisfish.logging; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.Date; - +import com.opencsv.CSVWriter; +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.datastore.RegionStorage; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.hibernate.SessionFactory; import org.hibernate.metadata.ClassMetadata; import org.nuiton.topia.TopiaContext; @@ -42,12 +39,13 @@ import org.nuiton.topia.framework.TopiaContextImpl; import org.nuiton.topia.persistence.TopiaEntity; -import com.opencsv.CSVWriter; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.Date; -import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.datastore.RegionStorage; -import org.apache.commons.lang3.StringUtils; - /** * Listener topia qui ecrit un fichier de log avec toutes les modifications de la base de données * dans un fichier changes.csv dans le répertoire de la région. Modified: trunk/src/main/java/fr/ifremer/isisfish/util/EntitySemanticsDecorator.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/EntitySemanticsDecorator.java 2017-02-22 13:19:06 UTC (rev 4392) +++ trunk/src/main/java/fr/ifremer/isisfish/util/EntitySemanticsDecorator.java 2017-02-22 13:32:34 UTC (rev 4393) @@ -1,11 +1,31 @@ package fr.ifremer.isisfish.util; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2016 - 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.IsisFishRuntimeException; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; -import java.util.Collection; -import java.util.Map; import org.apache.commons.collections4.BidiMap; import org.apache.commons.collections4.bidimap.DualHashBidiMap; import org.apache.commons.lang3.StringUtils; @@ -15,6 +35,9 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaEntity; +import java.util.Collection; +import java.util.Map; + /** * Convertie une entite, month, timestep en string et inversement. * Entity = "TopiaId:Entity.toString" Modified: trunk/src/main/java/fr/ifremer/isisfish/util/MatrixCSVHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/MatrixCSVHelper.java 2017-02-22 13:19:06 UTC (rev 4392) +++ trunk/src/main/java/fr/ifremer/isisfish/util/MatrixCSVHelper.java 2017-02-22 13:32:34 UTC (rev 4393) @@ -1,6 +1,35 @@ package fr.ifremer.isisfish.util; +/* + * #%L + * ISIS-Fish + * %% + * Copyright (C) 2016 - 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 org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; + import java.io.BufferedWriter; import java.io.IOException; import java.io.LineNumberReader; @@ -11,12 +40,6 @@ import java.io.Writer; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.math.matrix.MatrixFactory; -import org.nuiton.math.matrix.MatrixIterator; -import org.nuiton.math.matrix.MatrixND; /** * Classe permettant de convertir une matrice en String et inversement en