Index: /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 4191) @@ -22,6 +22,4 @@ // remember input from last time private String text; - - //static private final Logger logger = Logger.getLogger(AddNodeAction.class.getName()); public AddNodeAction() { Index: /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 4191) @@ -8,5 +8,4 @@ import java.awt.event.KeyEvent; import java.util.concurrent.Future; -import java.util.logging.Logger; import org.openstreetmap.josm.Main; @@ -27,7 +26,4 @@ */ public class DownloadAction extends JosmAction { - @SuppressWarnings("unused") - private static final Logger logger = Logger.getLogger(DownloadAction.class.getName()); - public DownloadAction() { super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."), Index: /trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 4191) @@ -8,5 +8,4 @@ import java.awt.event.KeyEvent; import java.util.LinkedList; -import java.util.logging.Logger; import javax.swing.JOptionPane; @@ -37,6 +36,4 @@ */ public class UploadAction extends JosmAction{ - @SuppressWarnings("unused") - static private Logger logger = Logger.getLogger(UploadAction.class.getName()); /** * The list of upload hooks. These hooks will be called one after the other Index: /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 4191) @@ -39,6 +39,4 @@ */ public class UploadSelectionAction extends JosmAction{ - //static private Logger logger = Logger.getLogger(UploadSelectionAction.class.getName()); - public UploadSelectionAction() { super( Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (revision 4191) @@ -7,5 +7,4 @@ import java.util.Collection; import java.util.concurrent.Future; -import java.util.logging.Logger; import org.openstreetmap.josm.Main; @@ -31,6 +30,4 @@ */ public class DownloadOsmTask extends AbstractDownloadTask { - private static final Logger logger = Logger.getLogger(DownloadOsmTask.class.getName()); - private Bounds currentBounds; private DataSet downloadedData; @@ -92,5 +89,5 @@ } catch(Exception e) { if (isCanceled()) { - logger.warning(tr("Ignoring exception because download has been cancelled. Exception was: {0}", e.toString())); + System.out.println(tr("Ignoring exception because download has been cancelled. Exception was: {0}", e.toString())); return; } Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (revision 4191) @@ -60,6 +60,4 @@ */ public class DrawAction extends MapMode implements MapViewPaintable, SelectionChangedListener, AWTEventListener { - //static private final Logger logger = Logger.getLogger(DrawAction.class.getName()); - final private Cursor cursorJoinNode; final private Cursor cursorJoinWay; Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 4191) @@ -61,6 +61,4 @@ */ public class SelectAction extends MapMode implements SelectionEnded { - //static private final Logger logger = Logger.getLogger(SelectAction.class.getName()); - enum Mode { move, rotate, scale, select } @@ -401,6 +399,4 @@ @Override public void mousePressed(MouseEvent e) { - debug("mousePressed: e.getPoint()=" + e.getPoint()); - // return early if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || e.getButton() != MouseEvent.BUTTON1) { @@ -470,6 +466,4 @@ @Override public void mouseReleased(MouseEvent e) { - debug("mouseReleased: e.getPoint()=" + e.getPoint()); - if (!mv.isActiveLayerVisible()) { return; @@ -567,9 +561,4 @@ OsmPrimitive nxt = null; - debug("cyclePrims(): entry....."); - for (OsmPrimitive osm : prims) { - debug("cyclePrims(): prims id=" + osm.getId()); - } - if (prims.size() > 1) { boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0; @@ -583,5 +572,4 @@ if (cyclePrims && shift) { if (!(nxt = i.next()).isSelected()) { - debug("cyclePrims(): taking " + nxt.getId()); break; // take first primitive in prims list not in sel } @@ -593,5 +581,4 @@ nxt = i.hasNext() ? i.next() : first; } - debug("selectPrims(): taking " + nxt.getId()); break; // take next primitive in prims list } @@ -606,9 +593,7 @@ ds.clearSelection(prims); cycleStart = foundInDS; - debug("selectPrims(): cycleStart set to foundInDS=" + cycleStart.getId()); } else if (cycleStart.equals(nxt)) { // loop detected, insert deselect step ds.addSelected(nxt); - debug("selectPrims(): cycleStart hit"); } } else { @@ -616,11 +601,8 @@ nxt = (prims.contains(cycleStart)) ? cycleStart : first; cycleStart = nxt; - debug("selectPrims(): cycleStart set to nxt=" + cycleStart.getId()); } } else { cycleStart = null; } - - debug("cyclePrims(): truncated prims list to id=" + nxt.getId()); } @@ -701,7 +683,3 @@ return l instanceof OsmDataLayer; } - - private static void debug(String s) { - //System.err.println("SelectAction:" + s); - } } Index: /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (revision 4191) @@ -43,5 +43,4 @@ @Override public boolean executeCommand() { if (position < 0 || position >= relation.getMembersCount()) { - Main.debug("error changing the role"); return false; } Index: /trunk/src/org/openstreetmap/josm/command/Command.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/Command.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/command/Command.java (revision 4191) @@ -121,9 +121,6 @@ if (o != null) return o; - Main.debug("unable to find osm with id: " + osm.getId() + " hashCode: " + osm.hashCode()); for (OsmPrimitive t : cloneMap.keySet()) { PrimitiveData to = cloneMap.get(t); - Main.debug("now: " + t.getId() + " hashCode: " + t.hashCode()); - Main.debug("orig: " + to.getUniqueId() + " hashCode: " + to.hashCode()); } return o; Index: /trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 4191) @@ -3,6 +3,4 @@ import static org.openstreetmap.josm.tools.I18n.tr; - -import java.util.logging.Logger; import org.openstreetmap.josm.Main; @@ -20,6 +18,4 @@ */ public abstract class ConflictResolveCommand extends Command { - private static final Logger logger = Logger.getLogger(ConflictResolveCommand.class.getName()); - /** the list of resolved conflicts */ private ConflictCollection resolvedConflicts; @@ -65,5 +61,5 @@ if (! Main.map.mapView.hasLayer(getLayer())) { - logger.warning(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", + System.out.println(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), getLayer().toString() Index: unk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (revision 4190) +++ (revision ) @@ -1,236 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.command; - -import static org.openstreetmap.josm.tools.I18n.tr; -import static org.openstreetmap.josm.tools.I18n.trn; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Map.Entry; -import java.util.logging.Logger; - -import javax.swing.JLabel; - -import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.data.conflict.ConflictCollection; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.osm.PrimitiveData; -import org.openstreetmap.josm.data.osm.Relation; -import org.openstreetmap.josm.data.osm.Way; -import org.openstreetmap.josm.gui.DefaultNameFormatter; -import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import org.openstreetmap.josm.tools.ImageProvider; - -/** - * Physically removes an {@see OsmPrimitive} from the dataset of the edit - * layer and disconnects any references from {@see Way}s or {@see Relation}s - * to this primitive. - * - * This command is necessary if a local {@see OsmPrimitive} has been deleted on - * the server by another user and if the local user decides to delete his version - * too. If he only deleted it "logically" JOSM would try to delete it on the server - * which would result in an non resolvable conflict. - * - */ -@Deprecated -public class PurgePrimitivesCommand extends ConflictResolveCommand{ - - static private final Logger logger = Logger.getLogger(PurgePrimitivesCommand.class.getName()); - - /** the primitives to purge */ - private Collection toPurge; - - /** the set of primitives to purge as consequence of purging - * {@see #primitive}, including {@see #primitive} - */ - private Set purgedPrimitives; - - private Map origVersionsOfTouchedPrimitives; - - protected void init(Collection toPurge) { - this.toPurge = toPurge; - this.purgedPrimitives = new HashSet(); - this.origVersionsOfTouchedPrimitives = new HashMap(); - } - - /** - * constructor - * @param primitive the primitive to purge - * - */ - public PurgePrimitivesCommand(OsmPrimitive primitive) { - init(Collections.singleton(primitive)); - } - - /** - * constructor - * @param layer the OSM data layer - * @param primitive the primitive to purge - * - */ - public PurgePrimitivesCommand(OsmDataLayer layer, OsmPrimitive primitive) { - super(layer); - init(Collections.singleton(primitive)); - } - - /** - * constructor - * @param layer the OSM data layer - * @param primitives the primitives to purge - * - */ - public PurgePrimitivesCommand(OsmDataLayer layer, Collection primitives) { - super(layer); - init(primitives); - } - - /** - * Replies a collection with the purged primitives - * - * @return a collection with the purged primitives - */ - public Collection getPurgedPrimitives() { - return purgedPrimitives; - } - - @Override public JLabel getDescription() { - if (purgedPrimitives.size() == 1) { - return new JLabel( - tr("Purged object ''{0}''", - purgedPrimitives.iterator().next().getDisplayName(DefaultNameFormatter.getInstance())), - ImageProvider.get("data", "object"), - JLabel.HORIZONTAL - ); - } else { - return new JLabel(trn("Purged {0} object", "Purged {0} objects", purgedPrimitives.size(), purgedPrimitives.size())); - } - } - - @Override public Collection getChildren() { - if (purgedPrimitives.size() == 1) - return null; - List children = new ArrayList(); - for (final OsmPrimitive osm : purgedPrimitives) { - children.add(new PseudoCommand() { - @Override public JLabel getDescription() { - return new JLabel( - tr("Purged object ''{0}''", - osm.getDisplayName(DefaultNameFormatter.getInstance())), - ImageProvider.get("data", "object"), - JLabel.HORIZONTAL - ); - } - @Override public Collection getParticipatingPrimitives() { - return Collections.singleton(osm); - } - - }); - } - return children; - } - - /** - * Purges an {@see OsmPrimitive} child from a {@see DataSet}. - * - * @param child the primitive to purge - * @param hive the hive of {@see OsmPrimitive}s we remember other {@see OsmPrimitive} - * we have to purge because we purge child. - * - */ - protected void removeReferecesToPrimitive(OsmPrimitive child, Set hive) { - hive.remove(child); - for (OsmPrimitive parent: child.getReferrers()) { - if (toPurge.contains(parent)) - // parent itself is to be purged. This method is going to be - // invoked for parent later - return; - if (parent instanceof Way) { - Way w = (Way)parent; - if (!origVersionsOfTouchedPrimitives.containsKey(w)) { - origVersionsOfTouchedPrimitives.put(w,w.save()); - } - w.removeNode((Node)child); - // if a way ends up with less than two nodes we - // remember it on the "hive" - // - if (w.getNodesCount() < 2) { - System.out.println(tr("Warning: Purging way {0} because number of nodes dropped below 2. Current is {1}", - w.getId(),w.getNodesCount())); - hive.add(w); - } - } else if (parent instanceof Relation) { - Relation r = (Relation)parent; - if (!origVersionsOfTouchedPrimitives.containsKey(r)) { - origVersionsOfTouchedPrimitives.put(r,r.save()); - } - System.out.println(tr("Removing reference from relation {0}",r.getId())); - r.removeMembersFor(child); - } else { - // should not happen. parent can't be a node - } - } - } - - @Override - public boolean executeCommand() { - HashSet hive = new HashSet(); - - // iteratively purge the primitive and all primitives - // which violate invariants after they lose a reference to - // the primitive (i.e. ways which end up with less than two - // nodes) - hive.addAll(toPurge); - while(! hive.isEmpty()) { - OsmPrimitive p = hive.iterator().next(); - removeReferecesToPrimitive(p, hive); - getLayer().data.removePrimitive(p); - purgedPrimitives.add(p); - ConflictCollection conflicts = getLayer().getConflicts(); - if (conflicts.hasConflictForMy(p)) { - rememberConflict(conflicts.getConflictForMy(p)); - conflicts.remove(p); - } - } - return super.executeCommand(); - } - - @Override - public void fillModifiedData(Collection modified, Collection deleted, - Collection added) { - } - - @Override - public void undoCommand() { - if (! Main.map.mapView.hasLayer(getLayer())) { - logger.warning(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", - this.toString(), - getLayer().toString() - )); - return; - } - Main.map.mapView.setActiveLayer(getLayer()); - - // restore purged primitives - // - for (OsmPrimitive purged : purgedPrimitives) { - getLayer().data.addPrimitive(purged); - } - - for (Entry entry: origVersionsOfTouchedPrimitives.entrySet()) { - entry.getKey().load(entry.getValue()); - } - - reconstituteConflicts(); - - // will restore the primitives referring to one - // of the purged primitives - super.undoCommand(); - } -} Index: /trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 4191) @@ -6,5 +6,4 @@ import java.util.Collection; import java.util.List; -import java.util.logging.Logger; import javax.swing.JLabel; @@ -23,6 +22,4 @@ */ public class RelationMemberConflictResolverCommand extends Command { - private static final Logger logger = Logger.getLogger(RelationMemberConflictResolverCommand.class.getName()); - /** my relation */ private final Relation my; @@ -82,5 +79,5 @@ public void undoCommand() { if (! Main.map.mapView.hasLayer(layer)) { - logger.warning(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", + System.out.println(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more", this.toString(), layer.toString() Index: /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/command/SequenceCommand.java (revision 4191) @@ -52,7 +52,4 @@ Command c = sequence[i]; boolean result = c.executeCommand(); - if (!result) { - Main.debug("SequenceCommand, executing command[" + i + "] " + c + " result: " + result); - } if (!result && !continueOnError) { this.undoCommands(i-1); Index: /trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (revision 4191) @@ -7,5 +7,4 @@ import java.util.Collection; import java.util.List; -import java.util.logging.Logger; import javax.swing.JLabel; @@ -23,7 +22,4 @@ */ public class TagConflictResolveCommand extends ConflictResolveCommand { - @SuppressWarnings("unused") - private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName()); - /** the conflict to resolve */ private Conflict conflict; Index: /trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (revision 4191) @@ -28,6 +28,4 @@ @Deprecated public class UndeletePrimitivesCommand extends ConflictResolveCommand { - //static private final Logger logger = Logger.getLogger(UndeletePrimitivesCommand.class.getName()); - /** the node to undelete */ private final List toUndelete = new ArrayList(); Index: /trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java =================================================================== --- /trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (revision 4191) @@ -6,5 +6,4 @@ import java.util.Collection; import java.util.List; -import java.util.logging.Logger; import javax.swing.JLabel; @@ -22,7 +21,4 @@ */ public class WayNodesConflictResolverCommand extends ConflictResolveCommand { - - static private final Logger logger = Logger.getLogger(WayNodesConflictResolverCommand.class.getName()); - /** the conflict to resolve */ private Conflict conflict; @@ -64,5 +60,5 @@ for (Node n:mergedNodeList) { if (! getLayer().data.getNodes().contains(n)) { - logger.warning(tr("Main dataset does not include node {0}", n.toString())); + System.out.println(tr("Main dataset does not include node {0}", n.toString())); } } Index: /trunk/src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 4191) @@ -12,5 +12,4 @@ import java.util.Set; import java.util.Stack; -import java.util.logging.Logger; import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException; @@ -279,6 +278,4 @@ */ private class RelationUploadDependencyGraph { - @SuppressWarnings("unused") - private final Logger logger = Logger.getLogger(RelationUploadDependencyGraph.class.getName()); private HashMap> children; private Collection relations; Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 4191) @@ -60,6 +60,4 @@ */ public class Preferences { - //static private final Logger logger = Logger.getLogger(Preferences.class.getName()); - /** * Internal storage for the preference directory. Index: /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 4191) @@ -20,5 +20,4 @@ import java.util.StringTokenizer; import java.util.Map.Entry; -//import java.util.logging.Logger; import javax.swing.JOptionPane; @@ -37,6 +36,4 @@ */ public class ServerSidePreferences extends Preferences { - //static private final Logger logger = Logger.getLogger(ServerSidePreferences.class.getName()); - public class MissingPassword extends Exception{ public String realm; Index: /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java (revision 4191) @@ -25,12 +25,8 @@ long shift = (NR_LEVELS*2)-2; - //if (debug) - // out("tile2xy(0x"+Long.toHexString(quad)+")"); double x = 0; double y = 0; for (int i = 0; i < NR_LEVELS; i++) { long bits = (quad >> shift) & 0x3; - //if (debug) - // out("shift: " + shift + " bits: " + bits); // remember x is the MSB if ((bits & 0x2) != 0) { Index: /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java (revision 4191) @@ -10,5 +10,4 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Logger; import javax.swing.SwingUtilities; @@ -35,7 +34,4 @@ */ public class ChangesetCache implements PreferenceChangedListener{ - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName()); - /** the unique instance */ static private final ChangesetCache instance = new ChangesetCache(); Index: /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (revision 4191) @@ -21,5 +21,5 @@ public class QuadBuckets implements Collection { - private static boolean debug = false; + //private static boolean debug = false; private static final boolean consistency_testing = false; private static final int NW_INDEX = 1; @@ -138,10 +138,10 @@ this.quad = parent.quad | this_quadpart; this.bbox = calculateBBox(); // calculateBBox reference quad - if (debug) { + /*if (debug) { out("new level["+this.level+"] bbox["+parent_index+"]: " + this.bbox() + " coor: " + this.coor() + " quadpart: " + Long.toHexString(this_quadpart) + " quad: " + Long.toHexString(this.quad)); - } + }*/ } @@ -189,18 +189,18 @@ int index = -1; for (LatLon c : bbox.points()) { - if (debug) { + /*if (debug) { out("getting index for point: " + c); - } + }*/ if (index == -1) { index = QuadTiling.index(c, level); - if (debug) { + /*if (debug) { out("set initial index to: " + index); - } + }*/ continue; } int another_index = QuadTiling.index(c, level); - if (debug) { + /*if (debug) { out("other point index: " + another_index); - } + }*/ if (another_index != index) return -1; @@ -215,9 +215,9 @@ */ void __split() { - if (debug) { + /*if (debug) { out("splitting "+this.bbox()+" level "+level+" with " + content.size() + " entries (my dimensions: " + this.bbox().width()+", "+this.bbox().height()+")"); - } + }*/ List tmpcontent = content; content = null; @@ -243,7 +243,7 @@ } ret = content.add(o); - if (debug && !this.isLeaf()) { + /*if (debug && !this.isLeaf()) { pout("added "+o.getClass().getName()+" to non-leaf with size: " + content.size()); - } + }*/ return ret; } @@ -256,7 +256,7 @@ private void search_contents(BBox search_bbox, List result) { - if (debug) { + /*if (debug) { out("searching contents (size: " + content == null?"":content.size() + ") for " + search_bbox); - } + }*/ /* * It is possible that this was created in a split @@ -271,7 +271,7 @@ } } - if (debug) { + /*if (debug) { out("done searching quad " + Long.toHexString(this.quad)); - } + }*/ } /* @@ -298,7 +298,7 @@ int nr = __nr-1; if (sibling == null) { - if (debug) { + /*if (debug) { out("[" + this.level + "] null child nr: " + nr); - } + }*/ continue; } @@ -306,19 +306,19 @@ // after us. if (sibling == this) { - if (debug) { + /*if (debug) { out("[" + this.level + "] I was child nr: " + nr); - } + }*/ found_me = true; continue; } if (found_me) { - if (debug) { + /*if (debug) { out("[" + this.level + "] next sibling was child nr: " + nr); - } + }*/ return sibling; } - if (debug) { + /*if (debug) { out("[" + this.level + "] nr: " + nr + " is before me, ignoring..."); - } + }*/ } return null; @@ -336,7 +336,7 @@ // a leaf or branch. while (sibling == null) { - if (debug) { + /*if (debug) { out("no siblings at level["+next.level+"], moving to parent"); - } + }*/ next = next.parent; if (next == null) { @@ -379,12 +379,12 @@ if (consistency_testing) { if (!matches(o, this.bbox())) { - out("-----------------------------"); - debug = true; + /*out("-----------------------------"); + debug = true;*/ get_index(o.getBBox(), level); get_index(o.getBBox(), level-1); int nr = 0; - for (QBLevel sibling : parent.getChildren()) { + /*for (QBLevel sibling : parent.getChildren()) { out("sibling["+ (nr++) +"]: " + sibling.bbox() + " this: " + (this==sibling)); - } + }*/ abort("\nobject " + o + " does not belong in node at level: " + level + " bbox: " + this.bbox()); } @@ -402,12 +402,12 @@ private void search(BBox search_bbox, List result) { - if (debug) { + /*if (debug) { System.out.print("[" + level + "] qb bbox: " + this.bbox() + " "); - } + }*/ if (!this.bbox().intersects(search_bbox)) { - if (debug) { + /*if (debug) { out("miss " + Long.toHexString(this.quad)); //QuadTiling.tile2xy(this.quad); - } + }*/ return; } else if (bbox().bounds(search_bbox)) { @@ -419,11 +419,8 @@ } - if (debug) { + /*if (debug) { out("hit " + this.quads()); - } - - if (debug) { out("[" + level + "] not leaf, moving down"); - } + }*/ //TODO Coincidence vector should be calculated here and only buckets that match search_bbox should be checked @@ -519,8 +516,8 @@ search_cache = null; size = 0; - if (debug) { + /*if (debug) { out("QuadBuckets() cleared: " + this); out("root: " + root + " level: " + root.level + " bbox: " + root.bbox()); - } + }*/ } public boolean add(T n) { @@ -532,5 +529,5 @@ public void unsupported() { - out("unsupported operation"); + System.out.println("unsupported operation"); throw new UnsupportedOperationException(); } @@ -592,7 +589,7 @@ a.add(n); } - if (debug) { + /*if (debug) { out("returning array list with size: " + a.size()); - } + }*/ return a; } @@ -625,7 +622,7 @@ public QuadBucketIterator(QuadBuckets qb) { - if (debug) { + /*if (debug) { out(this + " is a new iterator qb: " + qb + " size: " + qb.size()); - } + }*/ if (!qb.root.hasChildren() || qb.root.hasContent()) { current_node = qb.root; @@ -633,7 +630,7 @@ current_node = next_content_node(qb.root); } - if (debug) { + /*if (debug) { out("\titerator first leaf: " + current_node); - } + }*/ iterated_over = 0; } @@ -641,7 +638,7 @@ { if (this.peek() == null) { - if (debug) { + /*if (debug) { out(this + " no hasNext(), but iterated over so far: " + iterated_over); - } + }*/ return false; } @@ -651,14 +648,14 @@ { if (current_node == null) { - if (debug) { + /*if (debug) { out("null current leaf, nowhere to go"); - } + }*/ return null; } while((current_node.content == null) || (content_index >= current_node.content.size())) { - if (debug) { + /*if (debug) { out("moving to next leaf"); - } + }*/ content_index = 0; current_node = next_content_node(current_node); @@ -668,7 +665,7 @@ } if (current_node == null || current_node.content == null) { - if (debug) { + /*if (debug) { out("late nowhere to go " + current_node); - } + }*/ return null; } @@ -679,12 +676,12 @@ T ret = peek(); content_index++; - if (debug) { + /*if (debug) { out("iteration["+iterated_over+"] " + content_index + " leaf: " + current_node); - } + }*/ iterated_over++; if (ret == null) { - if (debug) { + /*if (debug) { out(this + " no next node, but iterated over so far: " + iterated_over); - } + }*/ } return ret; @@ -716,8 +713,8 @@ } public List search(BBox search_bbox) { - if (debug) { + /*if (debug) { out("qb root search at " + search_bbox); out("root bbox: " + root.bbox()); - } + }*/ List ret = new ArrayList(); // Doing this cuts down search cost on a real-life data @@ -732,15 +729,13 @@ // search while (search_cache != null && !search_cache.bbox().bounds(search_bbox)) { - if (debug) { + /*if (debug) { out("bbox: " + search_bbox); - } - if (debug) { out("search_cache: " + search_cache + " level: " + search_cache.level); out("search_cache.bbox(): " + search_cache.bbox()); - } + }*/ search_cache = search_cache.parent; - if (debug) { + /*if (debug) { out("new search_cache: " + search_cache); - } + }*/ } @@ -764,7 +759,7 @@ tmp = tmp.parent; } - if (debug) { + /*if (debug) { out("search of QuadBuckets for " + search_bbox + " ret len: " + ret.size()); - } + }*/ return ret; } Index: /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java (revision 4191) @@ -22,6 +22,4 @@ */ public class HistoryDataSet implements LayerChangeListener{ - //private final static Logger logger = Logger.getLogger(HistoryDataSet.class.getName()); - /** the unique instance */ private static HistoryDataSet historyDataSet; Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (revision 4191) @@ -8,5 +8,4 @@ import java.util.Collection; import java.util.List; -import java.util.logging.Logger; import org.openstreetmap.josm.Main; @@ -21,6 +20,4 @@ public class Multipolygon { - static private final Logger logger = Logger.getLogger(Multipolygon.class.getName()); - /** preference key for a collection of roles which indicate that the respective member belongs to an * outer polygon. Default is outer. Index: /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (revision 4191) @@ -5,5 +5,4 @@ import java.awt.EventQueue; import java.io.IOException; -import java.util.logging.Logger; import javax.swing.SwingUtilities; @@ -24,7 +23,4 @@ */ public abstract class PleaseWaitRunnable implements Runnable, CancelListener { - @SuppressWarnings("unused") - private final static Logger logger = Logger.getLogger(PleaseWaitRunnable.class.getName()); - private boolean cancelled = false; private boolean ignoreException; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (revision 4191) @@ -66,6 +66,4 @@ */ static public final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive"; - - //private static final Logger logger = Logger.getLogger(ConflictResolver.class.getName()); private JTabbedPane tabbedPane = null; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (revision 4191) @@ -63,6 +63,4 @@ */ public abstract class ListMergeModel extends Observable { - //private static final Logger logger = Logger.getLogger(ListMergeModel.class.getName()); - public static final String FROZEN_PROP = ListMergeModel.class.getName() + ".frozen"; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (revision 4191) @@ -46,6 +46,4 @@ */ public abstract class ListMerger extends JPanel implements PropertyChangeListener, Observer { - //private static final Logger logger = Logger.getLogger(ListMerger.class.getName()); - protected JTable myEntriesTable; protected JTable mergedEntriesTable; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java (revision 4191) @@ -19,6 +19,4 @@ public class NodeListMergeModel extends ListMergeModel{ - //private static final Logger logger = Logger.getLogger(NodeListMergeModel.class.getName()); - private DataSet myDataset; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (revision 4191) @@ -17,6 +17,4 @@ */ public class NodeListMerger extends ListMerger implements IConflictResolver { - //private static final Logger logger = Logger.getLogger(NodeListMerger.class.getName()); - public NodeListMerger() { super(new NodeListMergeModel()); Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java (revision 4191) @@ -21,6 +21,4 @@ */ public class RelationMemberListMergeModel extends ListMergeModel{ - //private static final Logger logger = Logger.getLogger(RelationMemberListMergeModel.class.getName()); - private DataSet myDataset; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (revision 4191) @@ -16,6 +16,4 @@ */ public class RelationMemberMerger extends ListMerger implements IConflictResolver { - //private static final Logger logger = Logger.getLogger(RelationMemberMerger.class.getName()); - @Override protected JScrollPane buildMyElementsTable() { Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (revision 4191) @@ -30,6 +30,4 @@ */ public class TagMergeModel extends DefaultTableModel { - //private static final Logger logger = Logger.getLogger(TagMergeModel.class.getName()); - static public final String PROP_NUM_UNDECIDED_TAGS = TagMergeModel.class.getName() + ".numUndecidedTags"; Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java (revision 4191) @@ -20,5 +20,4 @@ import java.util.List; import java.util.Map; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -429,7 +428,4 @@ static private class StatisticsInfoRenderer extends JLabel implements TableCellRenderer { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(StatisticsInfoRenderer.class.getName()); - protected void reset() { setIcon(null); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java (revision 4191) @@ -69,6 +69,4 @@ */ public class ChangesetDialog extends ToggleDialog{ - //static private final Logger logger = Logger.getLogger(ChangesetDialog.class.getName()); - private ChangesetInSelectionListModel inSelectionModel; private ChangesetsInActiveDataLayerListModel inActiveDataLayerModel; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (revision 4191) @@ -74,6 +74,4 @@ */ public class LayerListDialog extends ToggleDialog { - //static private final Logger logger = Logger.getLogger(LayerListDialog.class.getName()); - /** the unique instance of the dialog */ static private LayerListDialog instance; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (revision 4191) @@ -69,6 +69,4 @@ */ public class RelationListDialog extends ToggleDialog implements DataSetListener { - //private static final Logger logger = Logger.getLogger(RelationListDialog.class.getName()); - /** The display list. */ private JList displaylist; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (revision 4191) @@ -24,5 +24,4 @@ import java.util.List; import java.util.Set; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -86,7 +85,4 @@ */ public class SelectionListDialog extends ToggleDialog { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(SelectionListDialog.class.getName()); - private JList lstPrimitives; private SelectionListModel model; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java (revision 4191) @@ -22,6 +22,4 @@ public class ChangesetListModel extends DefaultListModel implements ChangesetCacheListener{ - //static private final Logger logger = Logger.getLogger(ChangesetListModel.class.getName()); - private final List data = new ArrayList(); private final Storage shownChangesets = new Storage(true); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (revision 4191) @@ -54,6 +54,4 @@ */ public class ChildRelationBrowser extends JPanel { - //static private final Logger logger = Logger.getLogger(ChildRelationBrowser.class.getName()); - /** the tree with relation children */ private RelationTree childTree; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 4191) @@ -30,5 +30,4 @@ import java.util.Map; import java.util.Set; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -87,7 +86,4 @@ */ public class GenericRelationEditor extends RelationEditor { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(GenericRelationEditor.class.getName()); - /** the tag table and its model */ private TagEditorPanel tagEditorPanel; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (revision 4191) @@ -3,5 +3,4 @@ import java.awt.Component; -import java.util.logging.Logger; import javax.swing.AbstractCellEditor; @@ -14,7 +13,4 @@ public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor { - @SuppressWarnings("unused") - static private Logger logger = Logger.getLogger(MemberRoleCellEditor.class.getName()); - private AutoCompletingTextField editor = null; private DataSet ds; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java (revision 4191) @@ -7,5 +7,4 @@ import java.awt.Dialog; import java.io.IOException; -import java.util.logging.Logger; import javax.swing.JTree; @@ -35,7 +34,4 @@ */ public class RelationTree extends JTree { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(RelationTree.class.getName()); - /** * builds the UI Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java (revision 4191) @@ -23,6 +23,4 @@ */ public class RelationTreeModel implements TreeModel { - //private static final Logger logger = Logger.getLogger(RelationTreeModel.class.getName()); - /** the root relation */ private Relation root; Index: /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java (revision 4191) @@ -23,5 +23,4 @@ import java.util.ArrayList; import java.util.List; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -51,7 +50,4 @@ */ public class DownloadDialog extends JDialog { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(DownloadDialog.class.getName()); - /** the unique instance of the download dialog */ static private DownloadDialog instance; Index: /trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/download/TileSelection.java (revision 4191) @@ -6,5 +6,4 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.logging.Logger; import org.openstreetmap.josm.data.Bounds; @@ -20,6 +19,4 @@ */ public class TileSelection implements DownloadSelection, PropertyChangeListener { - private static final Logger logger = Logger.getLogger(TileSelection.class.getName()); - private TileSelectionBBoxChooser chooser; private DownloadDialog parent; Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (revision 4191) @@ -19,5 +19,4 @@ import java.util.Observable; import java.util.Observer; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -52,6 +51,4 @@ public class HelpBrowser extends JDialog { - static private final Logger logger = Logger.getLogger(HelpBrowser.class.getName()); - /** the unique instance */ private static HelpBrowser instance; @@ -281,5 +278,4 @@ url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, Locale.ENGLISH)); try { - logger.info("fetching url: " + url); content = reader.fetchHelpTopicContent(url, true); } catch(MissingHelpContentException e1) { Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (revision 4191) @@ -67,6 +67,4 @@ */ public class HistoryBrowserModel extends Observable implements LayerChangeListener, DataSetListener { - //private static Logger logger = Logger.getLogger(HistoryBrowserModel.class.getName()); - /** the history of an OsmPrimitive */ private History history; Index: /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java (revision 4191) @@ -7,5 +7,4 @@ import java.awt.Component; import java.awt.Font; -import java.util.logging.Logger; import javax.swing.JLabel; @@ -19,7 +18,4 @@ */ public class TagTableCellRenderer extends JLabel implements TableCellRenderer { - @SuppressWarnings("unused") - static private Logger logger = Logger.getLogger(TagTableCellRenderer.class.getName()); - public final static Color BGCOLOR_DIFFERENCE = new Color(255,197,197); Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 4191) @@ -13,5 +13,4 @@ import java.util.Observable; import java.util.Observer; -import java.util.logging.Logger; import javax.swing.JLabel; @@ -32,7 +31,4 @@ */ public class VersionInfoPanel extends JPanel implements Observer{ - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(VersionInfoPanel.class.getName()); - private PointInTimeType pointInTimeType; private HistoryBrowserModel model; Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 4191) @@ -27,6 +27,4 @@ */ public class VersionTable extends JTable implements Observer{ - //private static Logger logger = Logger.getLogger(VersionTable.class.getName()); - private VersionTablePopupMenu popupMenu; Index: /trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java (revision 4191) @@ -8,5 +8,4 @@ import java.text.SimpleDateFormat; import java.util.HashMap; -import java.util.logging.Logger; import javax.swing.ImageIcon; @@ -27,8 +26,4 @@ */ public class VersionTableCellRenderer extends JLabel implements TableCellRenderer { - - @SuppressWarnings("unused") - static private Logger logger = Logger.getLogger(VersionTableCellRenderer.class.getName()); - public final static Color BGCOLOR_SELECTED = new Color(143,170,255); public final static Color BGCOLOR_IS_REFERENCE_POINT = new Color(255,197,197); Index: /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (revision 4191) @@ -10,5 +10,4 @@ import java.util.Collections; import java.util.Date; -import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -35,6 +34,4 @@ public abstract class AbstractUploadTask extends PleaseWaitRunnable { - private static final Logger logger = Logger.getLogger(AbstractUploadTask.class.getName()); - public AbstractUploadTask(String title, boolean ignoreException) { super(title, ignoreException); @@ -273,5 +270,5 @@ return; } - logger.warning(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader())); + System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader())); handleUploadConflictForUnknownConflict(); } @@ -290,5 +287,5 @@ return; } - logger.warning(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader())); + System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader())); ExceptionDialogUtil.explainPreconditionFailed(e); } Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (revision 4191) @@ -9,5 +9,4 @@ import java.util.List; import java.util.Set; -import java.util.logging.Logger; import javax.swing.SwingUtilities; @@ -32,7 +31,4 @@ public class DownloadPrimitivesTask extends PleaseWaitRunnable { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName()); - private DataSet ds; private boolean canceled; Index: /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java (revision 4191) @@ -9,5 +9,4 @@ import java.util.Collection; import java.util.Collections; -import java.util.logging.Logger; import javax.swing.SwingUtilities; @@ -34,7 +33,4 @@ */ public class UpdatePrimitivesTask extends PleaseWaitRunnable { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName()); - private DataSet ds; private boolean canceled; Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 4191) @@ -18,5 +18,4 @@ import java.util.List; import java.util.Map; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -54,6 +53,4 @@ */ public class UploadDialog extends JDialog implements PropertyChangeListener, PreferenceChangedListener{ - protected static final Logger logger = Logger.getLogger(UploadDialog.class.getName()); - /** the unique instance of the upload dialog */ static private UploadDialog uploadDialog; Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java (revision 4191) @@ -10,5 +10,4 @@ import java.beans.PropertyChangeListener; import java.text.MessageFormat; -import java.util.logging.Logger; import javax.swing.BorderFactory; @@ -27,7 +26,4 @@ public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener{ - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(UploadParameterSummaryPanel.class.getName()); - private UploadStrategySpecification spec = new UploadStrategySpecification(); private int numObjects; Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (revision 4191) @@ -11,5 +11,4 @@ import java.util.Collection; import java.util.HashSet; -import java.util.logging.Logger; import javax.swing.JOptionPane; @@ -40,7 +39,4 @@ */ public class UploadPrimitivesTask extends AbstractUploadTask { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(UploadPrimitivesTask.class.getName()); - private boolean uploadCancelled = false; private Exception lastException = null; Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 4191) @@ -81,6 +81,4 @@ */ public class OsmDataLayer extends Layer implements Listener, SelectionChangedListener { - // static private final Logger logger = Logger.getLogger(OsmDataLayer.class.getName()); - static public final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk"; static public final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer"; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java (revision 4191) @@ -28,6 +28,4 @@ */ public class NodeElemStyle extends ElemStyle { - //static private final Logger logger = Logger.getLogger(NodeElemStyle.class.getName()); - public ImageIcon icon; public int iconAlpha; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java (revision 4191) @@ -20,6 +20,4 @@ */ public class TextElement { - //static private final Logger logger = Logger.getLogger(TextElement.class.getName()); - static private final LabelCompositionStrategy AUTO_LABEL_COMPOSITION_STRATEGY = new DeriveLabelFromNameTagsCompositionStrategy(); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java (revision 4191) @@ -47,6 +47,4 @@ public static class FunctionExpression implements Expression { - //static Logger logger = Logger.getLogger(FunctionExpression.class.getName()); - String name; List args; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java (revision 4191) @@ -28,5 +28,4 @@ public static class AssignmentInstruction extends Instruction { - //static private final Logger logger = Logger.getLogger(AssignmentInstruction.class.getName()); public final String key; public final Object val; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 4191) @@ -30,6 +30,4 @@ public class MapCSSStyleSource extends StyleSource { - //static private final Logger logger = Logger.getLogger(MapCSSStyleSource.class.getName()); - final public List rules; private Color backgroundColorOverride; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 4191) @@ -47,5 +47,4 @@ */ public static class ChildOrParentSelector implements Selector { - //static private final Logger logger = Logger.getLogger(ChildOrParentSelector.class.getName()); private final Selector left; private final LinkSelector link; Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.java (revision 4191) @@ -2093,5 +2093,5 @@ } - private java.util.List jj_expentries = new java.util.ArrayList(); + private java.util.List jj_expentries = new java.util.ArrayList(); private int[] jj_expentry; private int jj_kind = -1; Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (revision 4191) @@ -22,5 +22,4 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -55,7 +54,4 @@ */ public class OAuthAuthorizationWizard extends JDialog { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(OAuthAuthorizationWizard.class.getName()); - private HtmlPanel pnlMessage; private boolean canceled; Index: /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java (revision 4191) @@ -17,5 +17,4 @@ import java.util.Map; import java.util.Map.Entry; -import java.util.logging.Logger; import oauth.signpost.OAuth; @@ -37,7 +36,4 @@ public class OsmOAuthAuthorizationClient { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(OsmOAuthAuthorizationClient.class.getName()); - private OAuthParameters oauthProviderParameters; private OAuthConsumer consumer; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java (revision 4191) @@ -20,5 +20,4 @@ import java.util.LinkedList; import java.util.List; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -56,7 +55,4 @@ public class PluginPreference implements PreferenceSetting { - @SuppressWarnings("unused") - private final static Logger logger = Logger.getLogger(PluginPreference.class.getName()); - public static class Factory implements PreferenceSettingFactory { public PreferenceSetting createPreferenceSetting() { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 4191) @@ -14,5 +14,4 @@ import java.util.LinkedList; import java.util.List; -import java.util.logging.Logger; import javax.swing.BorderFactory; @@ -40,7 +39,4 @@ */ public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(PreferenceTabbedPane.class.getName()); - /** * Allows PreferenceSettings to do validation of entered values when ok was pressed. @@ -223,5 +219,4 @@ public void buildGui() { for (PreferenceSettingFactory factory : settingsFactory) { - // logger.info("creating settings: " + factory); PreferenceSetting setting = factory.createPreferenceSetting(); if (setting != null) { @@ -235,5 +230,4 @@ try { PreferenceSetting settings = it.next(); - //logger.info("adding gui: " + settings); settings.addGui(this); } catch (SecurityException e) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 4191) @@ -10,5 +10,4 @@ import java.awt.event.ActionListener; import java.util.List; -import java.util.logging.Logger; import javax.swing.JCheckBox; @@ -25,7 +24,4 @@ public class PluginListPanel extends VerticallyScrollablePanel{ - @SuppressWarnings("unused") - private static final Logger logger = Logger.getLogger(PluginListPanel.class.getName()); - private PluginPreferencesModel model; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java (revision 4191) @@ -14,5 +14,4 @@ import java.util.Set; import java.util.Map.Entry; -import java.util.logging.Logger; import org.openstreetmap.josm.Main; @@ -21,7 +20,4 @@ public class PluginPreferencesModel extends Observable{ - @SuppressWarnings("unused") - private final static Logger logger = Logger.getLogger(PluginPreferencesModel.class.getName()); - private final ArrayList availablePlugins = new ArrayList(); private final ArrayList displayedPlugins = new ArrayList(); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java (revision 4191) @@ -3,6 +3,4 @@ import static org.openstreetmap.josm.tools.I18n.tr; - -import java.util.logging.Logger; import org.openstreetmap.josm.data.Preferences; @@ -14,7 +12,4 @@ public class OAuthAccessTokenHolder { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(OAuthAccessTokenHolder.class.getName()); - private static OAuthAccessTokenHolder instance; Index: /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java (revision 4191) @@ -16,5 +16,4 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -45,7 +44,4 @@ */ public class OAuthAuthenticationPreferencesPanel extends JPanel implements PropertyChangeListener { - @SuppressWarnings("unused") - private static final Logger logger = Logger.getLogger(OAuthAuthenticationPreferencesPanel.class.getName()); - private JPanel pnlAuthorisationMessage; private NotYetAuthorisedPanel pnlNotYetAuthorised; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (revision 4191) @@ -3,5 +3,4 @@ import java.awt.Component; -import java.util.logging.Logger; import javax.swing.AbstractCellEditor; @@ -19,7 +18,4 @@ @SuppressWarnings("serial") public class TagCellEditor extends AbstractCellEditor implements TableCellEditor{ - - /** the logger object */ - static private Logger logger = Logger.getLogger(TagCellEditor.class.getName()); protected AutoCompletingTextField editor = null; @@ -52,5 +48,4 @@ if (autoCompletionList == null) - //logger.warning("autoCompletionList is null. Make sure an instance of AutoCompletionList is injected into TableCellEditor."); return; autoCompletionList.clear(); @@ -80,5 +75,4 @@ protected void initAutoCompletionListForValues(String forKey) { if (autoCompletionList == null) { - logger.warning("autoCompletionList is null. Make sure an instance of AutoCompletionList is injected into TableCellEditor."); return; } @@ -115,5 +109,4 @@ return editor; } else { - logger.warning("column this table cell editor is requested for is out of range. column=" + column); return null; } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java (revision 4191) @@ -6,5 +6,4 @@ import java.awt.Component; import java.awt.Font; -import java.util.logging.Logger; import javax.swing.JLabel; @@ -21,7 +20,4 @@ */ public class TagCellRenderer extends JLabel implements TableCellRenderer { - @SuppressWarnings("unused") - private static final Logger logger = Logger.getLogger(TagCellRenderer.class.getName()); - private Font fontStandard = null; private Font fontItalic = null; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java (revision 4191) @@ -13,5 +13,4 @@ import java.util.List; import java.util.Map; -import java.util.logging.Logger; import javax.swing.DefaultListSelectionModel; @@ -32,7 +31,4 @@ @SuppressWarnings("serial") public class TagEditorModel extends AbstractTableModel { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(TagEditorModel.class.getName()); - static public final String PROP_DIRTY = TagEditorModel.class.getName() + ".dirty"; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java (revision 4191) @@ -9,5 +9,4 @@ import java.util.Map; import java.util.Map.Entry; -import java.util.logging.Logger; import javax.swing.BoxLayout; @@ -33,6 +32,4 @@ */ public class TagEditorPanel extends JPanel { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(TagEditorPanel.class.getName()); /** the tag editor model */ private TagEditorModel model; Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java (revision 4191) @@ -23,6 +23,4 @@ import java.util.EventObject; import java.util.concurrent.CopyOnWriteArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -50,7 +48,4 @@ */ public class TagTable extends JTable { - - private static final Logger logger = Logger.getLogger(TagTable.class.getName()); - /** the table cell editor used by this table */ private TagCellEditor editor = null; @@ -410,5 +405,5 @@ public void setAutoCompletionManager(AutoCompletionManager autocomplete) { if (autocomplete == null) { - logger.warning("argument autocomplete should not be null. Aborting."); + System.out.println("argument autocomplete should not be null. Aborting."); Thread.dumpStack(); return; @@ -432,7 +427,5 @@ public void addOKAccelatorListener(KeyListener l) { addKeyListener(l); - if (editor == null) { - logger.warning("editor is null. cannot register OK accelator listener."); - } else { + if (editor != null) { editor.getEditor().addKeyListener(l); } @@ -481,5 +474,5 @@ robot.mouseMove(before.x, before.y); } catch(AWTException e) { - logger.log(Level.SEVERE, "failed to simulate mouse click event at (" + r.x + "," + r.y + "). Exception: " + e.toString()); + System.out.println("Failed to simulate mouse click event at (" + r.x + "," + r.y + "). Exception: " + e.toString()); return; } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (revision 4191) @@ -8,5 +8,4 @@ import java.awt.event.KeyEvent; import java.util.EventObject; -import java.util.logging.Logger; import javax.swing.ComboBoxEditor; @@ -34,7 +33,4 @@ */ public class AutoCompletingTextField extends JTextField implements ComboBoxEditor, TableCellEditor { - @SuppressWarnings("unused") - static private Logger logger = Logger.getLogger(AutoCompletingTextField.class.getName()); - /** * The document model for the editor Index: /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 4191) @@ -13,5 +13,4 @@ import java.util.Collections; import java.util.List; -import java.util.logging.Logger; import org.openstreetmap.josm.Main; @@ -24,7 +23,4 @@ */ public class DefaultProxySelector extends ProxySelector { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(DefaultProxySelector.class.getName()); - /** * The {@see ProxySelector} provided by the JDK will retrieve proxy information Index: /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 4191) @@ -13,5 +13,4 @@ import java.util.NoSuchElementException; import java.util.Set; -import java.util.logging.Logger; import org.openstreetmap.josm.data.osm.DataSet; @@ -50,6 +49,4 @@ */ public class MultiFetchServerObjectReader extends OsmServerReader{ - - static final private Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName()); /** * the max. number of primitives retrieved in one step. Assuming IDs with 7 digits, @@ -361,5 +358,5 @@ } catch(OsmApiException e) { if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) { - logger.warning(tr("Server replied with response code 404 for id {0}. Skipping.", Long.toString(id))); + System.out.println(tr("Server replied with response code 404 for id {0}. Skipping.", Long.toString(id))); missingPrimitives.add(new SimplePrimitiveId(id, type)); continue; @@ -416,5 +413,5 @@ } catch(OsmApiException e) { if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) { - logger.warning(tr("Server replied with response code 404, retrying with an individual request for each object.")); + System.out.println(tr("Server replied with response code 404, retrying with an individual request for each object.")); singleGetIdPackage(type, pkg, progressMonitor); } else Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java (revision 4191) @@ -23,5 +23,4 @@ import java.util.Collections; import java.util.HashMap; -import java.util.logging.Logger; import javax.xml.parsers.ParserConfigurationException; @@ -52,6 +51,4 @@ */ public class OsmApi extends OsmConnection { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(OsmApi.class.getName()); /** max number of retries to send a request in case of HTTP 500 errors or timeouts */ static public final int DEFAULT_MAX_NUM_RETRIES = 5; Index: /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java (revision 4191) @@ -9,5 +9,4 @@ import java.util.LinkedList; import java.util.List; -import java.util.logging.Logger; import javax.xml.parsers.ParserConfigurationException; @@ -40,7 +39,4 @@ */ public class OsmChangesetParser { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(OsmChangesetParser.class.getName()); - private List changesets; Index: /trunk/src/org/openstreetmap/josm/io/OsmConnection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmConnection.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/OsmConnection.java (revision 4191) @@ -11,5 +11,4 @@ import java.nio.charset.Charset; import java.nio.charset.CharsetEncoder; -//import java.util.logging.Logger; import oauth.signpost.OAuthConsumer; @@ -31,7 +30,4 @@ */ public class OsmConnection { - @SuppressWarnings("unused") - //private static final Logger logger = Logger.getLogger(OsmConnection.class.getName()); - protected boolean cancel = false; protected HttpURLConnection activeConnection; Index: /trunk/src/org/openstreetmap/josm/io/OsmReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/OsmReader.java (revision 4191) @@ -12,6 +12,4 @@ import java.util.List; import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; import javax.xml.parsers.ParserConfigurationException; @@ -51,6 +49,4 @@ */ public class OsmReader { - static private final Logger logger = Logger.getLogger(OsmReader.class.getName()); - /** * The dataset to add parsed objects to. @@ -208,5 +204,5 @@ } if (currentPrimitive.isDeleted()) { - logger.info(tr("Deleted way {0} contains nodes", currentPrimitive.getUniqueId())); + System.out.println(tr("Deleted way {0} contains nodes", currentPrimitive.getUniqueId())); } else { list.add(id); @@ -259,5 +255,5 @@ if (currentPrimitive.isDeleted()) { - logger.info(tr("Deleted relation {0} contains members", currentPrimitive.getUniqueId())); + System.out.println(tr("Deleted relation {0} contains members", currentPrimitive.getUniqueId())); } else { list.add(emd); @@ -450,5 +446,5 @@ } if (n.isDeleted()) { - logger.warning(tr("Deleted node {0} is part of way {1}", id, w.getId())); + System.out.println(tr("Deleted node {0} is part of way {1}", id, w.getId())); } else { wayNodes.add(n); @@ -457,8 +453,6 @@ w.setNodes(wayNodes); if (w.hasIncompleteNodes()) { - if (logger.isLoggable(Level.FINE)) { - logger.fine(tr("Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data.", - externalWayId, w.getNodesCount())); - } + System.out.println(tr("Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data.", + externalWayId, w.getNodesCount())); } ds.addPrimitive(w); @@ -538,5 +532,5 @@ } if (primitive.isDeleted()) { - logger.warning(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId())); + System.out.println(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId())); } else { relationMembers.add(new RelationMember(rm.role, primitive)); Index: /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (revision 4191) @@ -11,5 +11,4 @@ import java.net.MalformedURLException; import java.net.URL; -import java.util.logging.Logger; import java.util.zip.GZIPInputStream; import java.util.zip.Inflater; @@ -30,6 +29,4 @@ */ public abstract class OsmServerReader extends OsmConnection { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(OsmServerReader.class.getName()); private OsmApi api = OsmApi.getOsmApi(); private boolean doAuthenticate = false; Index: /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (revision 4191) @@ -11,5 +11,4 @@ import java.util.LinkedList; import java.util.List; -import java.util.logging.Logger; import org.openstreetmap.josm.data.osm.Changeset; @@ -29,7 +28,4 @@ */ public class OsmServerWriter { - @SuppressWarnings("unused") - static private final Logger logger = Logger.getLogger(OsmServerWriter.class.getName()); - /** * This list contains all successfully processed objects. The caller of Index: /trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java (revision 4191) @@ -6,5 +6,4 @@ import java.util.HashMap; import java.util.Map; -import java.util.logging.Logger; import org.openstreetmap.josm.Main; @@ -17,6 +16,4 @@ */ public class DefaultAuthenticator extends Authenticator { - @SuppressWarnings("unused") - private static final Logger logger = Logger.getLogger(DefaultAuthenticator.class.getName()); private static DefaultAuthenticator instance; Index: unk/src/org/openstreetmap/josm/io/remotecontrol/PermissionPref.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/PermissionPref.java (revision 4190) +++ (revision ) @@ -1,25 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.io.remotecontrol; - -/** - * Contains a preference name to control permission for the operation - * implemented by the RequestHandler, and an error message to be displayed - * if not permitted. - * - * Use @see PermissionPrefWithDefault instead of this class. - * - * @author Bodo Meissner - */ - @Deprecated -public class PermissionPref { - /** name of the preference setting to permit the remote operation */ - public String pref; - /** message to be displayed if operation is not permitted */ - public String message; - - public PermissionPref(String pref, String message) - { - this.pref = pref; - this.message = message; - } -} Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/PermissionPrefWithDefault.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/PermissionPrefWithDefault.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/PermissionPrefWithDefault.java (revision 4191) @@ -3,21 +3,23 @@ /** - * This class should replace PermissionPref because it allows explicit - * specification of the permission's default value. + * Contains a preference name to control permission for the operation + * implemented by the RequestHandler, and an error message to be displayed + * if not permitted. * * @author Bodo Meissner */ -@SuppressWarnings("deprecation") -public class PermissionPrefWithDefault extends PermissionPref { +public class PermissionPrefWithDefault { + + /** name of the preference setting to permit the remote operation */ + public String pref; + /** message to be displayed if operation is not permitted */ + public String message; public boolean defaultVal = true; public PermissionPrefWithDefault(String pref, boolean defaultVal, String message) { - super(pref, message); + this.pref = pref; + this.message = message; this.defaultVal = defaultVal; } - - public PermissionPrefWithDefault(PermissionPref prefWithoutDefault) { - super(prefWithoutDefault.pref, prefWithoutDefault.message); - } } Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java (revision 4191) @@ -10,5 +10,4 @@ import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.io.remotecontrol.PermissionPref; import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault; @@ -82,6 +81,5 @@ * @return the preference name and error message or null */ - @SuppressWarnings("deprecation") - public PermissionPref getPermissionPref() + public PermissionPrefWithDefault getPermissionPref() { /* Example: @@ -104,5 +102,4 @@ * @throws RequestHandlerForbiddenException */ - @SuppressWarnings("deprecation") final public void checkPermission() throws RequestHandlerForbiddenException { @@ -114,19 +111,9 @@ * older versions of WMSPlugin. */ - PermissionPref permissionPref = getPermissionPref(); + PermissionPrefWithDefault permissionPref = getPermissionPref(); if((permissionPref != null) && (permissionPref.pref != null)) { - PermissionPrefWithDefault permissionPrefWithDefault; - if(permissionPref instanceof PermissionPrefWithDefault) - { - permissionPrefWithDefault = (PermissionPrefWithDefault) permissionPref; - } - else - { - permissionPrefWithDefault = new PermissionPrefWithDefault(permissionPref); - } - if (!Main.pref.getBoolean(permissionPrefWithDefault.pref, - permissionPrefWithDefault.defaultVal)) { - System.out.println(permissionPrefWithDefault.message); + if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) { + System.out.println(permissionPref.message); throw new RequestHandlerForbiddenException(); } Index: /trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java =================================================================== --- /trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 4190) +++ /trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java (revision 4191) @@ -15,5 +15,4 @@ import java.util.Collection; import java.util.LinkedList; -import java.util.logging.Logger; import org.openstreetmap.josm.Main; @@ -36,7 +35,4 @@ */ public class PluginDownloadTask extends PleaseWaitRunnable{ - @SuppressWarnings("unused") - private static final Logger logger = Logger.getLogger(PluginDownloadTask.class.getName()); - private final Collection toUpdate = new LinkedList(); private final Collection failed = new LinkedList();