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

Timestamp:

2011-07-01T09:32:56+02:00 (14 years ago)

Author:

stoecker

Message:

remove old debug stuff

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• ChangeRelationMemberRoleCommand.java (modified) (1 diff)
• Command.java (modified) (1 diff)
• ConflictResolveCommand.java (modified) (3 diffs)
• PurgePrimitivesCommand.java (deleted)
• RelationMemberConflictResolverCommand.java (modified) (3 diffs)
• SequenceCommand.java (modified) (1 diff)
• TagConflictResolveCommand.java (modified) (2 diffs)
• UndeletePrimitivesCommand.java (modified) (1 diff)
• WayNodesConflictResolverCommand.java (modified) (3 diffs)

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

@@ -43 +43 @@
     @Override public boolean executeCommand() {
         if (position < 0 || position >= relation.getMembersCount()) {
-            Main.debug("error changing the role");
             return false;
         }

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

@@ -121 +121 @@
         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;

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.util.logging.Logger;
 
 import org.openstreetmap.josm.Main;
@@ -20 +18 @@
  */
 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 +61 @@
 
         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()

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

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.List;
-import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -23 +22 @@
  */
 public class RelationMemberConflictResolverCommand extends Command {
-    private static final Logger logger = Logger.getLogger(RelationMemberConflictResolverCommand.class.getName());
-
     /** my relation */
     private final Relation my;
@@ -82 +79 @@
     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()

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

@@ -52 +52 @@
             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);

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

@@ -7 +7 @@
 import java.util.Collection;
 import java.util.List;
-import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -23 +22 @@
  */
 public class TagConflictResolveCommand extends ConflictResolveCommand {
-    @SuppressWarnings("unused")
-    private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName());
-
     /** the conflict to resolve */
     private Conflict<? extends OsmPrimitive> conflict;

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

@@ -28 +28 @@
 @Deprecated
 public class UndeletePrimitivesCommand extends ConflictResolveCommand {
-    //static private final Logger logger = Logger.getLogger(UndeletePrimitivesCommand.class.getName());
-
     /** the node to undelete */
     private final List<OsmPrimitive> toUndelete = new ArrayList<OsmPrimitive>();

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

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.List;
-import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -22 +21 @@
  */
 public class WayNodesConflictResolverCommand extends ConflictResolveCommand {
-
-    static private final Logger logger = Logger.getLogger(WayNodesConflictResolverCommand.class.getName());
-
     /** the conflict to resolve */
     private Conflict<Way> conflict;
@@ -64 +60 @@
         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()));
             }
         }