Changeset 3262 in josm for trunk/src/org/openstreetmap/josm/command
- Timestamp:
- 2010-05-18T23:43:52+02:00 (13 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/command
- Files:
-
- 1 added
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/command/AddCommand.java
r1990 r3262 6 6 7 7 import java.util.Collection; 8 import java.util.Collections; 8 9 9 10 import javax.swing.JLabel; 10 import javax.swing.tree.DefaultMutableTreeNode;11 import javax.swing.tree.MutableTreeNode;12 11 13 12 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 61 60 } 62 61 63 @Override public MutableTreeNode description() {62 @Override public JLabel getDescription() { 64 63 String msg; 65 64 switch(OsmPrimitiveType.from(osm)) { … … 70 69 } 71 70 72 return new DefaultMutableTreeNode(73 new JLabel(74 tr(msg,75 osm.getDisplayName(DefaultNameFormatter.getInstance())76 ),77 ImageProvider.get(OsmPrimitiveType.from(osm)), 78 JLabel.HORIZONTAL79 )80 );71 return new JLabel( 72 tr(msg, osm.getDisplayName(DefaultNameFormatter.getInstance())), 73 ImageProvider.get(OsmPrimitiveType.from(osm)), 74 JLabel.HORIZONTAL); 75 } 76 77 @Override 78 public Collection<OsmPrimitive> getParticipatingPrimitives() { 79 return Collections.singleton(osm); 81 80 } 82 81 } -
trunk/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java
r3257 r3262 6 6 import java.util.ArrayList; 7 7 import java.util.Collection; 8 import java.util.HashSet; 8 9 import java.util.List; 9 10 10 11 import javax.swing.JLabel; 11 import javax.swing.tree.DefaultMutableTreeNode;12 import javax.swing.tree.MutableTreeNode;13 12 14 13 import org.openstreetmap.josm.data.osm.Node; … … 56 55 } 57 56 58 @Override 59 public MutableTreeNode description() { 60 return new DefaultMutableTreeNode( 61 new JLabel(trn("Added {0} object", "Added {0} objects", data.size(), data.size()), null, 62 JLabel.HORIZONTAL 63 ) 57 @Override public JLabel getDescription() { 58 return new JLabel(trn("Added {0} object", "Added {0} objects", data.size(), data.size()), null, 59 JLabel.HORIZONTAL 64 60 ); 65 61 } … … 71 67 } 72 68 69 @Override 70 public Collection<? extends OsmPrimitive> getParticipatingPrimitives() { 71 Collection<OsmPrimitive> prims = new HashSet<OsmPrimitive>(); 72 for (PrimitiveData d : data) { 73 OsmPrimitive osm = getLayer().data.getPrimitiveById(d); 74 if (osm == null) 75 throw new RuntimeException(); 76 prims.add(osm); 77 } 78 return prims; 79 } 73 80 } -
trunk/src/org/openstreetmap/josm/command/ChangeCommand.java
r3152 r3262 8 8 9 9 import javax.swing.JLabel; 10 import javax.swing.tree.DefaultMutableTreeNode;11 import javax.swing.tree.MutableTreeNode;12 10 13 11 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 52 50 } 53 51 54 @Override public MutableTreeNode description() {52 @Override public JLabel getDescription() { 55 53 String msg = ""; 56 54 switch(OsmPrimitiveType.from(osm)) { … … 59 57 case RELATION: msg = marktr("Change relation {0}"); break; 60 58 } 61 return new DefaultMutableTreeNode( 62 new JLabel(tr(msg, 63 osm.getDisplayName(DefaultNameFormatter.getInstance()), 64 ImageProvider.get(OsmPrimitiveType.from(osm)), 65 JLabel.HORIZONTAL))); 59 return new JLabel(tr(msg, 60 osm.getDisplayName(DefaultNameFormatter.getInstance())), 61 ImageProvider.get(OsmPrimitiveType.from(osm)), 62 JLabel.HORIZONTAL); 66 63 } 67 64 } -
trunk/src/org/openstreetmap/josm/command/ChangeNodesCommand.java
r3142 r3262 8 8 9 9 import javax.swing.JLabel; 10 import javax.swing.tree.DefaultMutableTreeNode;11 import javax.swing.tree.MutableTreeNode;12 10 13 11 import org.openstreetmap.josm.data.osm.Node; … … 48 46 } 49 47 50 @Override public MutableTreeNode description() {48 @Override public JLabel getDescription() { 51 49 String msg = tr("Changed nodes of {0}", way.getDisplayName(DefaultNameFormatter.getInstance())); 52 return new DefaultMutableTreeNode( 53 new JLabel(msg, 50 return new JLabel(msg, 54 51 ImageProvider.get(OsmPrimitiveType.WAY), 55 JLabel.HORIZONTAL) );52 JLabel.HORIZONTAL); 56 53 } 57 54 } -
trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
r2990 r3262 5 5 import static org.openstreetmap.josm.tools.I18n.tr; 6 6 7 import java.util.ArrayList; 7 8 import java.util.Collection; 9 import java.util.Collections; 8 10 import java.util.LinkedList; 9 11 import java.util.List; 10 12 11 13 import javax.swing.JLabel; 12 import javax.swing.tree.DefaultMutableTreeNode;13 import javax.swing.tree.MutableTreeNode;14 14 15 15 import org.openstreetmap.josm.data.osm.OsmPrimitive; … … 92 92 } 93 93 94 @Override public MutableTreeNode description() {94 @Override public JLabel getDescription() { 95 95 String text; 96 96 if (objects.size() == 1) { … … 117 117 : tr("Set {0}={1} for {2} objects", key, value, objects.size()); 118 118 } 119 DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL)); 119 return new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL); 120 } 121 122 @Override public Collection<PseudoCommand> getChildren() { 120 123 if (objects.size() == 1) 121 return root; 122 for (OsmPrimitive osm : objects) { 123 root.add(new DefaultMutableTreeNode( 124 new JLabel( 125 osm.getDisplayName(DefaultNameFormatter.getInstance()), 126 ImageProvider.get(OsmPrimitiveType.from(osm)), 127 JLabel.HORIZONTAL) 128 ) 129 ); 124 return null; 125 List<PseudoCommand> children = new ArrayList<PseudoCommand>(); 126 for (final OsmPrimitive osm : objects) { 127 children.add(new PseudoCommand() { 128 @Override public JLabel getDescription() { 129 return new JLabel( 130 osm.getDisplayName(DefaultNameFormatter.getInstance()), 131 ImageProvider.get(OsmPrimitiveType.from(osm)), 132 JLabel.HORIZONTAL); 133 134 } 135 @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() { 136 return Collections.singleton(osm); 137 } 138 139 }); 130 140 } 131 return root;141 return children; 132 142 } 133 143 } -
trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java
r3083 r3262 7 7 8 8 import javax.swing.JLabel; 9 import javax.swing.tree.DefaultMutableTreeNode;10 import javax.swing.tree.MutableTreeNode;11 9 12 10 import org.openstreetmap.josm.Main; … … 67 65 } 68 66 69 @Override public MutableTreeNode description() { 70 return new DefaultMutableTreeNode( 71 new JLabel( 67 @Override public JLabel getDescription() { 68 return new JLabel( 72 69 tr("Change relation member role for {0} {1}", 73 70 OsmPrimitiveType.from(relation), … … 75 72 ), 76 73 ImageProvider.get(OsmPrimitiveType.from(relation)), 77 JLabel.HORIZONTAL )74 JLabel.HORIZONTAL 78 75 ); 79 76 } -
trunk/src/org/openstreetmap/josm/command/Command.java
r3034 r3262 9 9 import java.util.Map.Entry; 10 10 11 import javax.swing.tree.DefaultMutableTreeNode; 11 12 import javax.swing.tree.MutableTreeNode; 12 13 … … 30 31 * @author imi 31 32 */ 32 abstract public class Command {33 abstract public class Command extends PseudoCommand { 33 34 34 35 private static final class CloneVisitor extends AbstractVisitor { … … 132 133 * Replies the layer this command is (or was) applied to. 133 134 * 134 * @return135 135 */ 136 136 protected OsmDataLayer getLayer() { … … 150 150 Collection<OsmPrimitive> added); 151 151 152 abstract public MutableTreeNode description(); 152 /** 153 * Return the primitives that take part in this command. 154 */ 155 @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() { 156 return cloneMap.keySet(); 157 } 158 159 /** 160 * Provide a description that can be presented in a list or tree view. 161 * This override will be removed when 162 * <code>description()</code> is removed. 163 */ 164 @Override public Object getDescription() { 165 return ((DefaultMutableTreeNode) description()).getUserObject(); 166 } 167 168 /** 169 * @deprecated use getDescription() and getChildren() instead 170 */ 171 @Deprecated 172 public MutableTreeNode description() { 173 return null; 174 } 153 175 154 176 } -
trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java
r3083 r3262 8 8 import javax.swing.JLabel; 9 9 import javax.swing.JOptionPane; 10 import javax.swing.tree.DefaultMutableTreeNode;11 import javax.swing.tree.MutableTreeNode;12 10 13 11 import org.openstreetmap.josm.Main; … … 65 63 } 66 64 67 @Override public MutableTreeNode description() { 68 return new DefaultMutableTreeNode( 69 new JLabel( 65 @Override public JLabel getDescription() { 66 return new JLabel( 70 67 tr("Add conflict for ''{0}''", 71 68 conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()) … … 73 70 ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())), 74 71 JLabel.HORIZONTAL 75 )76 72 ); 77 73 } -
trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java
r3083 r3262 7 7 8 8 import javax.swing.JLabel; 9 import javax.swing.tree.DefaultMutableTreeNode;10 import javax.swing.tree.MutableTreeNode;11 9 12 10 import org.openstreetmap.josm.data.conflict.Conflict; … … 40 38 } 41 39 42 @Override 43 public MutableTreeNode description() { 44 return new DefaultMutableTreeNode( 45 new JLabel( 40 @Override public JLabel getDescription() { 41 return new JLabel( 46 42 tr("Resolve conflicts in coordinates in {0}",conflict.getMy().getId()), 47 43 ImageProvider.get("data", "object"), 48 44 JLabel.HORIZONTAL 49 )50 45 ); 51 46 } -
trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
r3152 r3262 148 148 public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, 149 149 Collection<OsmPrimitive> added) { 150 deleted.addAll(toDelete); 151 } 152 153 @Override 154 public MutableTreeNode description() { 150 } 151 152 @Override public JLabel getDescription() { 155 153 if (toDelete.size() == 1) { 156 154 OsmPrimitive primitive = toDelete.iterator().next(); … … 162 160 } 163 161 164 return new DefaultMutableTreeNode(new JLabel(tr(msg, primitive.getDisplayName(DefaultNameFormatter.getInstance())), 165 ImageProvider.get(OsmPrimitiveType.from(primitive)), JLabel.HORIZONTAL)); 166 } 167 168 Set<OsmPrimitiveType> typesToDelete = new HashSet<OsmPrimitiveType>(); 169 for (OsmPrimitive osm : toDelete) { 170 typesToDelete.add(OsmPrimitiveType.from(osm)); 171 } 172 String msg = ""; 173 String apiname = "object"; 174 if (typesToDelete.size() > 1) { 175 msg = trn("Delete {0} object", "Delete {0} objects", toDelete.size(), toDelete.size()); 162 return new JLabel(tr(msg, primitive.getDisplayName(DefaultNameFormatter.getInstance())), 163 ImageProvider.get(OsmPrimitiveType.from(primitive)), JLabel.HORIZONTAL); 176 164 } else { 177 OsmPrimitiveType t = typesToDelete.iterator().next(); 178 apiname = t.getAPIName(); 179 switch(t) { 180 case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break; 181 case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break; 182 case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break; 183 } 184 } 185 DefaultMutableTreeNode root = new DefaultMutableTreeNode( 186 new JLabel(msg, ImageProvider.get("data", apiname), JLabel.HORIZONTAL) 187 ); 188 for (OsmPrimitive osm : toDelete) { 189 root.add(new DefaultMutableTreeNode(new JLabel( 190 osm.getDisplayName(DefaultNameFormatter.getInstance()), 191 ImageProvider.get(OsmPrimitiveType.from(osm)), JLabel.HORIZONTAL))); 192 } 193 return root; 165 Set<OsmPrimitiveType> typesToDelete = new HashSet<OsmPrimitiveType>(); 166 for (OsmPrimitive osm : toDelete) { 167 typesToDelete.add(OsmPrimitiveType.from(osm)); 168 } 169 String msg = ""; 170 String apiname = "object"; 171 if (typesToDelete.size() > 1) { 172 msg = trn("Delete {0} object", "Delete {0} objects", toDelete.size(), toDelete.size()); 173 } else { 174 OsmPrimitiveType t = typesToDelete.iterator().next(); 175 apiname = t.getAPIName(); 176 switch(t) { 177 case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break; 178 case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break; 179 case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break; 180 } 181 } 182 return new JLabel(msg, ImageProvider.get("data", apiname), JLabel.HORIZONTAL); 183 } 184 } 185 186 @Override public Collection<PseudoCommand> getChildren() { 187 if (toDelete.size() == 1) { 188 return null; 189 } else { 190 List<PseudoCommand> children = new ArrayList<PseudoCommand>(); 191 for (final OsmPrimitive osm : toDelete) { 192 children.add(new PseudoCommand() { 193 @Override public JLabel getDescription() { 194 return new JLabel( 195 tr("Deleted ''{0}''", 196 osm.getDisplayName(DefaultNameFormatter.getInstance())), 197 ImageProvider.get(OsmPrimitiveType.from(osm)), JLabel.HORIZONTAL); 198 } 199 @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() { 200 return Collections.singleton(osm); 201 } 202 203 }); 204 } 205 return children; 206 207 } 208 } 209 210 @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() { 211 return toDelete; 194 212 } 195 213 -
trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java
r3083 r3262 7 7 8 8 import javax.swing.JLabel; 9 import javax.swing.tree.DefaultMutableTreeNode;10 import javax.swing.tree.MutableTreeNode;11 9 12 10 import org.openstreetmap.josm.data.conflict.Conflict; … … 40 38 } 41 39 42 @Override 43 public MutableTreeNode description() { 44 return new DefaultMutableTreeNode( 45 new JLabel( 40 @Override public JLabel getDescription() { 41 return new JLabel( 46 42 tr("Resolve conflicts in deleted state in {0}",conflict.getMy().getId()), 47 43 ImageProvider.get("data", "object"), 48 44 JLabel.HORIZONTAL 49 )50 45 ); 51 46 } -
trunk/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java
r3083 r3262 8 8 9 9 import javax.swing.JLabel; 10 import javax.swing.tree.DefaultMutableTreeNode;11 import javax.swing.tree.MutableTreeNode;12 10 13 11 import org.openstreetmap.josm.data.conflict.Conflict; … … 35 33 } 36 34 37 @Override 38 public MutableTreeNode description() { 35 @Override public JLabel getDescription() { 39 36 String msg = ""; 40 37 switch(OsmPrimitiveType.from(conflict.getMy())) { … … 43 40 case RELATION: msg = marktr("Set the ''modified'' flag for relation {0}"); break; 44 41 } 45 return new DefaultMutableTreeNode( 46 new JLabel( 42 return new JLabel( 47 43 tr(msg,conflict.getMy().getId()), 48 44 ImageProvider.get("data", "object"), 49 45 JLabel.HORIZONTAL 50 )51 46 ); 52 47 } -
trunk/src/org/openstreetmap/josm/command/MoveCommand.java
r3253 r3262 11 11 12 12 import javax.swing.JLabel; 13 import javax.swing.tree.DefaultMutableTreeNode;14 import javax.swing.tree.MutableTreeNode;15 13 16 14 import org.openstreetmap.josm.data.coor.LatLon; … … 118 116 } 119 117 120 @Override public MutableTreeNode description() {121 return new DefaultMutableTreeNode(new JLabel(trn("Move {0} node", "Move {0} nodes", nodes.size(), nodes.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL));118 @Override public JLabel getDescription() { 119 return new JLabel(trn("Move {0} node", "Move {0} nodes", nodes.size(), nodes.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL); 122 120 } 123 121 122 /** 123 * @Deprecated use getParticipatingPrimitives() instead 124 */ 125 @Deprecated 124 126 public Collection<Node> getMovedNodes() { 125 127 return nodes; 126 128 } 129 130 @Override 131 public Collection<Node> getParticipatingPrimitives() { 132 return nodes; 133 } 127 134 } -
trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java
r3089 r3262 5 5 import static org.openstreetmap.josm.tools.I18n.trn; 6 6 7 import java.util.ArrayList; 7 8 import java.util.Collection; 8 9 import java.util.Collections; 9 10 import java.util.HashSet; 11 import java.util.List; 10 12 import java.util.Set; 11 13 import java.util.logging.Logger; 12 14 13 15 import javax.swing.JLabel; 14 import javax.swing.tree.DefaultMutableTreeNode;15 import javax.swing.tree.MutableTreeNode;16 16 17 17 import org.openstreetmap.josm.Main; … … 96 96 } 97 97 98 protected MutableTreeNode getDescription(OsmPrimitive primitive) { 99 return new DefaultMutableTreeNode( 100 new JLabel( 101 tr("Purged object ''{0}''", primitive.getDisplayName(DefaultNameFormatter.getInstance())), 98 @Override public JLabel getDescription() { 99 if (purgedPrimitives.size() == 1) { 100 return new JLabel( 101 tr("Purged object ''{0}''", 102 purgedPrimitives.iterator().next().getDisplayName(DefaultNameFormatter.getInstance())), 103 ImageProvider.get("data", "object"), 104 JLabel.HORIZONTAL 105 ); 106 } else { 107 return new JLabel(trn("Purged {0} object", "Purged {0} objects", purgedPrimitives.size(), purgedPrimitives.size())); 108 } 109 } 110 111 @Override public Collection<PseudoCommand> getChildren() { 112 if (purgedPrimitives.size() == 1) 113 return null; 114 List<PseudoCommand> children = new ArrayList<PseudoCommand>(); 115 for (final OsmPrimitive osm : purgedPrimitives) { 116 children.add(new PseudoCommand() { 117 @Override public JLabel getDescription() { 118 return new JLabel( 119 tr("Purged object ''{0}''", 120 osm.getDisplayName(DefaultNameFormatter.getInstance())), 102 121 ImageProvider.get("data", "object"), 103 122 JLabel.HORIZONTAL 104 ) 105 ); 106 } 107 108 protected MutableTreeNode getDescription(Collection<OsmPrimitive> primitives) { 109 110 DefaultMutableTreeNode root = new DefaultMutableTreeNode( 111 trn("Purged {0} object", "Purged {0} objects", primitives.size(), primitives.size()) 112 ); 113 for (OsmPrimitive p : primitives) { 114 root.add(getDescription(p)); 115 } 116 return root; 117 } 118 119 @Override 120 public MutableTreeNode description() { 121 if (purgedPrimitives.size() == 1) 122 return getDescription(purgedPrimitives.iterator().next()); 123 else 124 return getDescription(purgedPrimitives); 123 ); 124 } 125 @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() { 126 return Collections.singleton(osm); 127 } 128 129 }); 130 } 131 return children; 125 132 } 126 133 -
trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
r3083 r3262 9 9 10 10 import javax.swing.JLabel; 11 import javax.swing.tree.DefaultMutableTreeNode;12 import javax.swing.tree.MutableTreeNode;13 11 14 12 import org.openstreetmap.josm.Main; … … 51 49 } 52 50 53 @Override 54 public MutableTreeNode description() { 55 return new DefaultMutableTreeNode( 56 new JLabel( 51 @Override public JLabel getDescription() { 52 return new JLabel( 57 53 tr("Resolve conflicts in member list of relation {0}", my.getId()), 58 54 ImageProvider.get("data", "object"), 59 55 JLabel.HORIZONTAL 60 )61 56 ); 62 57 } -
trunk/src/org/openstreetmap/josm/command/RotateCommand.java
r2070 r3262 9 9 10 10 import javax.swing.JLabel; 11 import javax.swing.tree.DefaultMutableTreeNode;12 import javax.swing.tree.MutableTreeNode;13 11 14 12 import org.openstreetmap.josm.data.coor.EastNorth; … … 138 136 } 139 137 140 @Override public MutableTreeNode description() {141 return new DefaultMutableTreeNode(new JLabel(trn("Rotate {0} node", "Rotate {0} nodes", nodes.size(), nodes.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL));138 @Override public JLabel getDescription() { 139 return new JLabel(trn("Rotate {0} node", "Rotate {0} nodes", nodes.size(), nodes.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL); 142 140 } 143 141 -
trunk/src/org/openstreetmap/josm/command/SequenceCommand.java
r1750 r3262 6 6 import java.util.Arrays; 7 7 import java.util.Collection; 8 import java.util.HashSet; 9 import java.util.List; 8 10 9 import javax.swing.tree.DefaultMutableTreeNode; 10 import javax.swing.tree.MutableTreeNode; 11 import javax.swing.JLabel; 11 12 12 13 import org.openstreetmap.josm.Main; 13 14 import org.openstreetmap.josm.data.osm.OsmPrimitive; 15 import org.openstreetmap.josm.tools.ImageProvider; 14 16 15 17 /** … … 88 90 } 89 91 90 @Override public MutableTreeNode description() { 91 DefaultMutableTreeNode root = new DefaultMutableTreeNode(tr("Sequence")+": "+name); 92 @Override public JLabel getDescription() { 93 return new JLabel(tr("Sequence")+": "+name, ImageProvider.get("data", "sequence"), JLabel.HORIZONTAL); 94 } 95 96 @Override 97 public Collection<PseudoCommand> getChildren() { 98 return (List) Arrays.asList(sequence); 99 } 100 101 @Override 102 public Collection<? extends OsmPrimitive> getParticipatingPrimitives() { 103 Collection<OsmPrimitive> prims = new HashSet<OsmPrimitive>(); 92 104 for (Command c : sequence) { 93 root.add(c.description());105 prims.addAll(c.getParticipatingPrimitives()); 94 106 } 95 return root;107 return prims; 96 108 } 97 109 } -
trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java
r3083 r3262 10 10 11 11 import javax.swing.JLabel; 12 import javax.swing.tree.DefaultMutableTreeNode;13 import javax.swing.tree.MutableTreeNode;14 12 15 13 import org.openstreetmap.josm.data.conflict.Conflict; … … 61 59 } 62 60 63 @Override 64 public MutableTreeNode description() { 61 @Override public JLabel getDescription() { 65 62 String msg = ""; 66 63 switch(OsmPrimitiveType.from(conflict.getMy())) { … … 69 66 case RELATION: msg = marktr("Resolve {0} tag conflicts in relation {1}"); break; 70 67 } 71 return new DefaultMutableTreeNode( 72 new JLabel( 68 return new JLabel( 73 69 tr(msg,getNumDecidedConflicts(), conflict.getMy().getId()), 74 70 ImageProvider.get("data", "object"), 75 71 JLabel.HORIZONTAL 76 )77 72 ); 78 73 } -
trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java
r3083 r3262 11 11 12 12 import javax.swing.JLabel; 13 import javax.swing.tree.DefaultMutableTreeNode;14 import javax.swing.tree.MutableTreeNode;15 13 16 14 import org.openstreetmap.josm.data.osm.DataSet; … … 62 60 } 63 61 64 @Override 65 public MutableTreeNode description() { 66 return new DefaultMutableTreeNode( 67 new JLabel( 62 @Override public JLabel getDescription() { 63 return new JLabel( 68 64 trn("Undelete {0} primitive", "Undelete {0} primitives", toUndelete.size(), toUndelete.size()), 69 65 ImageProvider.get("data", "object"), 70 66 JLabel.HORIZONTAL 71 )72 67 ); 73 68 } -
trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java
r3083 r3262 8 8 9 9 import javax.swing.JLabel; 10 import javax.swing.tree.DefaultMutableTreeNode;11 import javax.swing.tree.MutableTreeNode;12 10 13 11 import org.openstreetmap.josm.data.conflict.Conflict; … … 35 33 } 36 34 37 @Override 38 public MutableTreeNode description() { 35 @Override public JLabel getDescription() { 39 36 String msg = ""; 40 37 switch(OsmPrimitiveType.from(conflict.getMy())) { … … 43 40 case RELATION: msg = marktr("Resolve version conflict for relation {0}"); break; 44 41 } 45 return new DefaultMutableTreeNode( 46 new JLabel( 42 return new JLabel( 47 43 tr(msg,conflict.getMy().getId()), 48 44 ImageProvider.get("data", "object"), 49 45 JLabel.HORIZONTAL 50 )51 46 ); 52 47 } -
trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
r3083 r3262 9 9 10 10 import javax.swing.JLabel; 11 import javax.swing.tree.DefaultMutableTreeNode;12 import javax.swing.tree.MutableTreeNode;13 11 14 12 import org.openstreetmap.josm.data.conflict.Conflict; … … 47 45 } 48 46 49 @Override 50 public MutableTreeNode description() { 51 return new DefaultMutableTreeNode( 52 new JLabel( 47 @Override public JLabel getDescription() { 48 return new JLabel( 53 49 tr("Resolve conflicts in node list of way {0}", conflict.getMy().getId()), 54 50 ImageProvider.get("data", "object"), 55 51 JLabel.HORIZONTAL 56 )57 52 ); 58 53 }
Note: See TracChangeset
for help on using the changeset viewer.