Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/ConfigKeys.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/ConfigKeys.java (revision 22684) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/ConfigKeys.java (revision 23191) @@ -1,17 +1,17 @@ /* Copyright (c) 2008, Henrik Niehaus * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its - * contributors may be used to endorse or promote products derived from this + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java (revision 22684) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java (revision 23191) @@ -78,5 +78,5 @@ // auto download if configured - if( Main.pref.getBoolean(ConfigKeys.OSB_AUTO_DOWNLOAD) && !Main.pref.getBoolean(ConfigKeys.OSB_API_OFFLINE) && + if( Main.pref.getBoolean(ConfigKeys.OSB_AUTO_DOWNLOAD) && !Main.pref.getBoolean(ConfigKeys.OSB_API_OFFLINE) && plugin != null && plugin.getDialog() != null && plugin.getDialog().isDialogShowing() ) { if(countdown < 0) { Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java (revision 22684) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java (revision 23191) @@ -84,7 +84,7 @@ UploadAction.registerUploadHook(uploadHook); } else { - MapView.removeLayerChangeListener(this); - UploadAction.unregisterUploadHook(uploadHook); - uploadHook = null; + MapView.removeLayerChangeListener(this); + UploadAction.unregisterUploadHook(uploadHook); + uploadHook = null; } } @@ -231,6 +231,6 @@ public void layerRemoved(Layer oldLayer) { if(oldLayer == layer) { - MapView.removeLayerChangeListener(this); - MapView.removeLayerChangeListener(dialog); + MapView.removeLayerChangeListener(this); + MapView.removeLayerChangeListener(dialog); layer = null; } Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java (revision 22684) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java (revision 23191) @@ -49,7 +49,7 @@ private EditAction editAction = new EditAction(); - + private String comment; - + private Node node; @@ -73,5 +73,5 @@ OsbPlugin.loadIcon("add_comment22.png"), history, l); - + if(comment == null) { cancelled = true; @@ -84,10 +84,10 @@ editAction.execute(node, comment); } - + @Override public String toString() { return tr("Comment: " + node.get("note") + " - " + comment); } - + @Override public AddCommentAction clone() { Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java (revision 22684) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java (revision 23191) @@ -51,7 +51,7 @@ private CloseAction closeAction = new CloseAction(); private EditAction commentAction = new EditAction(); - + private String comment; - + private Node node; @@ -74,5 +74,5 @@ OsbPlugin.loadIcon("icon_valid22.png"), history, l); - + if(comment == null) { cancelled = true; @@ -89,10 +89,10 @@ closeAction.execute(node); } - + @Override public String toString() { return tr("Close: " + node.get("note") + " - Comment: " + comment); } - + @Override public CloseIssueAction clone() { Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java (revision 22684) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java (revision 23191) @@ -51,9 +51,9 @@ private String result; - + private Point p; - + private NewAction newAction = new NewAction(); - + public NewIssueAction(OsbPlugin plugin, Point p) { super(tr("New issue"), plugin.getDialog()); @@ -77,5 +77,5 @@ OsbPlugin.loadIcon("icon_error_add22.png"), history, l); - + if(result == null) { cancelled = true; @@ -96,10 +96,10 @@ } } - + @Override public String toString() { return tr("Create: " + result); } - + @Override public OsbAction clone() { Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java (revision 22684) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java (revision 23191) @@ -46,9 +46,9 @@ private JToggleButton button; - + private OsbPlugin plugin; private Cursor previousCursor; - + public PointToNewIssueAction(JToggleButton button, OsbPlugin plugin) { super(tr("New issue")); Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java =================================================================== --- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java (revision 22684) +++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java (revision 23191) @@ -1,17 +1,17 @@ /* Copyright (c) 2008, Henrik Niehaus * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its - * contributors may be used to endorse or promote products derived from this + * 3. Neither the name of the project nor the names of its + * contributors may be used to endorse or promote products derived from this * software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -74,7 +74,7 @@ private JLabel lblText; private JPanel pnlMain; - + private String value = null; - + private TextInputDialog() { initGUI(); @@ -88,5 +88,5 @@ } }); - + btnOk.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -94,5 +94,5 @@ } }); - + btnCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -101,5 +101,5 @@ }); } - + private void okPressed() { value = input.getText(); @@ -155,9 +155,9 @@ setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); } - + public static String showDialog(JComponent parent, String title, String text, List history, HistoryChangedListener l) { return showDialog(parent, title, text, null, history, l); } - + /** * Opens a text input dialog and returns the entered text @@ -180,5 +180,5 @@ int y = (int) (p.getY() + (double)(parent.getHeight() - tid.getHeight()) / 2); tid.setLocation(x, y); - + //tid.pack(); tid.setVisible(true); @@ -189,9 +189,9 @@ return this.value; } - + public void setDescription(String text) { lblText.setText(text); } - + public void setHistory(List history) { input.setHistory(history); @@ -199,9 +199,9 @@ value = null; } - + public void addHistoryChangedListener(HistoryChangedListener l) { ((ComboBoxHistory)input.getModel()).addHistoryChangedListener(l); } - + public void setIcon(Icon icon) { lblIcon.setIcon(icon);