Index: /applications/editors/josm/plugins/opendata/.settings/org.eclipse.jdt.core.prefs =================================================================== --- /applications/editors/josm/plugins/opendata/.settings/org.eclipse.jdt.core.prefs (revision 34152) +++ /applications/editors/josm/plugins/opendata/.settings/org.eclipse.jdt.core.prefs (revision 34153) @@ -56,5 +56,5 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled Index: /applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTable.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTable.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTable.java (revision 34153) @@ -1,15 +1,15 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * + * * Copyright 2008 jOpenDocument, by ILM Informatique. All rights reserved. - * + * * The contents of this file are subject to the terms of the GNU - * General Public License Version 3 only ("GPL"). - * You may not use this file except in compliance with the License. + * General Public License Version 3 only ("GPL"). + * You may not use this file except in compliance with the License. * You can obtain a copy of the License at http://www.gnu.org/licenses/gpl-3.0.html * See the License for the specific language governing permissions and limitations under the License. - * + * * When distributing the software, include this License Header Notice in each file. - * + * */ @@ -20,5 +20,5 @@ /** - * + * */ public class TableTable { @@ -71,4 +71,5 @@ /** * Return all the rows (duplicated if repeated) + * @return all the rows (duplicated if repeated) */ public List getRows() { @@ -78,7 +79,7 @@ /** * Sets the value of the tablePrintRanges property. - * + * * @param value allowed object is {@link String } - * + * */ public void setTablePrintRanges(final String value) { Index: /applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableCell.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableCell.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableCell.java (revision 34153) @@ -1,15 +1,15 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * + * * Copyright 2008 jOpenDocument, by ILM Informatique. All rights reserved. - * + * * The contents of this file are subject to the terms of the GNU - * General Public License Version 3 only ("GPL"). - * You may not use this file except in compliance with the License. + * General Public License Version 3 only ("GPL"). + * You may not use this file except in compliance with the License. * You can obtain a copy of the License at http://www.gnu.org/licenses/gpl-3.0.html * See the License for the specific language governing permissions and limitations under the License. - * + * * When distributing the software, include this License Header Notice in each file. - * + * */ @@ -23,5 +23,5 @@ protected int tableNumberColumnsRepeated = 1; - + protected String tableStyleName; @@ -51,7 +51,7 @@ /** * Gets the value of the tableStyleName property. - * + * * @return possible object is {@link String } - * + * */ public String getStyleName() { @@ -61,10 +61,10 @@ /** * Gets the value of the tableNumberColumnsRepeated property. - * + * @return the value of the tableNumberColumnsRepeated property. */ public int getTableNumberColumnsRepeated() { return this.tableNumberColumnsRepeated; } - + public TextP getTextP() { return this.textP; @@ -73,7 +73,7 @@ /** * Sets the value of the tableNumberColumnsRepeated property. - * + * * @param value allowed object is {@link String } - * + * */ public void setTableNumberColumnsRepeated(final String value) { @@ -85,7 +85,7 @@ /** * Sets the value of the tableStyleName property. - * + * * @param value allowed object is {@link String } - * + * */ public void setTableStyleName(final String value) { Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java (revision 34153) @@ -619,5 +619,10 @@ } - /** Compare two doubles within a default epsilon */ + /** + * Compare two doubles within a default epsilon + * @param a first double + * @param b second double + * @return {@code true} if {@code a} and {@code b} are equals + */ public static boolean equals(Double a, Double b) { if (a == b) return true; Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java (revision 34153) @@ -187,4 +187,5 @@ * depends on should be missing. * + * @param parent parent component * @param modules the collection of all loaded modules * @param module the module for which preconditions are checked @@ -198,6 +199,5 @@ * Creates a class loader for loading module code. * - * @param modules the collection of modules which are going to be loaded with this - * class loader + * @param modules the collection of modules which are going to be loaded with this class loader * @return the class loader */ @@ -225,4 +225,5 @@ * the class loader moduleClassLoader. * + * @param parent parent component * @param module the module * @param moduleClassLoader the module class loader @@ -262,7 +263,7 @@ /** - * Loads the module in modules from locally available jar files into - * memory. - * + * Loads the module in modules from locally available jar files into memory. + * + * @param parent parent component * @param modules the list of modules * @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null. @@ -356,7 +357,7 @@ /** * Builds the set of modules to load. Deprecated and unmaintained modules are filtered - * out. This involves user interaction. This method displays alert and confirmation - * messages. - * + * out. This involves user interaction. This method displays alert and confirmation messages. + * + * @param parent parent component * @return the set of modules to load (as set of module names) */ @@ -417,4 +418,5 @@ * @param modules the collection of modules to update. Must not be null. * @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null. + * @return list of modules * @throws IllegalArgumentException thrown if modules is null */ @@ -499,4 +501,5 @@ * Ask the user for confirmation that a module shall be disabled. * + * @param parent parent component * @param reason the reason for disabling the module * @param name the module name Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java (revision 34153) @@ -223,4 +223,5 @@ * @param klass the module class * @return the instantiated and initialized module + * @throws ModuleException if the module cannot be loaded or initialized */ public Module load(Class klass) throws ModuleException { @@ -237,4 +238,5 @@ * @param classLoader the class loader to use * @return the loaded class + * @throws ModuleException if the class cannot be found */ @SuppressWarnings("unchecked") @@ -326,4 +328,5 @@ /** * Replies the name of the module + * @return the name of the module */ public String getName() { Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/NonRegFunctionalTests.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/NonRegFunctionalTests.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/NonRegFunctionalTests.java (revision 34153) @@ -23,8 +23,13 @@ import org.openstreetmap.josm.tools.CheckParameterUtil; +/** + * Superclass of non-reg functional tests. + */ public abstract class NonRegFunctionalTests { /** * Non-regression generic test. + * @param context context + * @param ds data set */ public static void testGeneric(String context, DataSet ds) { @@ -52,4 +57,5 @@ /** * Non-regression test for ticket #10214 + * @param ds data set */ public static void testTicket10214(DataSet ds) { @@ -70,4 +76,5 @@ * Lists all datasets files matching given extension. * @param ext file extension to search for + * @return all datasets files matching given extension * @returns List of all datasets files matching given extension * @throws IOException in case of I/O error Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReaderTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReaderTest.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReaderTest.java (revision 34153) @@ -7,9 +7,5 @@ import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; - -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLStreamException; import org.junit.Rule; @@ -32,8 +28,8 @@ /** * Non-regression test for ticket #11624 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket11624() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket11624() throws Exception { File file = new File(TestUtils.getRegressionDataFile(11624, "temp3.gml")); try (InputStream is = new FileInputStream(file)) { Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java (revision 34153) @@ -5,9 +5,5 @@ import static org.junit.Assert.assertTrue; -import java.io.IOException; import java.io.InputStream; - -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLStreamException; import org.junit.Rule; @@ -46,8 +42,8 @@ /** * Non-regression test for ticket #12694 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket12694() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket12694() throws Exception { try (InputStream is = TestUtils.getRegressionDataStream(12694, "Alvinรณpolis_314946.kml")) { NonRegFunctionalTests.testGeneric("#12694", KmlReader.parseDataSet(is, null)); @@ -57,8 +53,8 @@ /** * Non-regression test for ticket #10214 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket10214() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket10214() throws Exception { try (InputStream is = TestUtils.getRegressionDataStream(10214, "utf8_test.kml")) { NonRegFunctionalTests.testTicket10214(KmlReader.parseDataSet(is, null)); @@ -68,8 +64,8 @@ /** * Non-regression test for ticket #7714 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket7714() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket7714() throws Exception { try (InputStream is = TestUtils.getRegressionDataStream(7714, "doc.kml")) { NonRegFunctionalTests.testGeneric("#7714", KmlReader.parseDataSet(is, null)); Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java (revision 34153) @@ -8,9 +8,5 @@ import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; - -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLStreamException; import org.junit.Ignore; @@ -36,8 +32,8 @@ /** * Non-regression test for ticket #12714 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket12714() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket12714() throws Exception { File file = new File(TestUtils.getRegressionDataFile(12714, "linhas.shp")); try (InputStream is = new FileInputStream(file)) { @@ -50,9 +46,9 @@ /** * Non-regression test for ticket #11761 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test @Ignore("work in progress") - public void testTicket11761() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket11761() throws Exception { File file = new File(TestUtils.getRegressionDataFile(11761, "HAR.shp")); try (InputStream is = new FileInputStream(file)) { @@ -68,8 +64,8 @@ /** * Non-regression test for ticket #10214 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket10214() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket10214() throws Exception { File file = new File(TestUtils.getRegressionDataFile(10214, "utf8_test.shp")); try (InputStream is = new FileInputStream(file)) { @@ -80,8 +76,8 @@ /** * Non-regression test for ticket #8309 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket8309() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket8309() throws Exception { File file = new File(TestUtils.getRegressionDataFile(8309, "new_ti_declarada.shp")); try (InputStream is = new FileInputStream(file)) { Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReaderTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReaderTest.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReaderTest.java (revision 34153) @@ -4,9 +4,5 @@ import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.io.InputStream; - -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLStreamException; import org.junit.Rule; @@ -29,8 +25,8 @@ /** * Non-regression test for ticket #15159 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket15159() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket15159() throws Exception { File file = new File(TestUtils.getRegressionDataFile(15159, "Sanisette.tab")); try (InputStream is = new FileInputStream(file)) { Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java (revision 34153) @@ -2,9 +2,5 @@ package org.openstreetmap.josm.plugins.opendata.core.io.tabular; -import java.io.IOException; import java.io.InputStream; - -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLStreamException; import org.junit.Rule; @@ -57,8 +53,8 @@ /** * Non-regression test for ticket #13508 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket13508() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket13508() throws Exception { try (InputStream is = TestUtils.getRegressionDataStream(13508, "arrets-de-bus0.csv")) { NonRegFunctionalTests.testGeneric("#13508", CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null)); @@ -68,8 +64,8 @@ /** * Non-regression test for ticket #10214 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket10214() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket10214() throws Exception { try (InputStream is = TestUtils.getRegressionDataStream(10214, "utf8_test.csv")) { NonRegFunctionalTests.testTicket10214(CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null)); @@ -79,8 +75,8 @@ /** * Non-regression test for ticket #8805 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket8805() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket8805() throws Exception { try (InputStream is = TestUtils.getRegressionDataStream(8805, "XXX.csv")) { NonRegFunctionalTests.testGeneric("#8805", CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null)); Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReaderTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReaderTest.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReaderTest.java (revision 34153) @@ -2,9 +2,5 @@ package org.openstreetmap.josm.plugins.opendata.core.io.tabular; -import java.io.IOException; import java.io.InputStream; - -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLStreamException; import org.junit.Rule; @@ -27,8 +23,8 @@ /** * Non-regression test for ticket #13821 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket13821() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket13821() throws Exception { try (InputStream is = TestUtils.getRegressionDataStream(13821, "1_set_v_0.6_2016_06_21_06_00_23_a.ods")) { NonRegFunctionalTests.testGeneric("#13821", OdsReader.parseDataSet(is, null, null)); Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReaderTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReaderTest.java (revision 34152) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReaderTest.java (revision 34153) @@ -5,9 +5,5 @@ import static org.junit.Assert.assertNotNull; -import java.io.IOException; import java.io.InputStream; - -import javax.xml.stream.FactoryConfigurationError; -import javax.xml.stream.XMLStreamException; import org.junit.Rule; @@ -61,8 +57,8 @@ /** * Non-regression test for ticket #15980 - * @throws IOException if an error occurs during reading + * @throws Exception if an error occurs during reading */ @Test - public void testTicket15980() throws IOException, XMLStreamException, FactoryConfigurationError { + public void testTicket15980() throws Exception { try (InputStream is = TestUtils.getRegressionDataStream(15980, "qry_OSM_Import_Orte.xls")) { DataSet ds = XlsReader.parseDataSet(is, newHandler("EPSG:4326"), null);