Changeset 4191 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2011-07-01T09:32:56+02:00 (12 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
r3262 r4191 43 43 @Override public boolean executeCommand() { 44 44 if (position < 0 || position >= relation.getMembersCount()) { 45 Main.debug("error changing the role");46 45 return false; 47 46 } -
trunk/src/org/openstreetmap/josm/command/Command.java
r3262 r4191 121 121 if (o != null) 122 122 return o; 123 Main.debug("unable to find osm with id: " + osm.getId() + " hashCode: " + osm.hashCode());124 123 for (OsmPrimitive t : cloneMap.keySet()) { 125 124 PrimitiveData to = cloneMap.get(t); 126 Main.debug("now: " + t.getId() + " hashCode: " + t.hashCode());127 Main.debug("orig: " + to.getUniqueId() + " hashCode: " + to.hashCode());128 125 } 129 126 return o; -
trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
r3083 r4191 3 3 4 4 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 import java.util.logging.Logger;7 5 8 6 import org.openstreetmap.josm.Main; … … 20 18 */ 21 19 public abstract class ConflictResolveCommand extends Command { 22 private static final Logger logger = Logger.getLogger(ConflictResolveCommand.class.getName());23 24 20 /** the list of resolved conflicts */ 25 21 private ConflictCollection resolvedConflicts; … … 65 61 66 62 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", 68 64 this.toString(), 69 65 getLayer().toString() -
trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
r3262 r4191 6 6 import java.util.Collection; 7 7 import java.util.List; 8 import java.util.logging.Logger;9 8 10 9 import javax.swing.JLabel; … … 23 22 */ 24 23 public class RelationMemberConflictResolverCommand extends Command { 25 private static final Logger logger = Logger.getLogger(RelationMemberConflictResolverCommand.class.getName());26 27 24 /** my relation */ 28 25 private final Relation my; … … 82 79 public void undoCommand() { 83 80 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", 85 82 this.toString(), 86 83 layer.toString() -
trunk/src/org/openstreetmap/josm/command/SequenceCommand.java
r3275 r4191 52 52 Command c = sequence[i]; 53 53 boolean result = c.executeCommand(); 54 if (!result) {55 Main.debug("SequenceCommand, executing command[" + i + "] " + c + " result: " + result);56 }57 54 if (!result && !continueOnError) { 58 55 this.undoCommands(i-1); -
trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
r3262 r4191 7 7 import java.util.Collection; 8 8 import java.util.List; 9 import java.util.logging.Logger;10 9 11 10 import javax.swing.JLabel; … … 23 22 */ 24 23 public class TagConflictResolveCommand extends ConflictResolveCommand { 25 @SuppressWarnings("unused")26 private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName());27 28 24 /** the conflict to resolve */ 29 25 private Conflict<? extends OsmPrimitive> conflict; -
trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java
r3995 r4191 28 28 @Deprecated 29 29 public class UndeletePrimitivesCommand extends ConflictResolveCommand { 30 //static private final Logger logger = Logger.getLogger(UndeletePrimitivesCommand.class.getName());31 32 30 /** the node to undelete */ 33 31 private final List<OsmPrimitive> toUndelete = new ArrayList<OsmPrimitive>(); -
trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
r3262 r4191 6 6 import java.util.Collection; 7 7 import java.util.List; 8 import java.util.logging.Logger;9 8 10 9 import javax.swing.JLabel; … … 22 21 */ 23 22 public class WayNodesConflictResolverCommand extends ConflictResolveCommand { 24 25 static private final Logger logger = Logger.getLogger(WayNodesConflictResolverCommand.class.getName());26 27 23 /** the conflict to resolve */ 28 24 private Conflict<Way> conflict; … … 64 60 for (Node n:mergedNodeList) { 65 61 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())); 67 63 } 68 64 }
Note: See TracChangeset
for help on using the changeset viewer.