Changeset 529 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2008-01-30T18:02:38+01:00 (16 years ago)

Author:

gebner

Message:

Part one of patch by Dave Hansen <dave@…>

• Remove unused imports
• Main.debug
• Make attribute merging aware of TIGER-import attributes
• Better upload progress information
• Retry uploads

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ConflictResolver.java (modified) (2 diffs)
• MainApplet.java (modified) (1 diff)
• MainMenu.java (modified) (2 diffs)
• layer/RawGpsLayer.java (modified) (5 diffs)
• mappaint/MapPaintStyles.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java

@@ -23 +23 @@
 import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -35 +34 @@
 import javax.swing.table.TableModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.ConflictItem;
 import org.openstreetmap.josm.data.conflict.DeleteConflict;

trunk/src/org/openstreetmap/josm/gui/MainApplet.java

@@ -128 +128 @@
                 applet.setStub(new AppletStub() {
                         public void appletResize(int w, int h) {
-                                frame.resize(w, h);
+                                frame.setSize(w, h);
                         }
 

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.InputEvent;
-import java.awt.event.KeyEvent;
-
-import javax.swing.Action;
+
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenu;
@@ -46 +43 @@
 import org.openstreetmap.josm.actions.search.SearchAction;
 import org.openstreetmap.josm.data.DataSetChecker;
-import org.openstreetmap.josm.data.Preferences;
 
 /**

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.awt.CheckboxGroup;
 import java.awt.Color;
 import java.awt.Component;
@@ -14 +13 @@
 import java.awt.event.ActionListener;
 import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.UnknownHostException;
 import java.util.Collection;
-import java.util.LinkedList;
 
 import javax.swing.AbstractAction;
@@ -32 +26 @@
 import javax.swing.JCheckBox;
 import javax.swing.JColorChooser;
-import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
@@ -40 +33 @@
 import javax.swing.JSeparator;
 import javax.swing.JTextField;
-import javax.swing.filechooser.FileFilter;
 
 import org.openstreetmap.josm.Main;
@@ -56 +48 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.io.MultiPartFormOutputStream;
-import org.openstreetmap.josm.io.OsmWriter;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.DontShowAgainInfo;

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;