Ignore:
Timestamp:
2009-02-16T15:14:34+01:00 (15 years ago)
Author:
stoecker
Message:

applied patch #2185 by bruce89

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

    r1397 r1415  
    44import java.awt.Dimension;
    55import java.awt.event.ActionEvent;
    6 import java.awt.event.ComponentEvent;
    7 import java.awt.event.ComponentListener;
    86import java.awt.GridBagLayout;
    97import java.awt.Toolkit;
    … …  
    119import javax.swing.AbstractAction;
    1210import javax.swing.Action;
    13 import javax.swing.BorderFactory;
    14 import javax.swing.BoundedRangeModel;
    15 import javax.swing.InputMap;
    1611import javax.swing.JButton;
    1712import javax.swing.JComponent;
    … …  
    1914import javax.swing.JOptionPane;
    2015import javax.swing.JPanel;
    21 import javax.swing.JRootPane;
    2216import javax.swing.JScrollBar;
    2317import javax.swing.JScrollPane;
    2418import javax.swing.KeyStroke;
    2519
    26 import org.openstreetmap.josm.Main;
    2720import org.openstreetmap.josm.gui.JMultilineLabel;
    2821import org.openstreetmap.josm.tools.GBC;
    29 import org.openstreetmap.josm.tools.I18n;
    3022import org.openstreetmap.josm.tools.ImageProvider;
    3123
    … …  
    3729    /**
    3830     * Sets up the dialog. The first button is always the default.
    39      * @param Component The parent element that will be used for position and maximum size
    40      * @param String The text that will be shown in the window titlebar
    41      * @param Component Any component that should be show above the buttons (e.g. JLabel)
    42      * @param String[] The labels that will be displayed on the buttons
    43      * @param String[] The path to the icons that will be displayed on the buttons. Path is relative to JOSM's image directory. File extensions need to be included. If a button should not have an icon pass null.
     31     * @param parent The parent element that will be used for position and maximum size
     32     * @param title The text that will be shown in the window titlebar
     33     * @param content Any component that should be show above the buttons (e.g. JLabel)
     34     * @param buttonTexts The labels that will be displayed on the buttons
     35     * @param buttonIcons The path to the icons that will be displayed on the buttons. Path is relative to JOSM's image directory. File extensions need to be included. If a button should not have an icon pass null.
    4436     */
    4537    public ExtendedDialog(Component parent, String title, Component content, String[] buttonTexts, String[] buttonIcons) {

  • trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

    r1370 r1415  
    1515
    1616import java.awt.BorderLayout;
    17 import java.awt.Component;
    1817import java.awt.EventQueue;
    1918
    … …  
    142141        ArrayList<Future<String>> linkContent = new ArrayList<Future<String>>();
    143142        for(int i=0; i < links.size(); i++) {
    144             String[] obj = (String[])links.get(i);
     143            String[] obj = links.get(i);
    145144            int targetVersion = Integer.parseInt(obj[1]);
    146145            String condition = obj[0];

  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r1356 r1415  
    1111import java.awt.event.WindowAdapter;
    1212import java.awt.event.WindowEvent;
    13 import java.io.File;
    14 import java.io.IOException;
    1513import java.util.Arrays;
    1614import java.util.Collection;

  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r1380 r1415  
    6363import org.openstreetmap.josm.actions.search.SearchAction;
    6464import org.openstreetmap.josm.actions.ToggleGPXLinesAction;
    65 import org.openstreetmap.josm.data.DataSetChecker;
    6665import org.openstreetmap.josm.tools.Shortcut;
    6766

  • trunk/src/org/openstreetmap/josm/gui/MapFrame.java

    r1405 r1415  
    179179    public void addMapMode(IconToggleButton b) {
    180180        toolBarActions.add(b);
    181         toolGroup.add((AbstractButton)b);
     181        toolGroup.add(b);
    182182    }
    183183

  • trunk/src/org/openstreetmap/josm/gui/MapSlider.java

    r1337 r1415  
    3131        double sizey = this.mv.scale * this.mv.getHeight();
    3232        for (int zoom = 0; zoom <= 150; zoom++, sizex *= 1.1, sizey *= 1.1) {
    33             if (sizex > this.mv.world.east() || sizey > this.mv.world.north()) {
     33            if (sizex > MapView.world.east() || sizey > MapView.world.north()) {
    3434                preventChange=true;
    3535                setValue(zoom);

  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r1350 r1415  
    2424import java.awt.event.MouseListener;
    2525import java.lang.reflect.InvocationTargetException;
    26 import java.text.DecimalFormat;
    2726import java.util.Collection;
    2827import java.util.ConcurrentModificationException;

  • trunk/src/org/openstreetmap/josm/gui/MapView.java

    r1379 r1415  
    365365         * that I switch layers and actions at the same time and it was annoying to mind the
    366366         * order. This way it works as visual clue for new users */
    367         for (Enumeration e = Main.map.toolGroup.getElements() ; e.hasMoreElements() ;) {
    368             AbstractButton x=(AbstractButton)e.nextElement();
     367        for (Enumeration<AbstractButton> e = Main.map.toolGroup.getElements() ; e.hasMoreElements() ;) {
     368            AbstractButton x=e.nextElement();
    369369            x.setEnabled(((MapMode)x.getAction()).layerIsSupported(layer));
    370370        }
    … …  
    400400     *
    401401     * @return <code>true</code> if a zoom operation has been performed
    402      * @author Jan Peter Stotz
    403402     */
    404403    public boolean zoomToEditLayerBoundingBox() {

  • trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java

    r1372 r1415  
    33
    44import java.awt.Component;
    5 import java.awt.Dimension;
    65import java.awt.GridBagLayout;
    76import java.awt.event.ComponentEvent;

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

    r1414 r1415  
    3232
    3333import javax.swing.Box;
    34 import javax.swing.DefaultComboBoxModel;
    3534import javax.swing.DefaultListCellRenderer;
    3635import javax.swing.JComboBox;
    … …  
    259258        }
    260259
    261         Main.ds.fireSelectionChanged(sel);
     260        DataSet.fireSelectionChanged(sel);
    262261        selectionChanged(sel); // update whole table
    263262        Main.parent.repaint(); // repaint all - drawing could have been changed
    … …  
    342341            return;
    343342        Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, value));
    344         Main.ds.fireSelectionChanged(sel);
     343        DataSet.fireSelectionChanged(sel);
    345344        selectionChanged(sel); // update table
    346345        Main.parent.repaint(); // repaint all - drawing could have been changed
    … …  
    366365    }
    367366    private String objKey;
    368     /**
    369      * @return
    370      */
     367
    371368    private TreeMap<String, TreeSet<String>> createAutoCompletionInfo(
    372369            boolean edit) {
    … …  
    399396        Collection<OsmPrimitive> sel = Main.ds.getSelected();
    400397        Main.main.undoRedo.add(new ChangePropertyCommand(sel, key, null));
    401         Main.ds.fireSelectionChanged(sel);
     398        DataSet.fireSelectionChanged(sel);
    402399        selectionChanged(sel); // update table
    403400
    … …  
    582579                            }
    583580                            Main.main.undoRedo.add(new ChangeCommand(cur, rel));
    584                             Main.ds.fireSelectionChanged(sel);
     581                            DataSet.fireSelectionChanged(sel);
    585582                            selectionChanged(sel); // update whole table
    586583                        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java

    r1378 r1415  
    66import java.awt.BorderLayout;
    77import java.awt.Dimension;
    8 import java.awt.FlowLayout;
    98import java.awt.GridBagLayout;
    109import java.awt.GridLayout;
    … …  
    110109    private final JTable memberTable = new JTable(memberData);
    111110
    112     // =================== FIXME FIXME FIXME =====================
     111    // =================== FIXME =====================
    113112    // As soon as API 0.5 is dead, drop all the collation stuff from here ...
    114113
    … …  
    208207        this.relation = relation;
    209208
    210         ordered = Main.pref.get("osm-server.version", "0.5").equals("0.6");
     209        ordered = !Main.pref.get("osm-server.version", "0.5").equals("0.5");
    211210
    212211        if (relation == null) {
    … …  
    248247        });
    249248
    250         /* I don't like this text any more. Let's just get on with doing the specialist
    251          * editors instead of talking about it.
    252         JLabel help = new JLabel("<html><em>"+
    253             tr("This is the basic relation editor which allows you to change the relation's tags " +
    254             "as well as the members. In addition to this we should have a smart editor that " +
    255             "detects the type of relationship and limits your choices in a sensible way.")+"</em></html>");
    256         getContentPane().add(help, BorderLayout.NORTH);
    257          */
    258249        try { setAlwaysOnTop(true); } catch (SecurityException sx) {}
    259250
    … …  
    326317        bothTables.add(new JScrollPane(propertyTable), GBC.eop().fill(GBC.BOTH));
    327318        bothTables.add(status = new JLabel(tr("Members")), GBC.eol().fill(GBC.HORIZONTAL));
     319        // this is not exactly pretty but the four buttons simply don't fit in one line.
     320        // we should have smaller buttons for situations like this.
     321        JPanel buttonPanel = new JPanel(new GridLayout(2,ordered ? 3 : 2));
     322
    328323        if (ordered) {
    329             JPanel upDownPanel = new JPanel();
    330             upDownPanel.setLayout(new BoxLayout(upDownPanel, BoxLayout.Y_AXIS));
    331 
    332             upDownPanel.add(createButton(null, "moveup", tr("Move the currently selected members up"),
    333                     KeyEvent.VK_U, new ActionListener() {
     324            buttonPanel.add(createButton(null, "moveup", tr("Move the currently selected members up"), KeyEvent.VK_U, new ActionListener() {
    334325                public void actionPerformed(ActionEvent e) {
    335326                    moveMembers(-1);
    336327                }
    337328            }));
    338             upDownPanel.add(createButton(null, "movedown", tr("Move the currently selected members down"),
    339                     KeyEvent.VK_N, new ActionListener() {
    340                 public void actionPerformed(ActionEvent e) {
    341                     moveMembers(1);
    342                 }
    343             }));
    344 
    345 
    346             bothTables.add(new JScrollPane(memberTable), GBC.std().fill(GBC.BOTH));
    347             bothTables.add(upDownPanel, GBC.eol().fill(GBC.VERTICAL));
    348         } else {
    349             bothTables.add(new JScrollPane(memberTable), GBC.eol().fill(GBC.BOTH));
    350         }
    351 
    352         // this is not exactly pretty but the four buttons simply don't fit in one line.
    353         // we should have smaller buttons for situations like this.
    354         JPanel buttonPanel = new JPanel(new GridLayout(2,2));
     329        }
     330        bothTables.add(new JScrollPane(memberTable), GBC.eol().fill(GBC.BOTH));
    355331
    356332        buttonPanel.add(createButton(marktr("Add Selected"),"addselected",
    … …  
    367343            }
    368344        }));
     345
     346        if(ordered) {
     347            buttonPanel.add(createButton(null, "movedown", tr("Move the currently selected members down"), KeyEvent.VK_N, new ActionListener() {
     348                public void actionPerformed(ActionEvent e) {
     349                    moveMembers(1);
     350                }
     351            }));
     352        }
    369353
    370354        buttonPanel.add(createButton(marktr("Remove"),"remove",
    … …  
    382366        }));
    383367
    384         /*buttonPanel.add(createButton(marktr("Select"),"select",
    385         tr("Highlight the member from the current table row as JOSM's selection"), KeyEvent.VK_S, new ActionListener() {
    386             public void actionPerformed(ActionEvent e) {
    387                 ArrayList<OsmPrimitive> sel;
    388                 int cnt = memberTable.getSelectedRowCount();
    389                 if(cnt > 0)
    390                 {
    391                     sel = new ArrayList<OsmPrimitive>(cnt);
    392                     for (int i : memberTable.getSelectedRows())
    393                         sel.add((OsmPrimitive)memberTable.getValueAt(i, 1));
    394                 }
    395                 else
    396                 {
    397                     cnt = memberTable.getRowCount();
    398                     sel = new ArrayList<OsmPrimitive>(cnt);
    399                     for (int i = 0; i < cnt; ++i)
    400                         sel.add((OsmPrimitive)memberTable.getValueAt(i, 1));
    401                 }
    402                 Main.ds.setSelected(sel);
    403             }
    404         }));*/
    405368        buttonPanel.add(createButton(marktr("Download Members"),"downloadincomplete",
    406369        tr("Download all incomplete ways and nodes in relation"), KeyEvent.VK_L, new ActionListener() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r1331 r1415  
    1919import javax.swing.ListSelectionModel;
    2020import javax.swing.event.ListSelectionListener;
    21 import javax.swing.event.ListSelectionEvent;
    22 
    2321import org.openstreetmap.josm.Main;
    24 import org.openstreetmap.josm.actions.AutoScaleAction;
    2522import org.openstreetmap.josm.command.DeleteCommand;
    2623import org.openstreetmap.josm.data.osm.DataSet;

  • trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

    r1345 r1415  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
    6 import java.awt.Color;
    76import java.awt.Dimension;
    87import java.awt.GridBagLayout;
    … …  
    1211import java.awt.event.KeyEvent;
    1312import java.awt.event.KeyListener;
    14 import java.awt.event.MouseAdapter;
    15 import java.util.HashMap;
    1613
    1714import javax.swing.JLabel;
    … …  
    2421
    2522import org.openstreetmap.josm.data.Bounds;
    26 import org.openstreetmap.josm.data.coor.LatLon;
    2723import org.openstreetmap.josm.tools.GBC;
    2824import org.openstreetmap.josm.tools.OsmUrlToBounds;
    … …  
    8783            public void keyPressed(KeyEvent keyEvent) {}
    8884            public void keyReleased(KeyEvent keyEvent) {
    89                 if (keyEvent.getKeyCode() == keyEvent.VK_ENTER && parseURL(gui))
     85                if (keyEvent.getKeyCode() == KeyEvent.VK_ENTER && parseURL(gui))
    9086                    gui.closeDownloadDialog(true);
    9187            }

  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r1353 r1415  
    4141import org.openstreetmap.josm.actions.SaveAction;
    4242import org.openstreetmap.josm.actions.SaveAsAction;
    43 import org.openstreetmap.josm.command.Command;
    4443import org.openstreetmap.josm.data.coor.EastNorth;
    4544import org.openstreetmap.josm.data.coor.LatLon;
    … …  
    222221    @Override public void mergeFrom(final Layer from) {
    223222        final MergeVisitor visitor = new MergeVisitor(data,((OsmDataLayer)from).data);
    224 //        int i=0;
    225         int max = ((OsmDataLayer)from).data.allPrimitives().size();
    226 
    227 //        System.out.format("Add/Merge data:");
    228 
    229223        for (final OsmPrimitive osm : ((OsmDataLayer)from).data.allPrimitives()) {
    230224//            i++;

  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

    r1245 r1415  
    129129
    130130    /**
    131      * Find the closest track point within the pixelTolerance of the screen point pNear
    132      * @param pNear : the point in screen coordinates near which to find a track point
    133      * @param pixelTolerance : only accept the point if within this number of pixels of en
    134      * @return the nearest trackpoint or null if nothing nearby
    135      *
    136      * XXX seems unused, F.R. 2008-03-15
    137     private WayPoint getClosestTrackPoint(Point pNear, double pixelTolerance) {
    138         WayPoint cw = null;
    139         AudioMarker recentlyPlayedMarker = AudioMarker.recentlyPlayedMarker();
    140         if (recentlyPlayedMarker != null) {
    141             // Find the track point closest to letting go of the play head
    142             double minDistance = pixelTolerance;
    143             GpxLayer trackLayer = recentlyPlayedMarker.parentLayer.fromLayer;
    144             if (trackLayer.data.tracks == null)
    145                 return null;
    146 
    147             for (GpxTrack track : trackLayer.data.tracks) {
    148                 if (track.trackSegs == null)
    149                     continue;
    150 
    151                 for (Collection<WayPoint> trackseg : track.trackSegs) {
    152                     for (WayPoint w : trackseg) {
    153                         Point p = Main.map.mapView.getPoint(w.eastNorth);
    154                         double distance = p.distance(pNear);
    155                         if (distance <= minDistance) {
    156                             cw = w;
    157                             minDistance = distance;
    158                         }
    159                     }
    160                 }
    161             }
    162         }
    163         return cw;
    164     }
    165     */
    166 
    167     /**
    168131     * reposition the play head at the point on the track nearest position given,
    169132     * providing we are within reasonable distance from the track; otherwise reset to the

  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

    r1313 r1415  
    1111import org.openstreetmap.josm.data.osm.OsmPrimitive;
    1212import org.openstreetmap.josm.data.osm.OsmUtils;
    13 import org.openstreetmap.josm.data.osm.Relation;
    14 import org.openstreetmap.josm.data.osm.Way;
    1513import org.openstreetmap.josm.Main;
    1614

  • trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java

    r1243 r1415  
    22package org.openstreetmap.josm.gui.preferences;
    33
    4 import static org.openstreetmap.josm.tools.I18n.marktr;
    54import static org.openstreetmap.josm.tools.I18n.tr;
    65
    … …  
    1312import java.util.regex.Matcher;
    1413import java.util.regex.Pattern;
    15 import java.util.ArrayList;
    16 import java.util.Collections;
    1714import java.util.HashMap;
    18 import java.util.List;
    1915import java.util.Map;
    2016import java.util.Map.Entry;
    … …  
    3329import javax.swing.table.TableCellRenderer;
    3430import javax.swing.BorderFactory;
    35 import javax.swing.Box;
    3631
    3732import org.openstreetmap.josm.Main;
    3833import org.openstreetmap.josm.data.osm.visitor.MapPaintVisitor;
    3934import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
    40 import org.openstreetmap.josm.gui.layer.GpxLayer;
    41 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    4235import org.openstreetmap.josm.gui.MapScaler;
    4336import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
    … …  
    7770                colorKeyList.put(getName(key), key);
    7871        }
    79         for (Entry k : colorKeyList.entrySet()) {
     72        for (Entry<String, String> k : colorKeyList.entrySet()) {
    8073            Vector<Object> row = new Vector<Object>(2);
    8174            row.add(k.getValue());
    … …  
    8376            tableModel.addRow(row);
    8477        }
    85         for (Entry k : colorKeyList_mappaint.entrySet()) {
     78        for (Entry<String, String> k : colorKeyList_mappaint.entrySet()) {
    8679            Vector<Object> row = new Vector<Object>(2);
    8780            row.add(k.getValue());

  • trunk/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java

    r1180 r1415  
    5555
    5656        JPanel panel = null;
    57         for(PreferenceSetting s : gui.settings)
     57        for(PreferenceSetting s : PreferenceDialog.settings)
    5858        {
    5959            if(s instanceof LafPreference)

  • trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

    r1326 r1415  
    2222import javax.swing.Scrollable;
    2323
    24 import org.openstreetmap.josm.Main;
    2524import org.openstreetmap.josm.plugins.PluginDownloader;
    2625import org.openstreetmap.josm.plugins.PluginSelection;

  • trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

    r1326 r1415  
    77import java.awt.GridBagLayout;
    88import java.awt.ScrollPane;
    9 import java.awt.event.ActionEvent;
    10 import java.awt.event.ActionListener;
    119import java.util.Collection;
    1210import java.util.Iterator;
    … …  
    5654     */
    5755    public JPanel createPreferenceTab(String icon, String title, String desc) {
    58         return createPreferenceTab(icon, title, desc, true);
     56        return createPreferenceTab(icon, title, desc, false);
    5957    }
    6058

  • trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

    r1399 r1415  
    1111import java.util.Collection;
    1212import java.util.HashMap;
    13 import java.util.StringTokenizer;
    1413
    1514import javax.swing.BorderFactory;

  • trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

    r1360 r1415  
    99import java.awt.Image;
    1010import java.awt.event.ActionEvent;
    11 import java.awt.event.ActionListener;
    1211import java.io.BufferedReader;
    1312import java.io.InputStreamReader;
    … …  
    2726import javax.swing.Action;
    2827import javax.swing.ImageIcon;
    29 import javax.swing.JButton;
    3028import javax.swing.JComboBox;
    3129import javax.swing.JComponent;
    … …  
    5048import org.openstreetmap.josm.tools.GBC;
    5149import org.openstreetmap.josm.tools.ImageProvider;
    52 import org.openstreetmap.josm.tools.OpenBrowser;
    5350import org.openstreetmap.josm.tools.UrlLabel;
    5451import org.openstreetmap.josm.tools.XmlObjectParser;
Note: See TracChangeset for help on using the changeset viewer.