Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 9972) @@ -33,5 +33,4 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane; import org.openstreetmap.josm.gui.PleaseWaitRunnable; -import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.widgets.AbstractFileChooser; import org.openstreetmap.josm.io.AllFormatsImporter; @@ -203,5 +202,5 @@ tr("Warning"), JOptionPane.WARNING_MESSAGE, - HelpUtil.ht("/Action/Open#ImporterCantImportFiles") + ht("/Action/Open#ImporterCantImportFiles") ); } @@ -229,5 +228,5 @@ tr("Warning"), JOptionPane.WARNING_MESSAGE, - HelpUtil.ht("/Action/Open#MissingImporterForFiles") + ht("/Action/Open#MissingImporterForFiles") ); } Index: trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 9972) @@ -39,5 +39,4 @@ import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.HelpAwareOptionPane; -import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor; import org.openstreetmap.josm.gui.widgets.HistoryComboBox; @@ -238,5 +237,5 @@ HelpAwareOptionPane.showMessageDialogInEDT(Main.parent, "

" + tr( "Cannot open URL ''{0}''
The following download tasks accept the URL patterns shown:
{1}", - url, details) + "

", tr("Download Location"), JOptionPane.ERROR_MESSAGE, HelpUtil.ht("/Action/OpenLocation")); + url, details) + "

", tr("Download Location"), JOptionPane.ERROR_MESSAGE, ht("/Action/OpenLocation")); } Index: trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java (revision 9972) @@ -31,5 +31,4 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; import org.openstreetmap.josm.gui.Notification; -import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Shortcut; @@ -59,5 +58,5 @@ .setIcon(JOptionPane.WARNING_MESSAGE) .setDuration(Notification.TIME_SHORT) - .setHelpTopic(HelpUtil.ht("/Action/SimplifyWay#SelectAWayToSimplify")) + .setHelpTopic(ht("/Action/SimplifyWay#SelectAWayToSimplify")) .show(); } @@ -89,5 +88,5 @@ options, options[0], - HelpUtil.ht("/Action/SimplifyWay#ConfirmSimplifyAll") + ht("/Action/SimplifyWay#ConfirmSimplifyAll") ); } Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 9972) @@ -22,5 +22,4 @@ import org.openstreetmap.josm.data.conflict.ConflictCollection; import org.openstreetmap.josm.gui.HelpAwareOptionPane; -import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.io.UploadDialog; import org.openstreetmap.josm.gui.io.UploadPrimitivesTask; @@ -155,5 +154,5 @@ tr("Warning"), JOptionPane.WARNING_MESSAGE, - HelpUtil.ht("/Action/Upload#PrimitivesParticipateInConflicts") + ht("/Action/Upload#PrimitivesParticipateInConflicts") ); } Index: trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java (revision 9972) @@ -162,5 +162,5 @@ */ protected void restorePrimitivesHistory(HistoryComboBox cbHistory) { - java.util.List cmtHistory = new LinkedList<>( + List cmtHistory = new LinkedList<>( Main.pref.getCollection(getClass().getName() + ".primitivesHistory", new LinkedList())); // we have to reverse the history, because ComboBoxHistory will reverse it again in addElement() Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java (revision 9972) @@ -275,5 +275,5 @@ */ @Override - public void characters(char[] data, int start, int length) throws org.xml.sax.SAXException { + public void characters(char[] data, int start, int length) throws SAXException { if (description != null) { description.append(data, start, length); Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 9972) @@ -4,4 +4,5 @@ import static org.openstreetmap.josm.gui.help.HelpUtil.buildAbsoluteHelpTopic; import static org.openstreetmap.josm.gui.help.HelpUtil.getHelpTopicEditUrl; +import static org.openstreetmap.josm.gui.help.HelpUtil.getHelpTopicUrl; import static org.openstreetmap.josm.tools.I18n.tr; @@ -298,14 +299,14 @@ */ protected void loadRelativeHelpTopic(String relativeHelpTopic) { - String url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.DEFAULTNOTENGLISH)); + String url = getHelpTopicUrl(buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.DEFAULTNOTENGLISH)); String content = null; try { content = reader.fetchHelpTopicContent(url, true); } catch (MissingHelpContentException e) { - url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.BASELANGUAGE)); + url = getHelpTopicUrl(buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.BASELANGUAGE)); try { content = reader.fetchHelpTopicContent(url, true); } catch (MissingHelpContentException e1) { - url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.ENGLISH)); + url = getHelpTopicUrl(buildAbsoluteHelpTopic(relativeHelpTopic, LocaleType.ENGLISH)); try { content = reader.fetchHelpTopicContent(url, true); @@ -341,5 +342,5 @@ */ protected void loadAbsoluteHelpTopic(String absoluteHelpTopic) { - String url = HelpUtil.getHelpTopicUrl(absoluteHelpTopic); + String url = getHelpTopicUrl(absoluteHelpTopic); String content = null; try { Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (revision 9972) @@ -224,5 +224,5 @@ try { this.nameTemplateFilter = SearchCompiler.compile(filter); - } catch (org.openstreetmap.josm.actions.search.SearchCompiler.ParseError e) { + } catch (SearchCompiler.ParseError e) { Main.error("Error while parsing" + filter + ": " + e.getMessage()); throw new SAXException(e); Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java (revision 9972) @@ -135,5 +135,5 @@ JToggleButton aibutton = new JToggleButton(ai); aibutton.setToolTipText(tr("Select auto-increment of {0} for this field", ai)); - aibutton.setMargin(new java.awt.Insets(0, 0, 0, 0)); + aibutton.setMargin(new Insets(0, 0, 0, 0)); aibutton.setFocusable(false); saveHorizontalSpace(aibutton); @@ -165,5 +165,5 @@ JButton releasebutton = new JButton("X"); releasebutton.setToolTipText(tr("Cancel auto-increment for this field")); - releasebutton.setMargin(new java.awt.Insets(0, 0, 0, 0)); + releasebutton.setMargin(new Insets(0, 0, 0, 0)); releasebutton.setFocusable(false); releasebutton.addActionListener(new ActionListener() { Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 9971) +++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 9972) @@ -55,5 +55,4 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec; import org.openstreetmap.josm.gui.download.DownloadSelection; -import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory; import org.openstreetmap.josm.gui.progress.NullProgressMonitor; @@ -518,5 +517,5 @@ specs, specs[0], - HelpUtil.ht("/Plugin/Loading#MissingRequiredPlugin"))) { + ht("/Plugin/Loading#MissingRequiredPlugin"))) { downloadRequiredPluginsAndRestart(parent, missingRequiredPlugin); } @@ -580,5 +579,5 @@ tr("Warning"), JOptionPane.WARNING_MESSAGE, - HelpUtil.ht("/Plugin/Loading#JOSMUpdateRequired") + ht("/Plugin/Loading#JOSMUpdateRequired") ); } @@ -860,5 +859,5 @@ tr("Warning"), JOptionPane.WARNING_MESSAGE, - HelpUtil.ht("/Plugin/Loading#MissingPluginInfos") + ht("/Plugin/Loading#MissingPluginInfos") ); } @@ -928,5 +927,5 @@ tr("Plugin update failed"), JOptionPane.ERROR_MESSAGE, - HelpUtil.ht("/Plugin/Loading#FailedPluginUpdated") + ht("/Plugin/Loading#FailedPluginUpdated") ); }