Changeset 5792 in josm
- Timestamp:
- 2013-03-22T02:23:23+01:00 (11 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r5700 r5792 253 253 cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions)); 254 254 } 255 for(String p : targetPrimitive.getDiscardableKeys()) {255 for(String p : OsmPrimitive.getDiscardableKeys()) { 256 256 if (targetPrimitive.get(p) != null) { 257 257 cmds.add(new ChangePropertyCommand(targetPrimitive, p, null)); -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r5779 r5792 463 463 */ 464 464 static public void setMaxWorkers() { 465 JobDispatcher. getInstance().setMaxWorkers(PROP_TMS_JOBS.get());465 JobDispatcher.setMaxWorkers(PROP_TMS_JOBS.get()); 466 466 JobDispatcher.getInstance().setLIFO(true); 467 467 } -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
r5791 r5792 511 511 } 512 512 }); 513 pnl.add(releasebutton, GBC. std().eol());513 pnl.add(releasebutton, GBC.eol()); 514 514 value = pnl; 515 515 }
Note:
See TracChangeset
for help on using the changeset viewer.