Index: applications/editors/josm/plugins/ColumbusCSV/.settings/org.eclipse.jdt.core.prefs =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/.settings/org.eclipse.jdt.core.prefs (revision 34495) +++ applications/editors/josm/plugins/ColumbusCSV/.settings/org.eclipse.jdt.core.prefs (revision 34496) @@ -14,4 +14,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error @@ -37,4 +38,9 @@ org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning @@ -43,4 +49,12 @@ org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled Index: applications/editors/josm/plugins/ColumbusCSV/build.xml =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/build.xml (revision 34495) +++ applications/editors/josm/plugins/ColumbusCSV/build.xml (revision 34496) @@ -4,5 +4,5 @@ - + Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java (revision 34495) +++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVImporter.java (revision 34496) @@ -7,5 +7,4 @@ import java.io.IOException; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.AutoScaleAction; import org.openstreetmap.josm.actions.ExtensionFileFilter; @@ -18,9 +17,10 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor; import org.openstreetmap.josm.io.IllegalDataException; +import org.openstreetmap.josm.spi.preferences.Config; import org.openstreetmap.josm.tools.Logging; /** * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -89,5 +89,5 @@ progressMonitor.setTicksCount(4); - if (Main.pref.getBoolean("marker.makeautomarkers", true)) { + if (Config.getPref().getBoolean("marker.makeautomarkers", true)) { try { MarkerLayer ml = new MarkerLayer(gpxData, Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPlugin.java =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPlugin.java (revision 34495) +++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPlugin.java (revision 34496) @@ -10,11 +10,13 @@ * Plugin class to import Columbus V-900 CSV files into JOSM. * - * @author Oliver Wieland Wieland + * @author Oliver Wieland <oliver.wieland@online.de> Wieland * */ public class ColumbusCSVPlugin extends Plugin { private static PreferenceSetting columbusSettings; + /** * Plugin constructor (adds menu entry to file menu). + * @param info plugin information */ public ColumbusCSVPlugin(PluginInformation info) { Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java (revision 34495) +++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java (revision 34496) @@ -7,11 +7,11 @@ import javax.swing.JCheckBox; -import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting; import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; +import org.openstreetmap.josm.spi.preferences.Config; /** * Implements the preferences dialog for this plugin. - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> */ public class ColumbusCSVPreferences extends DefaultTabPreferenceSetting { @@ -61,9 +61,9 @@ @Override public boolean ok() { - Main.pref.putBoolean(SHOW_SUMMARY, colCSVShowSummary.isSelected()); - Main.pref.putBoolean(ZOOM_AFTER_IMPORT, colCSVDontZoomAfterImport.isSelected()); - Main.pref.putBoolean(IGNORE_VDOP, colCSVIgnoreVDOP.isSelected()); - Main.pref.putBoolean(WARN_CONVERSION_ERRORS, colCSVWarnConversionErrors.isSelected()); - Main.pref.putBoolean(WARN_MISSING_AUDIO, colCSVWarnMissingAudio.isSelected()); + Config.getPref().putBoolean(SHOW_SUMMARY, colCSVShowSummary.isSelected()); + Config.getPref().putBoolean(ZOOM_AFTER_IMPORT, colCSVDontZoomAfterImport.isSelected()); + Config.getPref().putBoolean(IGNORE_VDOP, colCSVIgnoreVDOP.isSelected()); + Config.getPref().putBoolean(WARN_CONVERSION_ERRORS, colCSVWarnConversionErrors.isSelected()); + Config.getPref().putBoolean(WARN_MISSING_AUDIO, colCSVWarnMissingAudio.isSelected()); return false; } @@ -71,16 +71,16 @@ /** * If true, a summary dialog is shown after import. Default is true. - * @return + * @return true if a summary dialog is shown after import */ public static boolean showSummary() { - return Main.pref.getBoolean(SHOW_SUMMARY, true); + return Config.getPref().getBoolean(SHOW_SUMMARY, true); } /** - * If true, a the bounding box will not be scaled to the imported data. - * @return + * If true, the bounding box will not be scaled to the imported data. + * @return true if the bounding box will not be scaled to the imported data */ public static boolean zoomAfterImport() { - return Main.pref.getBoolean(ZOOM_AFTER_IMPORT, true); + return Config.getPref().getBoolean(ZOOM_AFTER_IMPORT, true); } @@ -89,17 +89,17 @@ * this setting has no effect. * Default is false. - * @return + * @return true if all DOP values (hdop, vdop, pdop) are ignored */ public static boolean ignoreDOP() { - return Main.pref.getBoolean(IGNORE_VDOP, false); + return Config.getPref().getBoolean(IGNORE_VDOP, false); } /** - * If true, the plugin issues warnings if either date or position errors have been occurred. + * If true, the plugin issues warnings when either date or position errors occurr. * Default is true. - * @return + * @return true if the plugin issues warnings when either date or position errors occurr. */ public static boolean warnConversion() { - return Main.pref.getBoolean(WARN_CONVERSION_ERRORS, false); + return Config.getPref().getBoolean(WARN_CONVERSION_ERRORS, false); } @@ -107,8 +107,8 @@ * If true, the plugin issues a warning if a referenced audio file is missing. * Default is true. - * @return + * @return true if the plugin issues a warning when a referenced audio file is missing */ public static boolean warnMissingAudio() { - return Main.pref.getBoolean(WARN_MISSING_AUDIO, false); + return Config.getPref().getBoolean(WARN_MISSING_AUDIO, false); } @@ -131,9 +131,9 @@ // Apply settings - colCSVShowSummary.setSelected(Main.pref.getBoolean(SHOW_SUMMARY, true)); - colCSVDontZoomAfterImport.setSelected(Main.pref.getBoolean(ZOOM_AFTER_IMPORT, true)); - colCSVIgnoreVDOP.setSelected(Main.pref.getBoolean(IGNORE_VDOP, false)); - colCSVWarnConversionErrors.setSelected(Main.pref.getBoolean(WARN_CONVERSION_ERRORS, true)); - colCSVWarnMissingAudio.setSelected(Main.pref.getBoolean(WARN_MISSING_AUDIO, true)); + colCSVShowSummary.setSelected(Config.getPref().getBoolean(SHOW_SUMMARY, true)); + colCSVDontZoomAfterImport.setSelected(Config.getPref().getBoolean(ZOOM_AFTER_IMPORT, true)); + colCSVIgnoreVDOP.setSelected(Config.getPref().getBoolean(IGNORE_VDOP, false)); + colCSVWarnConversionErrors.setSelected(Config.getPref().getBoolean(WARN_CONVERSION_ERRORS, true)); + colCSVWarnMissingAudio.setSelected(Config.getPref().getBoolean(WARN_MISSING_AUDIO, true)); } Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java (revision 34495) +++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVReader.java (revision 34496) @@ -10,4 +10,5 @@ import java.io.IOException; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -59,5 +60,5 @@ * * - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -114,5 +115,5 @@ // Get the object of DataInputStream DataInputStream in = new DataInputStream(fstream); - BufferedReader br = new BufferedReader(new InputStreamReader(in)); + BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)); String strLine; // Initial values @@ -225,5 +226,5 @@ // Get the object of DataInputStream DataInputStream in = new DataInputStream(fstream); - BufferedReader br = new BufferedReader(new InputStreamReader(in)); + BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8)); String strLine; // Initial values Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java (revision 34495) +++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVUtils.java (revision 34496) @@ -6,9 +6,9 @@ import javax.swing.JOptionPane; -import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.MainApplication; /** * Utility functions. - * @author Oliver Wieland + * @author Oliver Wieland <oliver.wieland@online.de> * */ @@ -54,5 +54,5 @@ if (isStringNullOrEmpty(txt)) return; - JOptionPane.showMessageDialog(Main.parent, tr(txt), caption, icon); + JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr(txt), caption, icon); } @@ -65,23 +65,20 @@ */ public static boolean isStringNullOrEmpty(String txt) { - return txt == null || txt.length() == 0; + return txt == null || txt.isEmpty(); } /** * Parses a float number from a string. - * @param txt + * @param txt float value as string * @return The corresponding float instance or Float.NaN, if txt was empty or contained an invalid float number. */ public static Float floatFromString(String txt) { - Float f; - if (isStringNullOrEmpty(txt)) return Float.NaN; - + try { - f = Float.parseFloat(txt); + return Float.parseFloat(txt); } catch (NumberFormatException nex) { - f = Float.NaN; + return Float.NaN; } - return f; } } Index: applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java =================================================================== --- applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java (revision 34495) +++ applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/WayPointHelper.java (revision 34496) @@ -17,5 +17,5 @@ /** - * @author Oliver Wieland Provides several static methods to access way point + * @author Oliver Wieland <oliver.wieland@online.de> Provides several static methods to access way point * attributes. */ @@ -74,5 +74,5 @@ * @param dlat The distance in latitude direction in meters * @param dlon The distance in longitude direction in meters - * @return + * @return new lat/lon coordinates */ public static LatLon moveLatLon(LatLon src, double dlat, double dlon) {