Index: /src/org/openstreetmap/josm/gui/annotation/AnnotationCellRenderer.java
===================================================================
--- /src/org/openstreetmap/josm/gui/annotation/AnnotationCellRenderer.java (revision 179)
+++ /src/org/openstreetmap/josm/gui/annotation/AnnotationCellRenderer.java (revision 180)
@@ -15,5 +15,5 @@
final public class AnnotationCellRenderer extends DefaultListCellRenderer {
@Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
- AnnotationPreset a = ((ForwardActionListener)value).preset;
+ AnnotationPreset a = value == null ? null : ((ForwardActionListener)value).preset;
String name = a == null ? null : (String)a.getValue(Action.NAME);
if (name == null)
Index: /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 179)
+++ /src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 180)
@@ -8,4 +8,5 @@
import java.awt.Component;
import java.awt.Font;
+import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
@@ -45,4 +46,5 @@
import org.openstreetmap.josm.gui.annotation.ForwardActionListener;
import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -225,5 +227,8 @@
allPresets.add(0, new ForwardActionListener(this, new AnnotationPreset()));
annotationPresets.setModel(new DefaultComboBoxModel(allPresets));
- add(annotationPresets, BorderLayout.NORTH);
+ JPanel north = new JPanel(new GridBagLayout());
+ north.add(getComponent(0),GBC.eol().fill(GBC.HORIZONTAL));
+ north.add(annotationPresets,GBC.eol().fill(GBC.HORIZONTAL));
+ add(north, BorderLayout.NORTH);
}
annotationPresets.addActionListener(new ActionListener(){
@@ -231,4 +236,5 @@
AnnotationPreset preset = ((ForwardActionListener)annotationPresets.getSelectedItem()).preset;
preset.actionPerformed(e);
+ annotationPresets.setSelectedItem(null);
}
});
Index: /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
===================================================================
--- /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (revision 179)
+++ /src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (revision 180)
@@ -7,4 +7,5 @@
import java.awt.Component;
import java.awt.Graphics;
+import java.awt.GridBagLayout;
import java.awt.Point;
import java.awt.event.ActionEvent;
@@ -20,6 +21,8 @@
import javax.swing.JColorChooser;
import javax.swing.JFileChooser;
+import javax.swing.JLabel;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
+import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JSeparator;
@@ -43,5 +46,8 @@
import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.DontShowAgainInfo;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.UrlLabel;
/**
@@ -58,4 +64,9 @@
}
public void actionPerformed(ActionEvent e) {
+ JPanel msg = new JPanel(new GridBagLayout());
+ msg.add(new JLabel(tr("Upload of unprocessed GPS data as map data is considered harmfull.
If you want to upload traces, look here:")), GBC.eol());
+ msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop());
+ if (!DontShowAgainInfo.show("convert_to_data", msg))
+ return;
DataSet ds = new DataSet();
for (Collection c : data) {
Index: /src/org/openstreetmap/josm/tools/DontShowAgainInfo.java
===================================================================
--- /src/org/openstreetmap/josm/tools/DontShowAgainInfo.java (revision 180)
+++ /src/org/openstreetmap/josm/tools/DontShowAgainInfo.java (revision 180)
@@ -0,0 +1,30 @@
+package org.openstreetmap.josm.tools;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Container;
+import java.awt.GridBagLayout;
+
+import javax.swing.JCheckBox;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+
+import org.openstreetmap.josm.Main;
+
+public class DontShowAgainInfo {
+
+ public static boolean show(String prefKey, Container msg) {
+ if (!Main.pref.getBoolean("message."+prefKey)) {
+ JCheckBox dontshowagain = new JCheckBox(tr("Do not show again"));
+ dontshowagain.setSelected(Main.pref.getBoolean("message."+prefKey, true));
+ JPanel all = new JPanel(new GridBagLayout());
+ all.add(msg, GBC.eop());
+ all.add(dontshowagain, GBC.eol());
+ int answer = JOptionPane.showConfirmDialog(Main.parent, all, tr("Information"), JOptionPane.OK_CANCEL_OPTION);
+ if (answer != JOptionPane.OK_OPTION)
+ return false;
+ Main.pref.put("message."+prefKey, dontshowagain.isSelected());
+ }
+ return true;
+ }
+}