November 2011 - Coser-commits - mailman.cloud.codelutin.com

r909 - trunk
by maven-release＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: maven-release Date: 2011-11-28 23:23:19 +0100 (Mon, 28 Nov 2011) New Revision: 909 Url: http://forge.codelutin.com/repositories/revision/coser/909 Log: Update mavenpom4redmine to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 13:40:44 UTC (rev 908) +++ trunk/pom.xml 2011-11-28 22:23:19 UTC (rev 909) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r908 - in trunk: coser-business coser-ui
by echatellier＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: echatellier Date: 2011-11-28 14:40:44 +0100 (Mon, 28 Nov 2011) New Revision: 908 Url: http://forge.codelutin.com/repositories/revision/coser/908 Log: Update jfreechart Modified: trunk/coser-business/pom.xml trunk/coser-ui/pom.xml Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-11-28 09:41:30 UTC (rev 907) +++ trunk/coser-business/pom.xml 2011-11-28 13:40:44 UTC (rev 908) @@ -86,11 +86,11 @@ <artifactId>javassist</artifactId> </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jcommon</artifactId> </dependency> <dependency> Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-11-28 09:41:30 UTC (rev 907) +++ trunk/coser-ui/pom.xml 2011-11-28 13:40:44 UTC (rev 908) @@ -101,7 +101,7 @@ <artifactId>jxlayer</artifactId> </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> <dependency>

1 0

r907 - trunk
by echatellier＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: echatellier Date: 2011-11-28 10:41:30 +0100 (Mon, 28 Nov 2011) New Revision: 907 Url: http://forge.codelutin.com/repositories/revision/coser/907 Log: Update nuiton-matrix (with relocated jfreechart). Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-28 09:06:59 UTC (rev 906) +++ trunk/pom.xml 2011-11-28 09:41:30 UTC (rev 907) @@ -130,14 +130,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2</version> + <version>2.2.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2</version> + <version>2.2.1</version> <scope>compile</scope> </dependency> @@ -184,16 +184,16 @@ </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jfreechart</artifactId> - <version>1.0.13</version> + <version>1.0.14</version> <scope>compile</scope> </dependency> <dependency> - <groupId>jfree</groupId> + <groupId>org.jfree</groupId> <artifactId>jcommon</artifactId> - <version>1.0.16</version> + <version>1.0.17</version> <scope>compile</scope> </dependency>

1 0

r906 - trunk/coser-business/src/test/java/fr/ifremer/coser/services
by echatellier＠users.forge.codelutin.com Nov. 28, 2011

Nov. 28, 2011

Author: echatellier Date: 2011-11-28 10:06:59 +0100 (Mon, 28 Nov 2011) New Revision: 906 Url: http://forge.codelutin.com/repositories/revision/coser/906 Log: Fix test (zones added by olivier) Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-11-25 16:49:31 UTC (rev 905) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-11-28 09:06:59 UTC (rev 906) @@ -100,7 +100,7 @@ @Test public void testGetZones() throws CoserBusinessException { DataStorage zones = webService.getZonesMap(); - Assert.assertEquals(21, zones.size()); + Assert.assertEquals(22, zones.size()); } /**

1 0

r905 - in trunk/coser-business/src/main/java/fr/ifremer/coser: control services
by echatellier＠users.forge.codelutin.com Nov. 25, 2011

Nov. 25, 2011

Author: echatellier Date: 2011-11-25 17:49:31 +0100 (Fri, 25 Nov 2011) New Revision: 905 Url: http://forge.codelutin.com/repositories/revision/coser/905 Log: Improve duplicated line grouping algorithm (10 times faster now) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlError.java trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlError.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlError.java 2011-11-25 13:47:23 UTC (rev 904) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/control/ControlError.java 2011-11-25 16:49:31 UTC (rev 905) @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import java.util.Set; import fr.ifremer.coser.CoserConstants.Category; import fr.ifremer.coser.CoserConstants.ValidationLevel; @@ -73,7 +72,7 @@ protected List<String> lineNumbers; public ControlError() { - // set TreeSet, must be sorted for swing ui to change order in model + // set ArrayList, must be sorted for swing ui to change order in model lineNumbers = new ArrayList<String>(); } Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-11-25 13:47:23 UTC (rev 904) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ControlService.java 2011-11-25 16:49:31 UTC (rev 905) @@ -375,8 +375,14 @@ validationErrors.add(error); uniqueDataErrors.put(uniqueDataKey, error); } - // add current line to error + // add current line to error (after : important) error.addLineNumber(lineNumber); + + // small hack to slow down control by initializing cache + // because ui will take a lot of time to do it + // and user will wait to must time + // real dummy call, but do not remove it + dataToCheck.indexOf(lineNumber); // init cache } else { uniqueDataKeys.put(uniqueDataKey, lineNumber);

1 0

r904 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control
by echatellier＠users.forge.codelutin.com Nov. 25, 2011

Nov. 25, 2011

Author: echatellier Date: 2011-11-25 14:47:23 +0100 (Fri, 25 Nov 2011) New Revision: 904 Url: http://forge.codelutin.com/repositories/revision/coser/904 Log: Improve duplicated line grouping algorithm (10 times faster now) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2011-11-25 13:45:07 UTC (rev 903) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2011-11-25 13:47:23 UTC (rev 904) @@ -93,7 +93,7 @@ public int getColumnCount() { return header.length; } - + @Override public String getColumnName(int column) { String name = header[column]; @@ -109,9 +109,7 @@ */ @Override public Object getValueAt(int rowIndex, int columnIndex) { - Object result = getDataAt(rowIndex)[columnIndex]; - return result; } @@ -127,8 +125,7 @@ } /** - * Retourne l'index dans la liste des données du numero de ligne - * demandé. + * Retourne l'index dans la liste des données du numero de ligne demandée. * * @param lineNumber le numero de données * @return l'index Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java 2011-11-25 13:45:07 UTC (rev 903) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java 2011-11-25 13:47:23 UTC (rev 904) @@ -25,6 +25,8 @@ import java.util.EventListener; import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -85,36 +87,59 @@ /** * Compute line indices. + * + * This algorithm has been optimized three times. + * Be carefull of performances when modify it, can take looooong times + * without optimisation. */ protected void computeLineIndices() { long timeBefore = System.currentTimeMillis(); int dataCount = getRowCount(); - Category category = getCategory(); + // we need to have a smaller list for performance reason + // next loop is while into another while + List<ControlError> localControlErrors = getCurrentModelErrors(); + // build indexed array linesIndex = new int[dataCount]; int i = 0; int j = 0; Set<Integer> alreadyDone = new HashSet<Integer>(); + + // look for first error line to manage in main loop + Iterator<ControlError> itControlErrors = localControlErrors.iterator(); + int nextErrorFirstLine = -1; + ControlError controlError = null; + if (itControlErrors.hasNext()) { + controlError = itControlErrors.next(); + // can return -1 here, after control cannot contains deleted lines + nextErrorFirstLine = dataTableModel.getRealIndexOfLine(controlError.getLineNumbers().get(0)); + } + + // main loop while (i<dataCount) { while (alreadyDone.contains(j)) { j++; } linesIndex[i++] = j; - for (ControlError controlError : controlErrors) { - if (CollectionUtils.size(controlError.getLineNumbers()) >= 2 && category.equals(controlError.getCategory())) { - // can return -1 here, after control can contains deleted lines - int errorFirstLine = dataTableModel.getRealIndexOfLine(controlError.getLineNumbers().get(0)); - if (j == errorFirstLine) { - for (int errorIndex = 1; errorIndex < controlError.getLineNumbers().size(); ++errorIndex) { - // can return -1 here, after control can contains deleted lines - int delegateIndex = dataTableModel.getRealIndexOfLine(controlError.getLineNumbers().get(errorIndex)); - linesIndex[i++] = delegateIndex; - alreadyDone.add(delegateIndex); - } - } + if (j == nextErrorFirstLine) { + for (int errorIndex = 1; errorIndex < controlError.getLineNumbers().size(); ++errorIndex) { + // can return -1 here, after control cannot contains deleted lines + int delegateIndex = dataTableModel.getRealIndexOfLine(controlError.getLineNumbers().get(errorIndex)); + linesIndex[i++] = delegateIndex; + alreadyDone.add(delegateIndex); } + + // remove it, useless for next iteration + itControlErrors.remove(); + + // look for next error line to manage in main loop + if (itControlErrors.hasNext()) { + controlError = itControlErrors.next(); + // can return -1 here, after control cannot contains deleted lines + nextErrorFirstLine = dataTableModel.getRealIndexOfLine(controlError.getLineNumbers().get(0)); + } // no else j == nextErrorFirstLine will become false } j++; } @@ -131,6 +156,24 @@ } } + /** + * Parse input control errors list, an build a new list with only errors + * that will be used by this model. + * + * @return new error list for model only + */ + protected List<ControlError> getCurrentModelErrors() { + Category category = getCategory(); + // linked list because no access with index + List<ControlError> resultControlErrors = new LinkedList<ControlError>(); + for (ControlError controlError : controlErrors) { + if (CollectionUtils.size(controlError.getLineNumbers()) >= 2 && category.equals(controlError.getCategory())) { + resultControlErrors.add(controlError); + } + } + return resultControlErrors; + } + /* * @see javax.swing.table.TableModel#getRowCount() */ Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2011-11-25 13:45:07 UTC (rev 903) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalControlErrorModel.java 2011-11-25 13:47:23 UTC (rev 904) @@ -53,9 +53,6 @@ */ public class GlobalControlErrorModel extends AbstractTreeTableModel { - /** serialVersionUID. */ - private static final long serialVersionUID = -32286733264427664L; - protected List<ControlError> controlErrors; protected List<Object> controlErrorCategory; protected Map<Object, List<ControlErrorGroup>> controlCategoryChild;

1 0

r903 - trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection
by echatellier＠users.forge.codelutin.com Nov. 25, 2011

Nov. 25, 2011

Author: echatellier Date: 2011-11-25 14:45:07 +0100 (Fri, 25 Nov 2011) New Revision: 903 Url: http://forge.codelutin.com/repositories/revision/coser/903 Log: Fix strange ui bug (render white on white) Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SamplingEffortRenderer.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SamplingEffortRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SamplingEffortRenderer.java 2011-11-22 15:01:43 UTC (rev 902) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SamplingEffortRenderer.java 2011-11-25 13:45:07 UTC (rev 903) @@ -72,7 +72,11 @@ comp.setBackground(Color.RED); } else { - comp.setBackground(null); + if (isSelected) { + comp.setBackground(table.getSelectionBackground()); + } else { + comp.setBackground(table.getBackground()); + } } } else {

1 0

r902 - trunk/coser-business/src/test/resources
by oberthel＠users.forge.codelutin.com Nov. 22, 2011

Nov. 22, 2011

Author: oberthel Date: 2011-11-22 16:01:43 +0100 (Tue, 22 Nov 2011) New Revision: 902 Url: http://forge.codelutin.com/repositories/revision/coser/902 Log: Ajout?\195?\169 nouvelle entr?\195?\169e pour Flamanville (Jui/Septembre) Modified: trunk/coser-business/src/test/resources/webzones.csv Modified: trunk/coser-business/src/test/resources/webzones.csv =================================================================== --- trunk/coser-business/src/test/resources/webzones.csv 2011-11-17 16:29:22 UTC (rev 901) +++ trunk/coser-business/src/test/resources/webzones.csv 2011-11-22 15:01:43 UTC (rev 902) @@ -10,6 +10,7 @@ "noursom";"mancheorientale";"Manche orientale";"Baie de Somme";"1994 >";"Noursom";;"C_Noursom.png" "noursein";"mancheorientale";"Manche orientale";"Baie de Seine";"1995 - 2010";"Noursein";"Série arrêtée en 2010";"C_Noursein.png" "crustaflam";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"1986 >";"Crustaflam";;"C_Crustaflam.png" +"crustaflam2";"mancheoccidentale";"Manche occidentale";"Abords du cap de Flamanville";"Sept. – 1986 >";"Crustaflam";"Série du mois de septembre";"C_Crustaflam.png" "gdgmc";"atlantique";"Atlantique";"Golfe de Gascogne + mer Celtique";"1997 >";"Evhoe";"Ensemble de la couverture Evhoe";"C_GdG-MC.png" "mcech";"atlantique";"Atlantique";"Mer Celtique (strates d'échantillonnage)";"1997 >";"Evhoe";;"C_MC-Ech.png" "mcciem7";"atlantique";"Atlantique";"Mer Celtique (zone VII du CIEM)";"1997 >";"Evhoe";"La limite sud de la zone VII du CIEM (48 °N) constitue aussi une limite de régions de la DCSMM";"C_MC-Ciem-7.png"

1 0

r901 - in trunk: . coser-ui/src/main/java/fr/ifremer/coser/ui/control coser-ui/src/main/resources/icons
by echatellier＠users.forge.codelutin.com Nov. 17, 2011

Nov. 17, 2011

Author: echatellier Date: 2011-11-17 17:29:22 +0100 (Thu, 17 Nov 2011) New Revision: 901 Url: http://forge.codelutin.com/repositories/revision/coser/901 Log: Fix icons bug Added: trunk/coser-ui/src/main/resources/icons/warning.png Removed: trunk/coser-ui/src/main/resources/icons/error.png Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx trunk/pom.xml Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2011-11-17 14:22:37 UTC (rev 900) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx 2011-11-17 16:29:22 UTC (rev 901) @@ -191,7 +191,7 @@ <fr.ifremer.coser.ui.util.CoserProgressBar id="checkProgressBar" stringPainted="true" /> </cell> <cell anchor="center" fill="both"> - <JLabel id="localControlUsedLabel" icon="error.png" background='{new Color(255, 255, 173)}' + <JLabel id="localControlUsedLabel" icon="warning.png" background='{new Color(255, 255, 173)}' border='{BorderFactory.createLineBorder(new Color(226, 226, 81))}' opaque="true" text="coser.ui.control.warninguselocalcontrols" visible="false" /> </cell> Deleted: trunk/coser-ui/src/main/resources/icons/error.png =================================================================== (Binary files differ) Copied: trunk/coser-ui/src/main/resources/icons/warning.png (from rev 900, trunk/coser-ui/src/main/resources/icons/error.png) =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-17 14:22:37 UTC (rev 900) +++ trunk/pom.xml 2011-11-17 16:29:22 UTC (rev 901) @@ -214,7 +214,7 @@ <dependency> <groupId>com.bbn</groupId> <artifactId>openmap</artifactId> - <version>5.0.0-20111028</version> + <version>5.0.0-20111117</version> <scope>compile</scope> </dependency>

1 0

r900 - in trunk/coser-ui/src/main/java/fr/ifremer/coser/ui: control maps option
by echatellier＠users.forge.codelutin.com Nov. 17, 2011

Nov. 17, 2011

Author: echatellier Date: 2011-11-17 15:22:37 +0100 (Thu, 17 Nov 2011) New Revision: 900 Url: http://forge.codelutin.com/repositories/revision/coser/900 Log: Fix headers Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlTableModel.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ConfigurationHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2011-11-17 14:22:11 UTC (rev 899) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDataTableModel.java 2011-11-17 14:22:37 UTC (rev 900) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010-2011 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java 2011-11-17 14:22:11 UTC (rev 899) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlDuplicatedLineTableModel.java 2011-11-17 14:22:37 UTC (rev 900) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser 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/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlTableModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlTableModel.java 2011-11-17 14:22:11 UTC (rev 899) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlTableModel.java 2011-11-17 14:22:37 UTC (rev 900) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser 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/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2011-11-17 14:22:11 UTC (rev 899) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationHandler.java 2011-11-17 14:22:37 UTC (rev 900) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser 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/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java 2011-11-17 14:22:11 UTC (rev 899) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/maps/HaulLocationLayer.java 2011-11-17 14:22:37 UTC (rev 900) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser 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/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ConfigurationHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ConfigurationHandler.java 2011-11-17 14:22:11 UTC (rev 899) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/option/ConfigurationHandler.java 2011-11-17 14:22:37 UTC (rev 900) @@ -1,25 +1,23 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% * Copyright (C) 2011 Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser 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/lgpl-3.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */

1 0