Changeset 34153 in osm for applications/editors/josm/plugins/opendata
- Timestamp:
- 2018-04-08T15:24:48+02:00 (7 years ago)
- Location:
- applications/editors/josm/plugins/opendata
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/opendata/.settings/org.eclipse.jdt.core.prefs
r34152 r34153 56 56 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public 57 57 org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag 58 org.eclipse.jdt.core.compiler.problem.missingJavadocTags= ignore58 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning 59 59 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled 60 60 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -
applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTable.java
r30568 r34153 1 1 /* 2 2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 3 * 3 * 4 4 * Copyright 2008 jOpenDocument, by ILM Informatique. All rights reserved. 5 * 5 * 6 6 * The contents of this file are subject to the terms of the GNU 7 * General Public License Version 3 only ("GPL"). 8 * You may not use this file except in compliance with the License. 7 * General Public License Version 3 only ("GPL"). 8 * You may not use this file except in compliance with the License. 9 9 * You can obtain a copy of the License at http://www.gnu.org/licenses/gpl-3.0.html 10 10 * See the License for the specific language governing permissions and limitations under the License. 11 * 11 * 12 12 * When distributing the software, include this License Header Notice in each file. 13 * 13 * 14 14 */ 15 15 … … 20 20 21 21 /** 22 * 22 * 23 23 */ 24 24 public class TableTable { … … 71 71 /** 72 72 * Return all the rows (duplicated if repeated) 73 * @return all the rows (duplicated if repeated) 73 74 */ 74 75 public List<TableTableRow> getRows() { … … 78 79 /** 79 80 * Sets the value of the tablePrintRanges property. 80 * 81 * 81 82 * @param value allowed object is {@link String } 82 * 83 * 83 84 */ 84 85 public void setTablePrintRanges(final String value) { -
applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableCell.java
r29298 r34153 1 1 /* 2 2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. 3 * 3 * 4 4 * Copyright 2008 jOpenDocument, by ILM Informatique. All rights reserved. 5 * 5 * 6 6 * The contents of this file are subject to the terms of the GNU 7 * General Public License Version 3 only ("GPL"). 8 * You may not use this file except in compliance with the License. 7 * General Public License Version 3 only ("GPL"). 8 * You may not use this file except in compliance with the License. 9 9 * You can obtain a copy of the License at http://www.gnu.org/licenses/gpl-3.0.html 10 10 * See the License for the specific language governing permissions and limitations under the License. 11 * 11 * 12 12 * When distributing the software, include this License Header Notice in each file. 13 * 13 * 14 14 */ 15 15 … … 23 23 24 24 protected int tableNumberColumnsRepeated = 1; 25 25 26 26 protected String tableStyleName; 27 27 … … 51 51 /** 52 52 * Gets the value of the tableStyleName property. 53 * 53 * 54 54 * @return possible object is {@link String } 55 * 55 * 56 56 */ 57 57 public String getStyleName() { … … 61 61 /** 62 62 * Gets the value of the tableNumberColumnsRepeated property. 63 * 63 * @return the value of the tableNumberColumnsRepeated property. 64 64 */ 65 65 public int getTableNumberColumnsRepeated() { 66 66 return this.tableNumberColumnsRepeated; 67 67 } 68 68 69 69 public TextP getTextP() { 70 70 return this.textP; … … 73 73 /** 74 74 * Sets the value of the tableNumberColumnsRepeated property. 75 * 75 * 76 76 * @param value allowed object is {@link String } 77 * 77 * 78 78 */ 79 79 public void setTableNumberColumnsRepeated(final String value) { … … 85 85 /** 86 86 * Sets the value of the tableStyleName property. 87 * 87 * 88 88 * @param value allowed object is {@link String } 89 * 89 * 90 90 */ 91 91 public void setTableStyleName(final String value) { -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java
r33518 r34153 619 619 } 620 620 621 /** Compare two doubles within a default epsilon */ 621 /** 622 * Compare two doubles within a default epsilon 623 * @param a first double 624 * @param b second double 625 * @return {@code true} if {@code a} and {@code b} are equals 626 */ 622 627 public static boolean equals(Double a, Double b) { 623 628 if (a == b) return true; -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java
r34151 r34153 187 187 * depends on should be missing. 188 188 * 189 * @param parent parent component 189 190 * @param modules the collection of all loaded modules 190 191 * @param module the module for which preconditions are checked … … 198 199 * Creates a class loader for loading module code. 199 200 * 200 * @param modules the collection of modules which are going to be loaded with this 201 * class loader 201 * @param modules the collection of modules which are going to be loaded with this class loader 202 202 * @return the class loader 203 203 */ … … 225 225 * the class loader <code>moduleClassLoader</code>. 226 226 * 227 * @param parent parent component 227 228 * @param module the module 228 229 * @param moduleClassLoader the module class loader … … 262 263 263 264 /** 264 * Loads the module in <code>modules</code> from locally available jar files into 265 * memory.266 * 265 * Loads the module in <code>modules</code> from locally available jar files into memory. 266 * 267 * @param parent parent component 267 268 * @param modules the list of modules 268 269 * @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null. … … 356 357 /** 357 358 * Builds the set of modules to load. Deprecated and unmaintained modules are filtered 358 * out. This involves user interaction. This method displays alert and confirmation 359 * messages.360 * 359 * out. This involves user interaction. This method displays alert and confirmation messages. 360 * 361 * @param parent parent component 361 362 * @return the set of modules to load (as set of module names) 362 363 */ … … 417 418 * @param modules the collection of modules to update. Must not be null. 418 419 * @param monitor the progress monitor. Defaults to {@link NullProgressMonitor#INSTANCE} if null. 420 * @return list of modules 419 421 * @throws IllegalArgumentException thrown if modules is null 420 422 */ … … 499 501 * Ask the user for confirmation that a module shall be disabled. 500 502 * 503 * @param parent parent component 501 504 * @param reason the reason for disabling the module 502 505 * @param name the module name -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleInformation.java
r34151 r34153 223 223 * @param klass the module class 224 224 * @return the instantiated and initialized module 225 * @throws ModuleException if the module cannot be loaded or initialized 225 226 */ 226 227 public Module load(Class<? extends Module> klass) throws ModuleException { … … 237 238 * @param classLoader the class loader to use 238 239 * @return the loaded class 240 * @throws ModuleException if the class cannot be found 239 241 */ 240 242 @SuppressWarnings("unchecked") … … 326 328 /** 327 329 * Replies the name of the module 330 * @return the name of the module 328 331 */ 329 332 public String getName() { -
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/NonRegFunctionalTests.java
r33156 r34153 23 23 import org.openstreetmap.josm.tools.CheckParameterUtil; 24 24 25 /** 26 * Superclass of non-reg functional tests. 27 */ 25 28 public abstract class NonRegFunctionalTests { 26 29 27 30 /** 28 31 * Non-regression generic test. 32 * @param context context 33 * @param ds data set 29 34 */ 30 35 public static void testGeneric(String context, DataSet ds) { … … 52 57 /** 53 58 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/10214">#10214</a> 59 * @param ds data set 54 60 */ 55 61 public static void testTicket10214(DataSet ds) { … … 70 76 * Lists all datasets files matching given extension. 71 77 * @param ext file extension to search for 78 * @return all datasets files matching given extension 72 79 * @returns List of all datasets files matching given extension 73 80 * @throws IOException in case of I/O error -
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReaderTest.java
r33156 r34153 7 7 import java.io.File; 8 8 import java.io.FileInputStream; 9 import java.io.IOException;10 9 import java.io.InputStream; 11 12 import javax.xml.stream.FactoryConfigurationError;13 import javax.xml.stream.XMLStreamException;14 10 15 11 import org.junit.Rule; … … 32 28 /** 33 29 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/11624">#11624</a> 34 * @throws IOException if an error occurs during reading30 * @throws Exception if an error occurs during reading 35 31 */ 36 32 @Test 37 public void testTicket11624() throws IOException, XMLStreamException, FactoryConfigurationError{33 public void testTicket11624() throws Exception { 38 34 File file = new File(TestUtils.getRegressionDataFile(11624, "temp3.gml")); 39 35 try (InputStream is = new FileInputStream(file)) { -
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java
r33156 r34153 5 5 import static org.junit.Assert.assertTrue; 6 6 7 import java.io.IOException;8 7 import java.io.InputStream; 9 10 import javax.xml.stream.FactoryConfigurationError;11 import javax.xml.stream.XMLStreamException;12 8 13 9 import org.junit.Rule; … … 46 42 /** 47 43 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12694">#12694</a> 48 * @throws IOException if an error occurs during reading44 * @throws Exception if an error occurs during reading 49 45 */ 50 46 @Test 51 public void testTicket12694() throws IOException, XMLStreamException, FactoryConfigurationError{47 public void testTicket12694() throws Exception { 52 48 try (InputStream is = TestUtils.getRegressionDataStream(12694, "Alvinรณpolis_314946.kml")) { 53 49 NonRegFunctionalTests.testGeneric("#12694", KmlReader.parseDataSet(is, null)); … … 57 53 /** 58 54 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/10214">#10214</a> 59 * @throws IOException if an error occurs during reading55 * @throws Exception if an error occurs during reading 60 56 */ 61 57 @Test 62 public void testTicket10214() throws IOException, XMLStreamException, FactoryConfigurationError{58 public void testTicket10214() throws Exception { 63 59 try (InputStream is = TestUtils.getRegressionDataStream(10214, "utf8_test.kml")) { 64 60 NonRegFunctionalTests.testTicket10214(KmlReader.parseDataSet(is, null)); … … 68 64 /** 69 65 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/7714">#7714</a> 70 * @throws IOException if an error occurs during reading66 * @throws Exception if an error occurs during reading 71 67 */ 72 68 @Test 73 public void testTicket7714() throws IOException, XMLStreamException, FactoryConfigurationError{69 public void testTicket7714() throws Exception { 74 70 try (InputStream is = TestUtils.getRegressionDataStream(7714, "doc.kml")) { 75 71 NonRegFunctionalTests.testGeneric("#7714", KmlReader.parseDataSet(is, null)); -
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReaderTest.java
r33156 r34153 8 8 import java.io.File; 9 9 import java.io.FileInputStream; 10 import java.io.IOException;11 10 import java.io.InputStream; 12 13 import javax.xml.stream.FactoryConfigurationError;14 import javax.xml.stream.XMLStreamException;15 11 16 12 import org.junit.Ignore; … … 36 32 /** 37 33 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/12714">#12714</a> 38 * @throws IOException if an error occurs during reading34 * @throws Exception if an error occurs during reading 39 35 */ 40 36 @Test 41 public void testTicket12714() throws IOException, XMLStreamException, FactoryConfigurationError{37 public void testTicket12714() throws Exception { 42 38 File file = new File(TestUtils.getRegressionDataFile(12714, "linhas.shp")); 43 39 try (InputStream is = new FileInputStream(file)) { … … 50 46 /** 51 47 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/11761">#11761</a> 52 * @throws IOException if an error occurs during reading48 * @throws Exception if an error occurs during reading 53 49 */ 54 50 @Test 55 51 @Ignore("work in progress") 56 public void testTicket11761() throws IOException, XMLStreamException, FactoryConfigurationError{52 public void testTicket11761() throws Exception { 57 53 File file = new File(TestUtils.getRegressionDataFile(11761, "HAR.shp")); 58 54 try (InputStream is = new FileInputStream(file)) { … … 68 64 /** 69 65 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/10214">#10214</a> 70 * @throws IOException if an error occurs during reading66 * @throws Exception if an error occurs during reading 71 67 */ 72 68 @Test 73 public void testTicket10214() throws IOException, XMLStreamException, FactoryConfigurationError{69 public void testTicket10214() throws Exception { 74 70 File file = new File(TestUtils.getRegressionDataFile(10214, "utf8_test.shp")); 75 71 try (InputStream is = new FileInputStream(file)) { … … 80 76 /** 81 77 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/8309">#8309</a> 82 * @throws IOException if an error occurs during reading78 * @throws Exception if an error occurs during reading 83 79 */ 84 80 @Test 85 public void testTicket8309() throws IOException, XMLStreamException, FactoryConfigurationError{81 public void testTicket8309() throws Exception { 86 82 File file = new File(TestUtils.getRegressionDataFile(8309, "new_ti_declarada.shp")); 87 83 try (InputStream is = new FileInputStream(file)) { -
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReaderTest.java
r33613 r34153 4 4 import java.io.File; 5 5 import java.io.FileInputStream; 6 import java.io.IOException;7 6 import java.io.InputStream; 8 9 import javax.xml.stream.FactoryConfigurationError;10 import javax.xml.stream.XMLStreamException;11 7 12 8 import org.junit.Rule; … … 29 25 /** 30 26 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/15159">#15159</a> 31 * @throws IOException if an error occurs during reading27 * @throws Exception if an error occurs during reading 32 28 */ 33 29 @Test 34 public void testTicket15159() throws IOException, XMLStreamException, FactoryConfigurationError{30 public void testTicket15159() throws Exception { 35 31 File file = new File(TestUtils.getRegressionDataFile(15159, "Sanisette.tab")); 36 32 try (InputStream is = new FileInputStream(file)) { -
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java
r33156 r34153 2 2 package org.openstreetmap.josm.plugins.opendata.core.io.tabular; 3 3 4 import java.io.IOException;5 4 import java.io.InputStream; 6 7 import javax.xml.stream.FactoryConfigurationError;8 import javax.xml.stream.XMLStreamException;9 5 10 6 import org.junit.Rule; … … 57 53 /** 58 54 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/13508">#13508</a> 59 * @throws IOException if an error occurs during reading55 * @throws Exception if an error occurs during reading 60 56 */ 61 57 @Test 62 public void testTicket13508() throws IOException, XMLStreamException, FactoryConfigurationError{58 public void testTicket13508() throws Exception { 63 59 try (InputStream is = TestUtils.getRegressionDataStream(13508, "arrets-de-bus0.csv")) { 64 60 NonRegFunctionalTests.testGeneric("#13508", CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null)); … … 68 64 /** 69 65 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/10214">#10214</a> 70 * @throws IOException if an error occurs during reading66 * @throws Exception if an error occurs during reading 71 67 */ 72 68 @Test 73 public void testTicket10214() throws IOException, XMLStreamException, FactoryConfigurationError{69 public void testTicket10214() throws Exception { 74 70 try (InputStream is = TestUtils.getRegressionDataStream(10214, "utf8_test.csv")) { 75 71 NonRegFunctionalTests.testTicket10214(CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null)); … … 79 75 /** 80 76 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/8805">#8805</a> 81 * @throws IOException if an error occurs during reading77 * @throws Exception if an error occurs during reading 82 78 */ 83 79 @Test 84 public void testTicket8805() throws IOException, XMLStreamException, FactoryConfigurationError{80 public void testTicket8805() throws Exception { 85 81 try (InputStream is = TestUtils.getRegressionDataStream(8805, "XXX.csv")) { 86 82 NonRegFunctionalTests.testGeneric("#8805", CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null)); -
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReaderTest.java
r33156 r34153 2 2 package org.openstreetmap.josm.plugins.opendata.core.io.tabular; 3 3 4 import java.io.IOException;5 4 import java.io.InputStream; 6 7 import javax.xml.stream.FactoryConfigurationError;8 import javax.xml.stream.XMLStreamException;9 5 10 6 import org.junit.Rule; … … 27 23 /** 28 24 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/13821">#13821</a> 29 * @throws IOException if an error occurs during reading25 * @throws Exception if an error occurs during reading 30 26 */ 31 27 @Test 32 public void testTicket13821() throws IOException, XMLStreamException, FactoryConfigurationError{28 public void testTicket13821() throws Exception { 33 29 try (InputStream is = TestUtils.getRegressionDataStream(13821, "1_set_v_0.6_2016_06_21_06_00_23_a.ods")) { 34 30 NonRegFunctionalTests.testGeneric("#13821", OdsReader.parseDataSet(is, null, null)); -
applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReaderTest.java
r34072 r34153 5 5 import static org.junit.Assert.assertNotNull; 6 6 7 import java.io.IOException;8 7 import java.io.InputStream; 9 10 import javax.xml.stream.FactoryConfigurationError;11 import javax.xml.stream.XMLStreamException;12 8 13 9 import org.junit.Rule; … … 61 57 /** 62 58 * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/15980">#15980</a> 63 * @throws IOException if an error occurs during reading59 * @throws Exception if an error occurs during reading 64 60 */ 65 61 @Test 66 public void testTicket15980() throws IOException, XMLStreamException, FactoryConfigurationError{62 public void testTicket15980() throws Exception { 67 63 try (InputStream is = TestUtils.getRegressionDataStream(15980, "qry_OSM_Import_Orte.xls")) { 68 64 DataSet ds = XlsReader.parseDataSet(is, newHandler("EPSG:4326"), null);
Note:
See TracChangeset
for help on using the changeset viewer.