Changeset 4191 in josm for trunk/src/org/openstreetmap


Ignore:
Timestamp:
2011-07-01T09:32:56+02:00 (13 years ago)
Author:
stoecker
Message:

remove old debug stuff

Location:
trunk/src/org/openstreetmap/josm
Files:
2 deleted
91 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

    r3656 r4191  
    2222    // remember input from last time
    2323    private String text;
    24 
    25     //static private final Logger logger = Logger.getLogger(AddNodeAction.class.getName());
    2624
    2725    public AddNodeAction() {

  • trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

    r2990 r4191  
    88import java.awt.event.KeyEvent;
    99import java.util.concurrent.Future;
    10 import java.util.logging.Logger;
    1110
    1211import org.openstreetmap.josm.Main;
    … …  
    2726 */
    2827public class DownloadAction extends JosmAction {
    29     @SuppressWarnings("unused")
    30     private static final Logger logger = Logger.getLogger(DownloadAction.class.getName());
    31 
    3228    public DownloadAction() {
    3329        super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),

  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r3671 r4191  
    88import java.awt.event.KeyEvent;
    99import java.util.LinkedList;
    10 import java.util.logging.Logger;
    1110
    1211import javax.swing.JOptionPane;
    … …  
    3736 */
    3837public class UploadAction extends JosmAction{
    39     @SuppressWarnings("unused")
    40     static private Logger logger = Logger.getLogger(UploadAction.class.getName());
    4138    /**
    4239     * The list of upload hooks. These hooks will be called one after the other

  • trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

    r3426 r4191  
    3939 */
    4040public class UploadSelectionAction extends JosmAction{
    41     //static private Logger logger = Logger.getLogger(UploadSelectionAction.class.getName());
    42 
    4341    public UploadSelectionAction() {
    4442        super(

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

    r3066 r4191  
    77import java.util.Collection;
    88import java.util.concurrent.Future;
    9 import java.util.logging.Logger;
    109
    1110import org.openstreetmap.josm.Main;
    … …  
    3130 */
    3231public class DownloadOsmTask extends AbstractDownloadTask {
    33     private static final Logger logger = Logger.getLogger(DownloadOsmTask.class.getName());
    34 
    3532    private Bounds currentBounds;
    3633    private DataSet downloadedData;
    … …  
    9289            } catch(Exception e) {
    9390                if (isCanceled()) {
    94                     logger.warning(tr("Ignoring exception because download has been cancelled. Exception was: {0}", e.toString()));
     91                    System.out.println(tr("Ignoring exception because download has been cancelled. Exception was: {0}", e.toString()));
    9592                    return;
    9693                }

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r4086 r4191  
    6060 */
    6161public class DrawAction extends MapMode implements MapViewPaintable, SelectionChangedListener, AWTEventListener {
    62     //static private final Logger logger = Logger.getLogger(DrawAction.class.getName());
    63 
    6462    final private Cursor cursorJoinNode;
    6563    final private Cursor cursorJoinWay;

  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r4152 r4191  
    6161 */
    6262public class SelectAction extends MapMode implements SelectionEnded {
    63     //static private final Logger logger = Logger.getLogger(SelectAction.class.getName());
    64 
    6563    enum Mode { move, rotate, scale, select }
    6664   
    … …  
    401399    @Override
    402400    public void mousePressed(MouseEvent e) {
    403         debug("mousePressed: e.getPoint()=" + e.getPoint());
    404 
    405401        // return early
    406402        if (!mv.isActiveLayerVisible() || !(Boolean) this.getValue("active") || e.getButton() != MouseEvent.BUTTON1) {
    … …  
    470466    @Override
    471467    public void mouseReleased(MouseEvent e) {
    472         debug("mouseReleased: e.getPoint()=" + e.getPoint());
    473 
    474468        if (!mv.isActiveLayerVisible()) {
    475469            return;
    … …  
    567561        OsmPrimitive nxt = null;
    568562
    569         debug("cyclePrims(): entry.....");
    570         for (OsmPrimitive osm : prims) {
    571             debug("cyclePrims(): prims id=" + osm.getId());
    572         }
    573 
    574563        if (prims.size() > 1) {
    575564            boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
    … …  
    583572                if (cyclePrims && shift) {
    584573                    if (!(nxt = i.next()).isSelected()) {
    585                         debug("cyclePrims(): taking " + nxt.getId());
    586574                        break; // take first primitive in prims list not in sel
    587575                    }
    … …  
    593581                            nxt = i.hasNext() ? i.next() : first;
    594582                        }
    595                         debug("selectPrims(): taking " + nxt.getId());
    596583                        break; // take next primitive in prims list
    597584                    }
    … …  
    606593                        ds.clearSelection(prims);
    607594                        cycleStart = foundInDS;
    608                         debug("selectPrims(): cycleStart set to foundInDS=" + cycleStart.getId());
    609595                    } else if (cycleStart.equals(nxt)) {
    610596                        // loop detected, insert deselect step
    611597                        ds.addSelected(nxt);
    612                         debug("selectPrims(): cycleStart hit");
    613598                    }
    614599                } else {
    … …  
    616601                    nxt = (prims.contains(cycleStart)) ? cycleStart : first;
    617602                    cycleStart = nxt;
    618                     debug("selectPrims(): cycleStart set to nxt=" + cycleStart.getId());
    619603                }
    620604            } else {
    621605                cycleStart = null;
    622606            }
    623 
    624             debug("cyclePrims(): truncated prims list to id=" + nxt.getId());
    625607        }
    626608
    … …  
    701683        return l instanceof OsmDataLayer;
    702684    }
    703 
    704     private static void debug(String s) {
    705         //System.err.println("SelectAction:" + s);
    706     }
    707685}

  • trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java

    r3262 r4191  
    4343    @Override public boolean executeCommand() {
    4444        if (position < 0 || position >= relation.getMembersCount()) {
    45             Main.debug("error changing the role");
    4645            return false;
    4746        }

  • trunk/src/org/openstreetmap/josm/command/Command.java

    r3262 r4191  
    121121        if (o != null)
    122122            return o;
    123         Main.debug("unable to find osm with id: " + osm.getId() + " hashCode: " + osm.hashCode());
    124123        for (OsmPrimitive t : cloneMap.keySet()) {
    125124            PrimitiveData to = cloneMap.get(t);
    126             Main.debug("now: " + t.getId() + " hashCode: " + t.hashCode());
    127             Main.debug("orig: " + to.getUniqueId() + " hashCode: " + to.hashCode());
    128125        }
    129126        return o;

  • trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java

    r3083 r4191  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
    5 
    6 import java.util.logging.Logger;
    75
    86import org.openstreetmap.josm.Main;
    … …  
    2018 */
    2119public abstract class ConflictResolveCommand extends Command {
    22     private static final Logger logger = Logger.getLogger(ConflictResolveCommand.class.getName());
    23 
    2420    /** the list of resolved conflicts */
    2521    private ConflictCollection resolvedConflicts;
    … …  
    6561
    6662        if (! Main.map.mapView.hasLayer(getLayer())) {
    67             logger.warning(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
     63            System.out.println(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
    6864                    this.toString(),
    6965                    getLayer().toString()

  • trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java

    r3262 r4191  
    66import java.util.Collection;
    77import java.util.List;
    8 import java.util.logging.Logger;
    98
    109import javax.swing.JLabel;
    … …  
    2322 */
    2423public class RelationMemberConflictResolverCommand extends Command {
    25     private static final Logger logger = Logger.getLogger(RelationMemberConflictResolverCommand.class.getName());
    26 
    2724    /** my relation */
    2825    private final Relation my;
    … …  
    8279    public void undoCommand() {
    8380        if (! Main.map.mapView.hasLayer(layer)) {
    84             logger.warning(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
     81            System.out.println(tr("Cannot undo command ''{0}'' because layer ''{1}'' is not present any more",
    8582                    this.toString(),
    8683                    layer.toString()

  • trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

    r3275 r4191  
    5252            Command c = sequence[i];
    5353            boolean result = c.executeCommand();
    54             if (!result) {
    55                 Main.debug("SequenceCommand, executing command[" + i + "] " +  c + " result: " + result);
    56             }
    5754            if (!result && !continueOnError) {
    5855                this.undoCommands(i-1);

  • trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

    r3262 r4191  
    77import java.util.Collection;
    88import java.util.List;
    9 import java.util.logging.Logger;
    109
    1110import javax.swing.JLabel;
    … …  
    2322 */
    2423public class TagConflictResolveCommand extends ConflictResolveCommand {
    25     @SuppressWarnings("unused")
    26     private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName());
    27 
    2824    /** the conflict to resolve */
    2925    private Conflict<? extends OsmPrimitive> conflict;

  • trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java

    r3995 r4191  
    2828@Deprecated
    2929public class UndeletePrimitivesCommand extends ConflictResolveCommand {
    30     //static private final Logger logger = Logger.getLogger(UndeletePrimitivesCommand.class.getName());
    31 
    3230    /** the node to undelete */
    3331    private final List<OsmPrimitive> toUndelete = new ArrayList<OsmPrimitive>();

  • trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java

    r3262 r4191  
    66import java.util.Collection;
    77import java.util.List;
    8 import java.util.logging.Logger;
    98
    109import javax.swing.JLabel;
    … …  
    2221 */
    2322public class WayNodesConflictResolverCommand extends ConflictResolveCommand {
    24 
    25     static private final Logger logger = Logger.getLogger(WayNodesConflictResolverCommand.class.getName());
    26 
    2723    /** the conflict to resolve */
    2824    private Conflict<Way> conflict;
    … …  
    6460        for (Node n:mergedNodeList) {
    6561            if (! getLayer().data.getNodes().contains(n)) {
    66                 logger.warning(tr("Main dataset does not include node {0}", n.toString()));
     62                System.out.println(tr("Main dataset does not include node {0}", n.toString()));
    6763            }
    6864        }

  • trunk/src/org/openstreetmap/josm/data/APIDataSet.java

    r4113 r4191  
    1212import java.util.Set;
    1313import java.util.Stack;
    14 import java.util.logging.Logger;
    1514
    1615import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
    … …  
    279278     */
    280279    private class RelationUploadDependencyGraph {
    281         @SuppressWarnings("unused")
    282         private final Logger logger = Logger.getLogger(RelationUploadDependencyGraph.class.getName());
    283280        private HashMap<Relation, Set<Relation>> children;
    284281        private Collection<Relation> relations;

  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r4162 r4191  
    6060 */
    6161public class Preferences {
    62     //static private final Logger logger = Logger.getLogger(Preferences.class.getName());
    63 
    6462    /**
    6563     * Internal storage for the preference directory.

  • trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java

    r3938 r4191  
    2020import java.util.StringTokenizer;
    2121import java.util.Map.Entry;
    22 //import java.util.logging.Logger;
    2322
    2423import javax.swing.JOptionPane;
    … …  
    3736 */
    3837public class ServerSidePreferences extends Preferences {
    39     //static private final Logger logger = Logger.getLogger(ServerSidePreferences.class.getName());
    40 
    4138    public class MissingPassword extends Exception{
    4239        public String realm;

  • trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java

    r3158 r4191  
    2525        long shift = (NR_LEVELS*2)-2;
    2626
    27         //if (debug)
    28         //    out("tile2xy(0x"+Long.toHexString(quad)+")");
    2927        double x = 0;
    3028        double y = 0;
    3129        for (int i = 0; i < NR_LEVELS; i++) {
    3230            long bits = (quad >> shift) & 0x3;
    33             //if (debug)
    34             //    out("shift: " + shift + " bits: " + bits);
    3531            // remember x is the MSB
    3632            if ((bits & 0x2) != 0) {

  • trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

    r3083 r4191  
    1010import java.util.Set;
    1111import java.util.concurrent.CopyOnWriteArrayList;
    12 import java.util.logging.Logger;
    1312
    1413import javax.swing.SwingUtilities;
    … …  
    3534 */
    3635public class ChangesetCache implements PreferenceChangedListener{
    37     @SuppressWarnings("unused")
    38     static private final Logger logger = Logger.getLogger(ChangesetCache.class.getName());
    39 
    4036    /** the unique instance */
    4137    static private final ChangesetCache instance = new ChangesetCache();

  • trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

    r4178 r4191  
    2121public class QuadBuckets<T extends OsmPrimitive> implements Collection<T>
    2222{
    23     private static boolean debug = false;
     23    //private static boolean debug = false;
    2424    private static final boolean consistency_testing = false;
    2525    private static final int NW_INDEX = 1;
    … …  
    138138            this.quad = parent.quad | this_quadpart;
    139139            this.bbox = calculateBBox(); // calculateBBox reference quad
    140             if (debug) {
     140            /*if (debug) {
    141141                out("new level["+this.level+"] bbox["+parent_index+"]: " + this.bbox()
    142142                        + " coor: " + this.coor()
    143143                        + " quadpart: " + Long.toHexString(this_quadpart)
    144144                        + " quad: " + Long.toHexString(this.quad));
    145             }
     145            }*/
    146146        }
    147147
    … …  
    189189            int index = -1;
    190190            for (LatLon c : bbox.points()) {
    191                 if (debug) {
     191                /*if (debug) {
    192192                    out("getting index for point: " + c);
    193                 }
     193                }*/
    194194                if (index == -1) {
    195195                    index = QuadTiling.index(c, level);
    196                     if (debug) {
     196                    /*if (debug) {
    197197                        out("set initial index to: " + index);
    198                     }
     198                    }*/
    199199                    continue;
    200200                }
    201201                int another_index = QuadTiling.index(c, level);
    202                 if (debug) {
     202                /*if (debug) {
    203203                    out("other point index: " + another_index);
    204                 }
     204                }*/
    205205                if (another_index != index)
    206206                    return -1;
    … …  
    215215         */
    216216        void __split() {
    217             if (debug) {
     217            /*if (debug) {
    218218                out("splitting "+this.bbox()+" level "+level+" with "
    219219                        + content.size() + " entries (my dimensions: "
    220220                        + this.bbox().width()+", "+this.bbox().height()+")");
    221             }
     221            }*/
    222222            List<T> tmpcontent = content;
    223223            content = null;
    … …  
    243243            }
    244244            ret = content.add(o);
    245             if (debug && !this.isLeaf()) {
     245            /*if (debug && !this.isLeaf()) {
    246246                pout("added "+o.getClass().getName()+" to non-leaf with size: " + content.size());
    247             }
     247            }*/
    248248            return ret;
    249249        }
    … …  
    256256        private void search_contents(BBox search_bbox, List<T> result)
    257257        {
    258             if (debug) {
     258            /*if (debug) {
    259259                out("searching contents (size: " + content == null?"<null>":content.size() + ") for " + search_bbox);
    260             }
     260            }*/
    261261            /*
    262262             * It is possible that this was created in a split
    … …  
    271271                }
    272272            }
    273             if (debug) {
     273            /*if (debug) {
    274274                out("done searching quad " + Long.toHexString(this.quad));
    275             }
     275            }*/
    276276        }
    277277        /*
    … …  
    298298                int nr = __nr-1;
    299299                if (sibling == null) {
    300                     if (debug) {
     300                    /*if (debug) {
    301301                        out("[" + this.level + "] null child nr: " + nr);
    302                     }
     302                    }*/
    303303                    continue;
    304304                }
    … …  
    306306                // after us.
    307307                if (sibling == this) {
    308                     if (debug) {
     308                    /*if (debug) {
    309309                        out("[" + this.level + "] I was child nr: " + nr);
    310                     }
     310                    }*/
    311311                    found_me = true;
    312312                    continue;
    313313                }
    314314                if (found_me) {
    315                     if (debug) {
     315                    /*if (debug) {
    316316                        out("[" + this.level + "] next sibling was child nr: " + nr);
    317                     }
     317                    }*/
    318318                    return sibling;
    319319                }
    320                 if (debug) {
     320                /*if (debug) {
    321321                    out("[" + this.level + "] nr: " + nr + " is before me, ignoring...");
    322                 }
     322                }*/
    323323            }
    324324            return null;
    … …  
    336336            // a leaf or branch.
    337337            while (sibling == null) {
    338                 if (debug) {
     338                /*if (debug) {
    339339                    out("no siblings at level["+next.level+"], moving to parent");
    340                 }
     340                }*/
    341341                next = next.parent;
    342342                if (next == null) {
    … …  
    379379            if (consistency_testing) {
    380380                if (!matches(o, this.bbox())) {
    381                     out("-----------------------------");
    382                     debug = true;
     381                    /*out("-----------------------------");
     382                    debug = true;*/
    383383                    get_index(o.getBBox(), level);
    384384                    get_index(o.getBBox(), level-1);
    385385                    int nr = 0;
    386                     for (QBLevel sibling : parent.getChildren()) {
     386                    /*for (QBLevel sibling : parent.getChildren()) {
    387387                        out("sibling["+ (nr++) +"]: " + sibling.bbox() + " this: " + (this==sibling));
    388                     }
     388                    }*/
    389389                    abort("\nobject " + o + " does not belong in node at level: " + level + " bbox: " + this.bbox());
    390390                }
    … …  
    402402        private void search(BBox search_bbox, List<T> result)
    403403        {
    404             if (debug) {
     404            /*if (debug) {
    405405                System.out.print("[" + level + "] qb bbox: " + this.bbox() + " ");
    406             }
     406            }*/
    407407            if (!this.bbox().intersects(search_bbox)) {
    408                 if (debug) {
     408                /*if (debug) {
    409409                    out("miss " + Long.toHexString(this.quad));
    410410                    //QuadTiling.tile2xy(this.quad);
    411                 }
     411                }*/
    412412                return;
    413413            } else if (bbox().bounds(search_bbox)) {
    … …  
    419419            }
    420420
    421             if (debug) {
     421            /*if (debug) {
    422422                out("hit " + this.quads());
    423             }
    424 
    425             if (debug) {
    426423                out("[" + level + "] not leaf, moving down");
    427             }
     424            }*/
    428425
    429426            //TODO Coincidence vector should be calculated here and only buckets that match search_bbox should be checked
    … …  
    519516        search_cache = null;
    520517        size = 0;
    521         if (debug) {
     518        /*if (debug) {
    522519            out("QuadBuckets() cleared: " + this);
    523520            out("root: " + root + " level: " + root.level + " bbox: " + root.bbox());
    524         }
     521        }*/
    525522    }
    526523    public boolean add(T n) {
    … …  
    532529    public void unsupported()
    533530    {
    534         out("unsupported operation");
     531        System.out.println("unsupported operation");
    535532        throw new UnsupportedOperationException();
    536533    }
    … …  
    592589            a.add(n);
    593590        }
    594         if (debug) {
     591        /*if (debug) {
    595592            out("returning array list with size: " + a.size());
    596         }
     593        }*/
    597594        return a;
    598595    }
    … …  
    625622        public QuadBucketIterator(QuadBuckets<T> qb)
    626623        {
    627             if (debug) {
     624            /*if (debug) {
    628625                out(this + " is a new iterator qb: " + qb + " size: " + qb.size());
    629             }
     626            }*/
    630627            if (!qb.root.hasChildren() || qb.root.hasContent()) {
    631628                current_node = qb.root;
    … …  
    633630                current_node = next_content_node(qb.root);
    634631            }
    635             if (debug) {
     632            /*if (debug) {
    636633                out("\titerator first leaf: " + current_node);
    637             }
     634            }*/
    638635            iterated_over = 0;
    639636        }
    … …  
    641638        {
    642639            if (this.peek() == null) {
    643                 if (debug) {
     640                /*if (debug) {
    644641                    out(this + " no hasNext(), but iterated over so far: " + iterated_over);
    645                 }
     642                }*/
    646643                return false;
    647644            }
    … …  
    651648        {
    652649            if (current_node == null) {
    653                 if (debug) {
     650                /*if (debug) {
    654651                    out("null current leaf, nowhere to go");
    655                 }
     652                }*/
    656653                return null;
    657654            }
    658655            while((current_node.content == null) ||
    659656                    (content_index >= current_node.content.size())) {
    660                 if (debug) {
     657                /*if (debug) {
    661658                    out("moving to next leaf");
    662                 }
     659                }*/
    663660                content_index = 0;
    664661                current_node = next_content_node(current_node);
    … …  
    668665            }
    669666            if (current_node == null || current_node.content == null) {
    670                 if (debug) {
     667                /*if (debug) {
    671668                    out("late nowhere to go " + current_node);
    672                 }
     669                }*/
    673670                return null;
    674671            }
    … …  
    679676            T ret = peek();
    680677            content_index++;
    681             if (debug) {
     678            /*if (debug) {
    682679                out("iteration["+iterated_over+"] " + content_index + " leaf: " + current_node);
    683             }
     680            }*/
    684681            iterated_over++;
    685682            if (ret == null) {
    686                 if (debug) {
     683                /*if (debug) {
    687684                    out(this + " no next node, but iterated over so far: " + iterated_over);
    688                 }
     685                }*/
    689686            }
    690687            return ret;
    … …  
    716713    }
    717714    public List<T> search(BBox search_bbox) {
    718         if (debug) {
     715        /*if (debug) {
    719716            out("qb root search at " + search_bbox);
    720717            out("root bbox: " + root.bbox());
    721         }
     718        }*/
    722719        List<T> ret = new ArrayList<T>();
    723720        // Doing this cuts down search cost on a real-life data
    … …  
    732729            // search
    733730            while (search_cache != null && !search_cache.bbox().bounds(search_bbox)) {
    734                 if (debug) {
     731                /*if (debug) {
    735732                    out("bbox: " + search_bbox);
    736                 }
    737                 if (debug) {
    738733                    out("search_cache: " + search_cache + " level: " + search_cache.level);
    739734                    out("search_cache.bbox(): " + search_cache.bbox());
    740                 }
     735                }*/
    741736                search_cache = search_cache.parent;
    742                 if (debug) {
     737                /*if (debug) {
    743738                    out("new search_cache: " + search_cache);
    744                 }
     739                }*/
    745740            }
    746741
    … …  
    764759            tmp = tmp.parent;
    765760        }
    766         if (debug) {
     761        /*if (debug) {
    767762            out("search of QuadBuckets for " + search_bbox + " ret len: " + ret.size());
    768         }
     763        }*/
    769764        return ret;
    770765    }

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

    r3083 r4191  
    2222 */
    2323public class HistoryDataSet implements LayerChangeListener{
    24     //private final static Logger logger = Logger.getLogger(HistoryDataSet.class.getName());
    25 
    2624    /** the unique instance */
    2725    private static HistoryDataSet historyDataSet;

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

    r4004 r4191  
    88import java.util.Collection;
    99import java.util.List;
    10 import java.util.logging.Logger;
    1110
    1211import org.openstreetmap.josm.Main;
    … …  
    2120
    2221public class Multipolygon {
    23     static private final Logger logger = Logger.getLogger(Multipolygon.class.getName());
    24 
    2522    /** preference key for a collection of roles which indicate that the respective member belongs to an
    2623     * <em>outer</em> polygon. Default is <tt>outer</tt>.

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

    r2990 r4191  
    55import java.awt.EventQueue;
    66import java.io.IOException;
    7 import java.util.logging.Logger;
    87
    98import javax.swing.SwingUtilities;
    … …  
    2423 */
    2524public abstract class PleaseWaitRunnable implements Runnable, CancelListener {
    26     @SuppressWarnings("unused")
    27     private final static Logger logger = Logger.getLogger(PleaseWaitRunnable.class.getName());
    28 
    2925    private boolean cancelled = false;
    3026    private boolean ignoreException;

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

    r3362 r4191  
    6666     */
    6767    static public final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
    68 
    69     //private static final Logger logger = Logger.getLogger(ConflictResolver.class.getName());
    7068
    7169    private JTabbedPane tabbedPane = null;

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

    r3995 r4191  
    6363 */
    6464public abstract class ListMergeModel<T> extends Observable {
    65     //private static final Logger logger = Logger.getLogger(ListMergeModel.class.getName());
    66 
    6765    public static final String FROZEN_PROP = ListMergeModel.class.getName() + ".frozen";
    6866

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

    r3719 r4191  
    4646 */
    4747public abstract class ListMerger<T> extends JPanel implements PropertyChangeListener, Observer {
    48     //private static final Logger logger = Logger.getLogger(ListMerger.class.getName());
    49 
    5048    protected JTable myEntriesTable;
    5149    protected JTable mergedEntriesTable;

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java

    r3083 r4191  
    1919
    2020public class NodeListMergeModel extends ListMergeModel<Node>{
    21     //private static final Logger logger = Logger.getLogger(NodeListMergeModel.class.getName());
    22 
    2321    private DataSet myDataset;
    2422

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

    r3719 r4191  
    1717 */
    1818public class NodeListMerger extends ListMerger<Node> implements IConflictResolver {
    19     //private static final Logger logger = Logger.getLogger(NodeListMerger.class.getName());
    20 
    2119    public NodeListMerger() {
    2220        super(new NodeListMergeModel());

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java

    r3083 r4191  
    2121 */
    2222public class RelationMemberListMergeModel extends ListMergeModel<RelationMember>{
    23     //private static final Logger logger = Logger.getLogger(RelationMemberListMergeModel.class.getName());
    24 
    2523    private DataSet myDataset;
    2624

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

    r3083 r4191  
    1616 */
    1717public class RelationMemberMerger extends ListMerger<RelationMember> implements IConflictResolver {
    18     //private static final Logger logger = Logger.getLogger(RelationMemberMerger.class.getName());
    19 
    2018    @Override
    2119    protected JScrollPane buildMyElementsTable() {

  • trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

    r3083 r4191  
    3030 */
    3131public class TagMergeModel extends DefaultTableModel {
    32     //private static final Logger logger = Logger.getLogger(TagMergeModel.class.getName());
    33 
    3432    static public final String PROP_NUM_UNDECIDED_TAGS = TagMergeModel.class.getName() + ".numUndecidedTags";
    3533

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

    r4072 r4191  
    2020import java.util.List;
    2121import java.util.Map;
    22 import java.util.logging.Logger;
    2322
    2423import javax.swing.AbstractAction;
    … …  
    429428
    430429    static private class StatisticsInfoRenderer extends JLabel implements TableCellRenderer {
    431         @SuppressWarnings("unused")
    432         static private final Logger logger = Logger.getLogger(StatisticsInfoRenderer.class.getName());
    433 
    434430        protected void reset() {
    435431            setIcon(null);

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

    r3416 r4191  
    6969 */
    7070public class ChangesetDialog extends ToggleDialog{
    71     //static private final Logger logger = Logger.getLogger(ChangesetDialog.class.getName());
    72 
    7371    private ChangesetInSelectionListModel inSelectionModel;
    7472    private ChangesetsInActiveDataLayerListModel inActiveDataLayerModel;

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

    r4072 r4191  
    7474 */
    7575public class LayerListDialog extends ToggleDialog {
    76     //static private final Logger logger = Logger.getLogger(LayerListDialog.class.getName());
    77 
    7876    /** the unique instance of the dialog */
    7977    static private LayerListDialog instance;

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

    r4158 r4191  
    6969 */
    7070public class RelationListDialog extends ToggleDialog implements DataSetListener {
    71     //private static final Logger logger = Logger.getLogger(RelationListDialog.class.getName());
    72 
    7371    /** The display list. */
    7472    private JList displaylist;

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

    r4138 r4191  
    2424import java.util.List;
    2525import java.util.Set;
    26 import java.util.logging.Logger;
    2726
    2827import javax.swing.AbstractAction;
    … …  
    8685 */
    8786public class SelectionListDialog extends ToggleDialog  {
    88     @SuppressWarnings("unused")
    89     static private final Logger logger = Logger.getLogger(SelectionListDialog.class.getName());
    90 
    9187    private JList lstPrimitives;
    9288    private SelectionListModel model;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java

    r3503 r4191  
    2222
    2323public class ChangesetListModel extends DefaultListModel  implements ChangesetCacheListener{
    24     //static private final Logger logger = Logger.getLogger(ChangesetListModel.class.getName());
    25 
    2624    private final List<Changeset> data = new ArrayList<Changeset>();
    2725    private final Storage<Changeset> shownChangesets = new Storage<Changeset>(true);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

    r3977 r4191  
    5454 */
    5555public class ChildRelationBrowser extends JPanel {
    56     //static private final Logger logger = Logger.getLogger(ChildRelationBrowser.class.getName());
    57 
    5856    /** the tree with relation children */
    5957    private RelationTree childTree;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r4154 r4191  
    3030import java.util.Map;
    3131import java.util.Set;
    32 import java.util.logging.Logger;
    3332
    3433import javax.swing.AbstractAction;
    … …  
    8786 */
    8887public class GenericRelationEditor extends RelationEditor  {
    89     @SuppressWarnings("unused")
    90     static private final Logger logger = Logger.getLogger(GenericRelationEditor.class.getName());
    91 
    9288    /** the tag table and its model */
    9389    private TagEditorPanel tagEditorPanel;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java

    r3479 r4191  
    33
    44import java.awt.Component;
    5 import java.util.logging.Logger;
    65
    76import javax.swing.AbstractCellEditor;
    … …  
    1413
    1514public class MemberRoleCellEditor extends AbstractCellEditor implements TableCellEditor {
    16     @SuppressWarnings("unused")
    17     static private Logger logger = Logger.getLogger(MemberRoleCellEditor.class.getName());
    18 
    1915    private AutoCompletingTextField editor = null;
    2016    private DataSet ds;

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java

    r3218 r4191  
    77import java.awt.Dialog;
    88import java.io.IOException;
    9 import java.util.logging.Logger;
    109
    1110import javax.swing.JTree;
    … …  
    3534 */
    3635public class RelationTree extends JTree {
    37     @SuppressWarnings("unused")
    38     static private final Logger logger = Logger.getLogger(RelationTree.class.getName());
    39 
    4036    /**
    4137     * builds the UI

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java

    r3083 r4191  
    2323 */
    2424public class RelationTreeModel implements TreeModel {
    25     //private static final Logger logger = Logger.getLogger(RelationTreeModel.class.getName());
    26 
    2725    /** the root relation */
    2826    private Relation root;

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

    r3976 r4191  
    2323import java.util.ArrayList;
    2424import java.util.List;
    25 import java.util.logging.Logger;
    2625
    2726import javax.swing.AbstractAction;
    … …  
    5150 */
    5251public class DownloadDialog extends JDialog  {
    53     @SuppressWarnings("unused")
    54     static private final Logger logger = Logger.getLogger(DownloadDialog.class.getName());
    55 
    5652    /** the unique instance of the download dialog */
    5753    static private DownloadDialog instance;

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

    r3105 r4191  
    66import java.beans.PropertyChangeEvent;
    77import java.beans.PropertyChangeListener;
    8 import java.util.logging.Logger;
    98
    109import org.openstreetmap.josm.data.Bounds;
    … …  
    2019 */
    2120public class TileSelection implements DownloadSelection, PropertyChangeListener {
    22     private static final Logger logger = Logger.getLogger(TileSelection.class.getName());
    23 
    2421    private TileSelectionBBoxChooser chooser;
    2522    private DownloadDialog parent;

  • trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

    r3975 r4191  
    1919import java.util.Observable;
    2020import java.util.Observer;
    21 import java.util.logging.Logger;
    2221
    2322import javax.swing.AbstractAction;
    … …  
    5251
    5352public class HelpBrowser extends JDialog {
    54     static private final Logger logger = Logger.getLogger(HelpBrowser.class.getName());
    55 
    5653    /** the unique instance */
    5754    private static HelpBrowser instance;
    … …  
    281278            url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, Locale.ENGLISH));
    282279            try {
    283                 logger.info("fetching url: " + url);
    284280                content = reader.fetchHelpTopicContent(url, true);
    285281            } catch(MissingHelpContentException e1) {

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

    r3221 r4191  
    6767 */
    6868public class HistoryBrowserModel extends Observable implements LayerChangeListener, DataSetListener {
    69     //private static Logger logger = Logger.getLogger(HistoryBrowserModel.class.getName());
    70 
    7169    /** the history of an OsmPrimitive */
    7270    private History history;

  • trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

    r4072 r4191  
    77import java.awt.Component;
    88import java.awt.Font;
    9 import java.util.logging.Logger;
    109
    1110import javax.swing.JLabel;
    … …  
    1918 */
    2019public class TagTableCellRenderer extends JLabel implements TableCellRenderer {
    21     @SuppressWarnings("unused")
    22     static private Logger logger = Logger.getLogger(TagTableCellRenderer.class.getName());
    23 
    2420    public final static Color BGCOLOR_DIFFERENCE = new Color(255,197,197);
    2521

  • trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

    r3083 r4191  
    1313import java.util.Observable;
    1414import java.util.Observer;
    15 import java.util.logging.Logger;
    1615
    1716import javax.swing.JLabel;
    … …  
    3231 */
    3332public class VersionInfoPanel extends JPanel implements Observer{
    34     @SuppressWarnings("unused")
    35     static private final Logger logger = Logger.getLogger(VersionInfoPanel.class.getName());
    36 
    3733    private PointInTimeType pointInTimeType;
    3834    private HistoryBrowserModel model;

  • trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

    r3443 r4191  
    2727 */
    2828public class VersionTable extends JTable implements Observer{
    29     //private static Logger logger = Logger.getLogger(VersionTable.class.getName());
    30 
    3129    private VersionTablePopupMenu popupMenu;
    3230

  • trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java

    r4072 r4191  
    88import java.text.SimpleDateFormat;
    99import java.util.HashMap;
    10 import java.util.logging.Logger;
    1110
    1211import javax.swing.ImageIcon;
    … …  
    2726 */
    2827public class VersionTableCellRenderer extends JLabel implements TableCellRenderer {
    29 
    30     @SuppressWarnings("unused")
    31     static private Logger logger = Logger.getLogger(VersionTableCellRenderer.class.getName());
    32 
    3328    public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
    3429    public final static Color BGCOLOR_IS_REFERENCE_POINT = new Color(255,197,197);

  • trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

    r3754 r4191  
    1010import java.util.Collections;
    1111import java.util.Date;
    12 import java.util.logging.Logger;
    1312import java.util.regex.Matcher;
    1413import java.util.regex.Pattern;
    … …  
    3534
    3635public abstract class AbstractUploadTask extends PleaseWaitRunnable {
    37     private static final Logger logger = Logger.getLogger(AbstractUploadTask.class.getName());
    38 
    3936    public AbstractUploadTask(String title, boolean ignoreException) {
    4037        super(title, ignoreException);
    … …  
    273270            return;
    274271        }
    275         logger.warning(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader()));
     272        System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader()));
    276273        handleUploadConflictForUnknownConflict();
    277274    }
    … …  
    290287            return;
    291288        }
    292         logger.warning(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader()));
     289        System.out.println(tr("Warning: error header \"{0}\" did not match with an expected pattern", e.getErrorHeader()));
    293290        ExceptionDialogUtil.explainPreconditionFailed(e);
    294291    }

  • trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java

    r4090 r4191  
    99import java.util.List;
    1010import java.util.Set;
    11 import java.util.logging.Logger;
    1211
    1312import javax.swing.SwingUtilities;
    … …  
    3231
    3332public class DownloadPrimitivesTask extends PleaseWaitRunnable {
    34     @SuppressWarnings("unused")
    35     static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName());
    36 
    3733    private DataSet ds;
    3834    private boolean canceled;

  • trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java

    r3083 r4191  
    99import java.util.Collection;
    1010import java.util.Collections;
    11 import java.util.logging.Logger;
    1211
    1312import javax.swing.SwingUtilities;
    … …  
    3433 */
    3534public class UpdatePrimitivesTask extends PleaseWaitRunnable {
    36     @SuppressWarnings("unused")
    37     static private final Logger logger = Logger.getLogger(UpdatePrimitivesTask.class.getName());
    38 
    3935    private DataSet ds;
    4036    private boolean canceled;

  • trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

    r3770 r4191  
    1818import java.util.List;
    1919import java.util.Map;
    20 import java.util.logging.Logger;
    2120
    2221import javax.swing.AbstractAction;
    … …  
    5453 */
    5554public class UploadDialog extends JDialog implements PropertyChangeListener, PreferenceChangedListener{
    56     protected static final Logger logger = Logger.getLogger(UploadDialog.class.getName());
    57 
    5855    /**  the unique instance of the upload dialog */
    5956    static private UploadDialog uploadDialog;

  • trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java

    r3120 r4191  
    1010import java.beans.PropertyChangeListener;
    1111import java.text.MessageFormat;
    12 import java.util.logging.Logger;
    1312
    1413import javax.swing.BorderFactory;
    … …  
    2726
    2827public class UploadParameterSummaryPanel extends JPanel implements HyperlinkListener, PropertyChangeListener{
    29     @SuppressWarnings("unused")
    30     static private final Logger logger = Logger.getLogger(UploadParameterSummaryPanel.class.getName());
    31 
    3228    private UploadStrategySpecification spec = new UploadStrategySpecification();
    3329    private int numObjects;

  • trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

    r4100 r4191  
    1111import java.util.Collection;
    1212import java.util.HashSet;
    13 import java.util.logging.Logger;
    1413
    1514import javax.swing.JOptionPane;
    … …  
    4039 */
    4140public class UploadPrimitivesTask extends  AbstractUploadTask {
    42     @SuppressWarnings("unused")
    43     static private final Logger logger = Logger.getLogger(UploadPrimitivesTask.class.getName());
    44 
    4541    private boolean uploadCancelled = false;
    4642    private Exception lastException = null;

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

    r4126 r4191  
    8181 */
    8282public class OsmDataLayer extends Layer implements Listener, SelectionChangedListener {
    83     // static private final Logger logger = Logger.getLogger(OsmDataLayer.class.getName());
    84 
    8583    static public final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk";
    8684    static public final String REQUIRES_UPLOAD_TO_SERVER_PROP = OsmDataLayer.class.getName() + ".requiresUploadToServer";

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

    r4087 r4191  
    2828 */
    2929public class NodeElemStyle extends ElemStyle {
    30     //static private final Logger logger = Logger.getLogger(NodeElemStyle.class.getName());
    31 
    3230    public ImageIcon icon;
    3331    public int iconAlpha;

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

    r4074 r4191  
    2020 */
    2121public class TextElement {
    22     //static private final Logger logger = Logger.getLogger(TextElement.class.getName());
    23 
    2422    static private final LabelCompositionStrategy AUTO_LABEL_COMPOSITION_STRATEGY = new DeriveLabelFromNameTagsCompositionStrategy();
    2523

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java

    r4069 r4191  
    4747
    4848    public static class FunctionExpression implements Expression {
    49         //static Logger logger = Logger.getLogger(FunctionExpression.class.getName());
    50 
    5149        String name;
    5250        List<Expression> args;

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Instruction.java

    r4007 r4191  
    2828
    2929    public static class AssignmentInstruction extends Instruction {
    30         //static private final Logger logger = Logger.getLogger(AssignmentInstruction.class.getName());
    3130        public final String key;
    3231        public final Object val;

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

    r4074 r4191  
    3030
    3131public class MapCSSStyleSource extends StyleSource {
    32     //static private final Logger logger = Logger.getLogger(MapCSSStyleSource.class.getName());
    33 
    3432    final public List<MapCSSRule> rules;
    3533    private Color backgroundColorOverride;

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

    r4074 r4191  
    4747     */
    4848    public static class ChildOrParentSelector implements Selector {
    49         //static private final Logger logger = Logger.getLogger(ChildOrParentSelector.class.getName());
    5049        private final Selector left;
    5150        private final LinkSelector link;

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/parser/MapCSSParser.java

    r4069 r4191  
    20932093  }
    20942094
    2095   private java.util.List jj_expentries = new java.util.ArrayList();
     2095  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
    20962096  private int[] jj_expentry;
    20972097  private int jj_kind = -1;

  • trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java

    r3501 r4191  
    2222import java.beans.PropertyChangeEvent;
    2323import java.beans.PropertyChangeListener;
    24 import java.util.logging.Logger;
    2524
    2625import javax.swing.AbstractAction;
    … …  
    5554 */
    5655public class OAuthAuthorizationWizard extends JDialog {
    57     @SuppressWarnings("unused")
    58     static private final Logger logger = Logger.getLogger(OAuthAuthorizationWizard.class.getName());
    59 
    6056    private HtmlPanel pnlMessage;
    6157    private boolean canceled;

  • trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

    r4147 r4191  
    1717import java.util.Map;
    1818import java.util.Map.Entry;
    19 import java.util.logging.Logger;
    2019
    2120import oauth.signpost.OAuth;
    … …  
    3736
    3837public class OsmOAuthAuthorizationClient {
    39     @SuppressWarnings("unused")
    40     static private final Logger logger = Logger.getLogger(OsmOAuthAuthorizationClient.class.getName());
    41 
    4238    private OAuthParameters oauthProviderParameters;
    4339    private OAuthConsumer consumer;

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

    r3757 r4191  
    2020import java.util.LinkedList;
    2121import java.util.List;
    22 import java.util.logging.Logger;
    2322
    2423import javax.swing.AbstractAction;
    … …  
    5655
    5756public class PluginPreference implements PreferenceSetting {
    58     @SuppressWarnings("unused")
    59     private final static Logger logger = Logger.getLogger(PluginPreference.class.getName());
    60 
    6157    public static class Factory implements PreferenceSettingFactory {
    6258        public PreferenceSetting createPreferenceSetting() {

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

    r3715 r4191  
    1414import java.util.LinkedList;
    1515import java.util.List;
    16 import java.util.logging.Logger;
    1716
    1817import javax.swing.BorderFactory;
    … …  
    4039 */
    4140public class PreferenceTabbedPane extends JTabbedPane implements MouseWheelListener {
    42     @SuppressWarnings("unused")
    43     static private final Logger logger = Logger.getLogger(PreferenceTabbedPane.class.getName());
    44 
    4541    /**
    4642     * Allows PreferenceSettings to do validation of entered values when ok was pressed.
    … …  
    223219    public void buildGui() {
    224220        for (PreferenceSettingFactory factory : settingsFactory) {
    225             // logger.info("creating settings: " + factory);
    226221            PreferenceSetting setting = factory.createPreferenceSetting();
    227222            if (setting != null) {
    … …  
    235230            try {
    236231                PreferenceSetting settings = it.next();
    237                 //logger.info("adding gui: " + settings);
    238232                settings.addGui(this);
    239233            } catch (SecurityException e) {

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java

    r3330 r4191  
    1010import java.awt.event.ActionListener;
    1111import java.util.List;
    12 import java.util.logging.Logger;
    1312
    1413import javax.swing.JCheckBox;
    … …  
    2524
    2625public class PluginListPanel extends VerticallyScrollablePanel{
    27     @SuppressWarnings("unused")
    28     private static final Logger logger = Logger.getLogger(PluginListPanel.class.getName());
    29 
    3026    private PluginPreferencesModel model;
    3127

  • trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

    r3720 r4191  
    1414import java.util.Set;
    1515import java.util.Map.Entry;
    16 import java.util.logging.Logger;
    1716
    1817import org.openstreetmap.josm.Main;
    … …  
    2120
    2221public class PluginPreferencesModel extends Observable{
    23     @SuppressWarnings("unused")
    24     private final static Logger logger = Logger.getLogger(PluginPreferencesModel.class.getName());
    25 
    2622    private final ArrayList<PluginInformation> availablePlugins = new ArrayList<PluginInformation>();
    2723    private final ArrayList<PluginInformation> displayedPlugins = new ArrayList<PluginInformation>();

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java

    r3530 r4191  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
    5 
    6 import java.util.logging.Logger;
    75
    86import org.openstreetmap.josm.data.Preferences;
    … …  
    1412
    1513public class OAuthAccessTokenHolder {
    16     @SuppressWarnings("unused")
    17     static private final Logger logger = Logger.getLogger(OAuthAccessTokenHolder.class.getName());
    18 
    1914    private  static OAuthAccessTokenHolder instance;
    2015

  • trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java

    r3530 r4191  
    1616import java.beans.PropertyChangeEvent;
    1717import java.beans.PropertyChangeListener;
    18 import java.util.logging.Logger;
    1918
    2019import javax.swing.AbstractAction;
    … …  
    4544 */
    4645public class OAuthAuthenticationPreferencesPanel extends JPanel implements PropertyChangeListener {
    47     @SuppressWarnings("unused")
    48     private static final Logger logger = Logger.getLogger(OAuthAuthenticationPreferencesPanel.class.getName());
    49 
    5046    private JPanel pnlAuthorisationMessage;
    5147    private NotYetAuthorisedPanel pnlNotYetAuthorised;

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

    r4092 r4191  
    33
    44import java.awt.Component;
    5 import java.util.logging.Logger;
    65
    76import javax.swing.AbstractCellEditor;
    … …  
    1918@SuppressWarnings("serial")
    2019public class TagCellEditor extends AbstractCellEditor implements TableCellEditor{
    21 
    22     /** the logger object */
    23     static private Logger logger = Logger.getLogger(TagCellEditor.class.getName());
    2420
    2521    protected AutoCompletingTextField editor = null;
    … …  
    5248
    5349        if (autoCompletionList == null)
    54             //logger.warning("autoCompletionList is null. Make sure an instance of AutoCompletionList is injected into TableCellEditor.");
    5550            return;
    5651        autoCompletionList.clear();
    … …  
    8075    protected void initAutoCompletionListForValues(String forKey) {
    8176        if (autoCompletionList == null) {
    82             logger.warning("autoCompletionList is null. Make sure an instance of AutoCompletionList is injected into TableCellEditor.");
    8377            return;
    8478        }
    … …  
    115109            return editor;
    116110        } else {
    117             logger.warning("column this table cell editor is requested for is out of range. column=" + column);
    118111            return null;
    119112        }

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

    r4072 r4191  
    66import java.awt.Component;
    77import java.awt.Font;
    8 import java.util.logging.Logger;
    98
    109import javax.swing.JLabel;
    … …  
    2120 */
    2221public class TagCellRenderer extends JLabel implements TableCellRenderer  {
    23     @SuppressWarnings("unused")
    24     private static final Logger logger = Logger.getLogger(TagCellRenderer.class.getName());
    25 
    2622    private Font fontStandard = null;
    2723    private Font fontItalic = null;

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

    r3640 r4191  
    1313import java.util.List;
    1414import java.util.Map;
    15 import java.util.logging.Logger;
    1615
    1716import javax.swing.DefaultListSelectionModel;
    … …  
    3231@SuppressWarnings("serial")
    3332public class TagEditorModel extends AbstractTableModel {
    34     @SuppressWarnings("unused")
    35     static private final Logger logger = Logger.getLogger(TagEditorModel.class.getName());
    36 
    3733    static public final String PROP_DIRTY = TagEditorModel.class.getName() + ".dirty";
    3834

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

    r3518 r4191  
    99import java.util.Map;
    1010import java.util.Map.Entry;
    11 import java.util.logging.Logger;
    1211
    1312import javax.swing.BoxLayout;
    … …  
    3332 */
    3433public class TagEditorPanel extends JPanel {
    35     @SuppressWarnings("unused")
    36     static private final Logger logger = Logger.getLogger(TagEditorPanel.class.getName());
    3734    /** the tag editor model */
    3835    private TagEditorModel model;

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

    r4120 r4191  
    2323import java.util.EventObject;
    2424import java.util.concurrent.CopyOnWriteArrayList;
    25 import java.util.logging.Level;
    26 import java.util.logging.Logger;
    2725
    2826import javax.swing.AbstractAction;
    … …  
    5048 */
    5149public class TagTable extends JTable  {
    52 
    53     private static final Logger logger = Logger.getLogger(TagTable.class.getName());
    54 
    5550    /** the table cell editor used by this table */
    5651    private TagCellEditor editor = null;
    … …  
    410405    public void setAutoCompletionManager(AutoCompletionManager autocomplete) {
    411406        if (autocomplete == null) {
    412             logger.warning("argument autocomplete should not be null. Aborting.");
     407            System.out.println("argument autocomplete should not be null. Aborting.");
    413408            Thread.dumpStack();
    414409            return;
    … …  
    432427    public void  addOKAccelatorListener(KeyListener l) {
    433428        addKeyListener(l);
    434         if (editor == null) {
    435             logger.warning("editor is null. cannot register OK accelator listener.");
    436         } else {
     429        if (editor != null) {
    437430            editor.getEditor().addKeyListener(l);
    438431        }
    … …  
    481474            robot.mouseMove(before.x, before.y);
    482475        } catch(AWTException e) {
    483             logger.log(Level.SEVERE, "failed to simulate mouse click event at (" + r.x + "," + r.y + "). Exception: " + e.toString());
     476            System.out.println("Failed to simulate mouse click event at (" + r.x + "," + r.y + "). Exception: " + e.toString());
    484477            return;
    485478        }

  • trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java

    r4095 r4191  
    88import java.awt.event.KeyEvent;
    99import java.util.EventObject;
    10 import java.util.logging.Logger;
    1110
    1211import javax.swing.ComboBoxEditor;
    … …  
    3433 */
    3534public class AutoCompletingTextField extends JTextField implements ComboBoxEditor, TableCellEditor {
    36     @SuppressWarnings("unused")
    37     static private Logger logger = Logger.getLogger(AutoCompletingTextField.class.getName());
    38 
    3935    /**
    4036     * The document model for the editor

  • trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

    r3083 r4191  
    1313import java.util.Collections;
    1414import java.util.List;
    15 import java.util.logging.Logger;
    1615
    1716import org.openstreetmap.josm.Main;
    … …  
    2423 */
    2524public class DefaultProxySelector extends ProxySelector {
    26     @SuppressWarnings("unused")
    27     static private final Logger logger = Logger.getLogger(DefaultProxySelector.class.getName());
    28 
    2925    /**
    3026     * The {@see ProxySelector} provided by the JDK will retrieve proxy information

  • trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

    r4081 r4191  
    1313import java.util.NoSuchElementException;
    1414import java.util.Set;
    15 import java.util.logging.Logger;
    1615
    1716import org.openstreetmap.josm.data.osm.DataSet;
    … …  
    5049 */
    5150public class MultiFetchServerObjectReader extends OsmServerReader{
    52 
    53     static final private Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
    5451    /**
    5552     * the max. number of primitives retrieved in one step. Assuming IDs with 7 digits,
    … …  
    361358            } catch(OsmApiException e) {
    362359                if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
    363                     logger.warning(tr("Server replied with response code 404 for id {0}. Skipping.", Long.toString(id)));
     360                    System.out.println(tr("Server replied with response code 404 for id {0}. Skipping.", Long.toString(id)));
    364361                    missingPrimitives.add(new SimplePrimitiveId(id, type));
    365362                    continue;
    … …  
    416413            } catch(OsmApiException e) {
    417414                if (e.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
    418                     logger.warning(tr("Server replied with response code 404, retrying with an individual request for each object."));
     415                    System.out.println(tr("Server replied with response code 404, retrying with an individual request for each object."));
    419416                    singleGetIdPackage(type, pkg, progressMonitor);
    420417                } else

  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r4172 r4191  
    2323import java.util.Collections;
    2424import java.util.HashMap;
    25 import java.util.logging.Logger;
    2625
    2726import javax.xml.parsers.ParserConfigurationException;
    … …  
    5251 */
    5352public class OsmApi extends OsmConnection {
    54     @SuppressWarnings("unused")
    55     static private final Logger logger = Logger.getLogger(OsmApi.class.getName());
    5653    /** max number of retries to send a request in case of HTTP 500 errors or timeouts */
    5754    static public final int DEFAULT_MAX_NUM_RETRIES = 5;

  • trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

    r3719 r4191  
    99import java.util.LinkedList;
    1010import java.util.List;
    11 import java.util.logging.Logger;
    1211
    1312import javax.xml.parsers.ParserConfigurationException;
    … …  
    4039 */
    4140public class OsmChangesetParser {
    42     @SuppressWarnings("unused")
    43     static private final Logger logger = Logger.getLogger(OsmChangesetParser.class.getName());
    44 
    4541    private List<Changeset> changesets;
    4642

  • trunk/src/org/openstreetmap/josm/io/OsmConnection.java

    r3815 r4191  
    1111import java.nio.charset.Charset;
    1212import java.nio.charset.CharsetEncoder;
    13 //import java.util.logging.Logger;
    1413
    1514import oauth.signpost.OAuthConsumer;
    … …  
    3130 */
    3231public class OsmConnection {
    33     @SuppressWarnings("unused")
    34     //private static final Logger logger = Logger.getLogger(OsmConnection.class.getName());
    35 
    3632    protected boolean cancel = false;
    3733    protected HttpURLConnection activeConnection;

  • trunk/src/org/openstreetmap/josm/io/OsmReader.java

    r4178 r4191  
    1212import java.util.List;
    1313import java.util.Map;
    14 import java.util.logging.Level;
    15 import java.util.logging.Logger;
    1614
    1715import javax.xml.parsers.ParserConfigurationException;
    … …  
    5149 */
    5250public class OsmReader {
    53     static private final Logger logger = Logger.getLogger(OsmReader.class.getName());
    54 
    5551    /**
    5652     * The dataset to add parsed objects to.
    … …  
    208204                    }
    209205                    if (currentPrimitive.isDeleted()) {
    210                         logger.info(tr("Deleted way {0} contains nodes", currentPrimitive.getUniqueId()));
     206                        System.out.println(tr("Deleted way {0} contains nodes", currentPrimitive.getUniqueId()));
    211207                    } else {
    212208                        list.add(id);
    … …  
    259255
    260256                    if (currentPrimitive.isDeleted()) {
    261                         logger.info(tr("Deleted relation {0} contains members", currentPrimitive.getUniqueId()));
     257                        System.out.println(tr("Deleted relation {0} contains members", currentPrimitive.getUniqueId()));
    262258                    } else {
    263259                        list.add(emd);
    … …  
    450446                }
    451447                if (n.isDeleted()) {
    452                     logger.warning(tr("Deleted node {0} is part of way {1}", id, w.getId()));
     448                    System.out.println(tr("Deleted node {0} is part of way {1}", id, w.getId()));
    453449                } else {
    454450                    wayNodes.add(n);
    … …  
    457453            w.setNodes(wayNodes);
    458454            if (w.hasIncompleteNodes()) {
    459                 if (logger.isLoggable(Level.FINE)) {
    460                     logger.fine(tr("Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data.",
    461                             externalWayId, w.getNodesCount()));
    462                 }
     455                  System.out.println(tr("Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data.",
     456                          externalWayId, w.getNodesCount()));
    463457            }
    464458            ds.addPrimitive(w);
    … …  
    538532                }
    539533                if (primitive.isDeleted()) {
    540                     logger.warning(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId()));
     534                    System.out.println(tr("Deleted member {0} is used by relation {1}", primitive.getId(), relation.getId()));
    541535                } else {
    542536                    relationMembers.add(new RelationMember(rm.role, primitive));

  • trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

    r4172 r4191  
    1111import java.net.MalformedURLException;
    1212import java.net.URL;
    13 import java.util.logging.Logger;
    1413import java.util.zip.GZIPInputStream;
    1514import java.util.zip.Inflater;
    … …  
    3029 */
    3130public abstract class OsmServerReader extends OsmConnection {
    32     @SuppressWarnings("unused")
    33     static private final Logger logger = Logger.getLogger(OsmServerReader.class.getName());
    3431    private OsmApi api = OsmApi.getOsmApi();
    3532    private boolean doAuthenticate = false;

  • trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

    r4100 r4191  
    1111import java.util.LinkedList;
    1212import java.util.List;
    13 import java.util.logging.Logger;
    1413
    1514import org.openstreetmap.josm.data.osm.Changeset;
    … …  
    2928 */
    3029public class OsmServerWriter {
    31     @SuppressWarnings("unused")
    32     static private final Logger logger = Logger.getLogger(OsmServerWriter.class.getName());
    33 
    3430    /**
    3531     * This list contains all successfully processed objects. The caller of

  • trunk/src/org/openstreetmap/josm/io/auth/DefaultAuthenticator.java

    r3083 r4191  
    66import java.util.HashMap;
    77import java.util.Map;
    8 import java.util.logging.Logger;
    98
    109import org.openstreetmap.josm.Main;
    … …  
    1716 */
    1817public  class DefaultAuthenticator extends Authenticator {
    19     @SuppressWarnings("unused")
    20     private static final Logger logger = Logger.getLogger(DefaultAuthenticator.class.getName());
    2118    private static DefaultAuthenticator instance;
    2219

  • trunk/src/org/openstreetmap/josm/io/remotecontrol/PermissionPrefWithDefault.java

    r3707 r4191  
    33
    44/**
    5  * This class should replace PermissionPref because it allows explicit
    6  * specification of the permission's default value.
     5 * Contains a preference name to control permission for the operation
     6 * implemented by the RequestHandler, and an error message to be displayed
     7 * if not permitted.
    78 *
    89 * @author Bodo Meissner
    910 */
    10 @SuppressWarnings("deprecation")
    11 public class PermissionPrefWithDefault extends PermissionPref {
     11public class PermissionPrefWithDefault {
     12
     13    /** name of the preference setting to permit the remote operation */
     14    public String pref;
     15    /** message to be displayed if operation is not permitted */
     16    public String message;
    1217
    1318    public boolean defaultVal = true;
    1419
    1520    public PermissionPrefWithDefault(String pref, boolean defaultVal, String message) {
    16         super(pref, message);
     21        this.pref = pref;
     22        this.message = message;
    1723        this.defaultVal = defaultVal;
    1824    }
    19 
    20     public PermissionPrefWithDefault(PermissionPref prefWithoutDefault) {
    21         super(prefWithoutDefault.pref, prefWithoutDefault.message);
    22     }
    2325}

  • trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

    r3707 r4191  
    1010
    1111import org.openstreetmap.josm.Main;
    12 import org.openstreetmap.josm.io.remotecontrol.PermissionPref;
    1312import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
    1413
    … …  
    8281     * @return the preference name and error message or null
    8382     */
    84     @SuppressWarnings("deprecation")
    85     public PermissionPref getPermissionPref()
     83    public PermissionPrefWithDefault getPermissionPref()
    8684    {
    8785        /* Example:
    … …  
    104102     * @throws RequestHandlerForbiddenException
    105103     */
    106     @SuppressWarnings("deprecation")
    107104    final public void checkPermission() throws RequestHandlerForbiddenException
    108105    {
    … …  
    114111         * older versions of WMSPlugin.
    115112         */
    116         PermissionPref permissionPref = getPermissionPref();
     113        PermissionPrefWithDefault permissionPref = getPermissionPref();
    117114        if((permissionPref != null) && (permissionPref.pref != null))
    118115        {
    119             PermissionPrefWithDefault permissionPrefWithDefault;
    120             if(permissionPref instanceof PermissionPrefWithDefault)
    121             {
    122                 permissionPrefWithDefault = (PermissionPrefWithDefault) permissionPref;
    123             }
    124             else
    125             {
    126                 permissionPrefWithDefault = new PermissionPrefWithDefault(permissionPref);
    127             }
    128             if (!Main.pref.getBoolean(permissionPrefWithDefault.pref,
    129                     permissionPrefWithDefault.defaultVal)) {
    130                 System.out.println(permissionPrefWithDefault.message);
     116            if (!Main.pref.getBoolean(permissionPref.pref, permissionPref.defaultVal)) {
     117                System.out.println(permissionPref.message);
    131118                throw new RequestHandlerForbiddenException();
    132119            }

  • trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

    r4087 r4191  
    1515import java.util.Collection;
    1616import java.util.LinkedList;
    17 import java.util.logging.Logger;
    1817
    1918import org.openstreetmap.josm.Main;
    … …  
    3635 */
    3736public class PluginDownloadTask extends PleaseWaitRunnable{
    38     @SuppressWarnings("unused")
    39     private static final Logger logger = Logger.getLogger(PluginDownloadTask.class.getName());
    40 
    4137    private final Collection<PluginInformation> toUpdate = new LinkedList<PluginInformation>();
    4238    private final Collection<PluginInformation> failed = new LinkedList<PluginInformation>();
Note: See TracChangeset for help on using the changeset viewer.