Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/common/FeatFormulaErr2.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/common/FeatFormulaErr2.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/common/FeatFormulaErr2.java (revision 36092) @@ -25,5 +25,5 @@ * Title: FeatFormulaErr2 (Formula Evaluation Shared Feature) common record part *

- * This record part specifies Formula Evaluation & Error Ignoring data + * This record part specifies Formula Evaluation & Error Ignoring data * for a sheet, stored as part of a Shared Feature. It can be found in * records such as {@link FeatRecord}. Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/LessThanPtg.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/LessThanPtg.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/record/formula/LessThanPtg.java (revision 36092) @@ -19,5 +19,5 @@ /** - * Less than operator PTG "<". The SID is taken from the + * Less than operator PTG "<". The SID is taken from the * Openoffice.orgs Documentation of the Excel File Format, * Table 3.5.7 Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFDataFormat.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFDataFormat.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFDataFormat.java (revision 36092) @@ -40,5 +40,5 @@ * with a prefix "[$-xxx]" (where xxx is a 1-7 digit hexadecimal number). * See the Microsoft article - * + * * Creating international number formats * for more details on these codes. Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFRow.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFRow.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFRow.java (revision 36092) @@ -95,5 +95,5 @@ * * @return HSSFCell a high level representation of the created cell. - * @throws IllegalArgumentException if columnIndex < 0 or greater than 255, + * @throws IllegalArgumentException if columnIndex < 0 or greater than 255, * the maximum number of columns supported by the Excel binary format (.xls) */ @@ -113,5 +113,5 @@ * * @return HSSFCell a high level representation of the created cell. - * @throws IllegalArgumentException if columnIndex < 0 or greater than 255, + * @throws IllegalArgumentException if columnIndex < 0 or greater than 255, * the maximum number of columns supported by the Excel binary format (.xls) */ Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFWorkbook.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (revision 36092) @@ -299,5 +299,5 @@ /** * Get the HSSFSheet object at the given index. - * @param index of the sheet number (0-based physical & logical) + * @param index of the sheet number (0-based physical & logical) * @return HSSFSheet at the provided index */ Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java (revision 36092) @@ -167,5 +167,5 @@ * @return the nth component; * - * @exception ArrayIndexOutOfBoundsException if n < 0 or n >= + * @exception ArrayIndexOutOfBoundsException if n < 0 or n >= * length() */ Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/DirectoryProperty.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/DirectoryProperty.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/poifs/property/DirectoryProperty.java (revision 36092) @@ -116,7 +116,7 @@ * @param o2 second object to compare, better be a Property * - * @return negative value if o1 < o2, + * @return negative value if o1 < o2, * zero if o1 == o2, - * positive value if o1 > o2. + * positive value if o1 > o2. */ public int compare(Property o1, Property o2) Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/formula/Formula.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/formula/Formula.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/formula/Formula.java (revision 36092) @@ -144,5 +144,5 @@ * The return value is usually not the same as the location of the cell containing this formula. * - * @return the firstRow & firstColumn of an array formula or shared formula that this formula + * @return the firstRow & firstColumn of an array formula or shared formula that this formula * belongs to. null if this formula is not part of an array or shared formula. */ Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/Row.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/Row.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/Row.java (revision 36092) @@ -31,5 +31,5 @@ * @param column - the column number this cell represents * @return Cell a high level representation of the created cell. - * @throws IllegalArgumentException if columnIndex < 0 or greater than the maximum number of supported columns + * @throws IllegalArgumentException if columnIndex < 0 or greater than the maximum number of supported columns * (255 for *.xls, 1048576 for *.xlsx) */ @@ -44,5 +44,5 @@ * @param column - the column number this cell represents * @return Cell a high level representation of the created cell. - * @throws IllegalArgumentException if columnIndex < 0 or greate than a maximum number of supported columns + * @throws IllegalArgumentException if columnIndex < 0 or greate than a maximum number of supported columns * (255 for *.xls, 1048576 for *.xlsx) */ @@ -53,5 +53,5 @@ * * @param rowNum the row number (0-based) - * @throws IllegalArgumentException if rowNum < 0 + * @throws IllegalArgumentException if rowNum < 0 */ void setRowNum(int rowNum); @@ -78,5 +78,5 @@ * * @return the cell at the given (0 based) index - * @throws IllegalArgumentException if cellnum < 0 or the specified MissingCellPolicy is invalid + * @throws IllegalArgumentException if cellnum < 0 or the specified MissingCellPolicy is invalid * @see Row#RETURN_NULL_AND_BLANK * @see Row#RETURN_BLANK_AS_NULL Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/Workbook.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/Workbook.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/ss/usermodel/Workbook.java (revision 36092) @@ -31,5 +31,5 @@ * Get the Sheet object at the given index. * - * @param index of the sheet number (0-based physical & logical) + * @param index of the sheet number (0-based physical & logical) * @return Sheet at the provided index */ Index: /applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/IntList.java =================================================================== --- /applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/IntList.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/includes/org/apache/poi/util/IntList.java (revision 36092) @@ -185,5 +185,5 @@ * * @exception IndexOutOfBoundsException if the index is out of - * range (index < 0 || index >= size()). + * range (index < 0 || index >= size()). */ Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianDataSetHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianDataSetHandler.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/be/BelgianDataSetHandler.java (revision 36092) @@ -35,13 +35,4 @@ protected class InternalCsvHandler extends DefaultCsvHandler { - /*@Override - public List getSpreadSheetProjections() { - if (singleProjection != null) { - return Arrays.asList(new Projection[]{singleProjection}); - } else { - return Arrays.asList(projections); - } - }*/ - @Override public LatLon getCoor(EastNorth en, String[] fields) { Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/fr/FrenchDataSetHandler.java (revision 36092) @@ -48,13 +48,4 @@ protected class InternalCsvHandler extends DefaultCsvHandler { - /*@Override - public List getSpreadSheetProjections() { - if (singleProjection != null) { - return Arrays.asList(new Projection[]{singleProjection}); - } else { - return Arrays.asList(projections); - } - }*/ - @Override public LatLon getCoor(EastNorth en, String[] fields) { Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/CandidateChooser.java (revision 36092) @@ -67,14 +67,4 @@ } - /*public List getSelectedFiles() { - List result = new ArrayList(); - for (JCheckBox cbox : checkBoxes.keySet()) { - if (cbox.isSelected()) { - result.add(checkBoxes.get(cbox)); - } - } - return result; - }*/ - public File getSelectedFile() { return (File) fileCombo.getSelectedItem(); 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 36091) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/MifReader.java (revision 36092) @@ -68,5 +68,5 @@ private Projection josmProj; - private DataSet ds; + private DataSet dataSet; private Relation region; private Way polygon; @@ -381,6 +381,6 @@ private void parseData(String[] words) { - if (ds == null) { - ds = new DataSet(); + if (dataSet == null) { + dataSet = new DataSet(); } } @@ -392,5 +392,5 @@ private void parseLine(String[] words) throws IOException { Way line = new Way(); - ds.addPrimitive(line); + dataSet.addPrimitive(line); readAttributes(line); line.addNode(createNode(words[1], words[2])); @@ -401,5 +401,5 @@ Way previousPolyline = polyline; polyline = new Way(); - ds.addPrimitive(polyline); + dataSet.addPrimitive(polyline); if (initial) { readAttributes(polyline); @@ -431,5 +431,5 @@ region = new Relation(); region.put("type", "multipolygon"); - ds.addPrimitive(region); + dataSet.addPrimitive(region); readAttributes(region); } else { @@ -488,5 +488,5 @@ initializeReaders(in, file, cs, 1); parseHeader(); - return ds; + return dataSet; } finally { if (midReader != null) { @@ -520,9 +520,9 @@ } else if (words[0].equalsIgnoreCase("Data")) { parseData(words); - } else if (ds != null) { + } else if (dataSet != null) { if (state == State.START_POLYGON) { numpts = Integer.parseInt(words[0]); polygon = new Way(); - ds.addPrimitive(polygon); + dataSet.addPrimitive(polygon); if (region != null) { region.addMember(new RelationMember("outer", polygon)); @@ -629,5 +629,5 @@ private Node createNode(String x, String y) { Node node = new Node(josmProj.eastNorth2latlon(new EastNorth(Double.parseDouble(x), Double.parseDouble(y)))); - ds.addPrimitive(node); + dataSet.addPrimitive(node); return node; } Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabFiles.java (revision 36092) @@ -111,5 +111,5 @@ for (Entry entry : entries) { if (!exists(entry.getKey())) { - url = findExistingFile(entry.getKey(), entry.getValue()); + url = findExistingFile(entry.getValue()); if (url != null) { toUpdate.put(entry.getKey(), url); @@ -121,5 +121,5 @@ } - private URL findExistingFile(ShpFileType shpFileType, URL value) { + private URL findExistingFile(URL value) { final File file = URLs.urlToFile(value); File directory = file.getParentFile(); Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/License.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/License.java (revision 36091) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/licenses/License.java (revision 36092) @@ -14,6 +14,6 @@ public abstract class License { - public static final ODbL ODbL = new ODbL(); - public static final LOOL LOOL = new LOOL(); + public static final ODbL odbl = new ODbL(); + public static final LOOL lool = new LOOL(); private final Map urls = new HashMap<>();