Changeset 180 in josm


Ignore:
Timestamp:
2006-12-31T14:41:22+01:00 (17 years ago)
Author:
imi
Message:
  • added a warning for first-users when converting gps to osm data
  • fixed missing property dialog caption when annotations were loaded
Location:
src/org/openstreetmap/josm
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • src/org/openstreetmap/josm/gui/annotation/AnnotationCellRenderer.java

    r178 r180  
    1515final public class AnnotationCellRenderer extends DefaultListCellRenderer {
    1616        @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
    17                 AnnotationPreset a = ((ForwardActionListener)value).preset;
     17                AnnotationPreset a = value == null ? null : ((ForwardActionListener)value).preset;
    1818                String name = a == null ? null : (String)a.getValue(Action.NAME);
    1919                if (name == null)

  • src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

    r178 r180  
    88import java.awt.Component;
    99import java.awt.Font;
     10import java.awt.GridBagLayout;
    1011import java.awt.GridLayout;
    1112import java.awt.event.ActionEvent;
    … …  
    4546import org.openstreetmap.josm.gui.annotation.ForwardActionListener;
    4647import org.openstreetmap.josm.gui.preferences.AnnotationPresetPreference;
     48import org.openstreetmap.josm.tools.GBC;
    4749import org.openstreetmap.josm.tools.ImageProvider;
    4850
    … …  
    225227                        allPresets.add(0, new ForwardActionListener(this, new AnnotationPreset()));
    226228                        annotationPresets.setModel(new DefaultComboBoxModel(allPresets));
    227                         add(annotationPresets, BorderLayout.NORTH);
     229                        JPanel north = new JPanel(new GridBagLayout());
     230                        north.add(getComponent(0),GBC.eol().fill(GBC.HORIZONTAL));
     231                        north.add(annotationPresets,GBC.eol().fill(GBC.HORIZONTAL));
     232                        add(north, BorderLayout.NORTH);
    228233                }
    229234                annotationPresets.addActionListener(new ActionListener(){
    … …  
    231236                                AnnotationPreset preset = ((ForwardActionListener)annotationPresets.getSelectedItem()).preset;
    232237                                preset.actionPerformed(e);
     238                                annotationPresets.setSelectedItem(null);
    233239                        }
    234240                });

  • src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

    r172 r180  
    77import java.awt.Component;
    88import java.awt.Graphics;
     9import java.awt.GridBagLayout;
    910import java.awt.Point;
    1011import java.awt.event.ActionEvent;
    … …  
    2021import javax.swing.JColorChooser;
    2122import javax.swing.JFileChooser;
     23import javax.swing.JLabel;
    2224import javax.swing.JMenuItem;
    2325import javax.swing.JOptionPane;
     26import javax.swing.JPanel;
    2427import javax.swing.JRadioButton;
    2528import javax.swing.JSeparator;
    … …  
    4346import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
    4447import org.openstreetmap.josm.tools.ColorHelper;
     48import org.openstreetmap.josm.tools.DontShowAgainInfo;
     49import org.openstreetmap.josm.tools.GBC;
    4550import org.openstreetmap.josm.tools.ImageProvider;
     51import org.openstreetmap.josm.tools.UrlLabel;
    4652
    4753/**
    … …  
    5864                }
    5965                public void actionPerformed(ActionEvent e) {
     66                        JPanel msg = new JPanel(new GridBagLayout());
     67                        msg.add(new JLabel(tr("<html>Upload of unprocessed GPS data as map data is considered harmfull.<br>If you want to upload traces, look here:")), GBC.eol());
     68                        msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop());
     69                        if (!DontShowAgainInfo.show("convert_to_data", msg))
     70                                return;
    6071                        DataSet ds = new DataSet();
    6172                        for (Collection<GpsPoint> c : data) {
Note: See TracChangeset for help on using the changeset viewer.