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

remove old debug stuff

Location:
trunk/src/org/openstreetmap/josm/io
Files:
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • 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            }
Note: See TracChangeset for help on using the changeset viewer.