Changeset 10300 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2016-05-30T01:17:28+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MapView.java
r10285 r10300 258 258 @Override 259 259 public String toString() { 260 return "LayerChangeAdapter [wrapped=" + wrapped + "]"; 261 } 262 260 return "LayerChangeAdapter [wrapped=" + wrapped + ']'; 261 } 263 262 } 264 263 … … 314 313 @Override 315 314 public String toString() { 316 return "EditLayerChangeAdapter [wrapped=" + wrapped + "]"; 317 } 318 315 return "EditLayerChangeAdapter [wrapped=" + wrapped + ']'; 316 } 319 317 } 320 318 -
trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
r10179 r10300 114 114 numParentRelations, numParentRelations); 115 115 @I18n.QuirkyPluralString 116 final String msg = "<html>" + msg1 + " "+ msg2 + "</html>";116 final String msg = "<html>" + msg1 + ' ' + msg2 + "</html>"; 117 117 htmlPanel.getEditorPane().setText(msg); 118 118 invalidate(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
r10254 r10300 72 72 p.setVisible(false); 73 73 74 mSpltPane.add(p, "L"+i);74 mSpltPane.add(p, 'L'+Integer.toString(i)); 75 75 panels.add(p); 76 76 … … 257 257 ch.add(new Divider()); 258 258 } 259 Leaf l = new Leaf( "L"+i);259 Leaf l = new Leaf('L'+Integer.toString(i)); 260 260 l.setWeight(1.0 / numPanels); 261 261 ch.add(l); -
trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java
r9214 r10300 200 200 tfLatLon.setText(ll.latToString(CoordinateFormat.getDefaultFormat()) + ' ' + ll.lonToString(CoordinateFormat.getDefaultFormat())); 201 201 EastNorth en = Main.getProjection().latlon2eastNorth(ll); 202 tfEastNorth.setText( en.east()+" "+en.north());202 tfEastNorth.setText(Double.toString(en.east()) + ' ' + Double.toString(en.north())); 203 203 setOkEnabled(true); 204 204 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
r10179 r10300 688 688 p.add(new JScrollPane(txtErrors), GBC.std().fill()); 689 689 for (T t : items) { 690 txtErrors.append(t + "\n");690 txtErrors.append(t.toString() + '\n'); 691 691 } 692 692 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
r10245 r10300 299 299 @Override 300 300 public String toString() { 301 return "OpacitySlider [getRealValue()=" + getRealValue() + "]";301 return "OpacitySlider [getRealValue()=" + getRealValue() + ']'; 302 302 } 303 303 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r10254 r10300 812 812 Shortcut sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask); 813 813 if (sc != null) { 814 lines.add(sc.getKeyText() + " "+ tr("to apply first suggestion"));815 } 816 lines.add(KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+'+'+KeyEvent.getKeyText(KeyEvent.VK_ENTER) + " "814 lines.add(sc.getKeyText() + ' ' + tr("to apply first suggestion")); 815 } 816 lines.add(KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+'+'+KeyEvent.getKeyText(KeyEvent.VK_ENTER) + ' ' 817 817 +tr("to add without closing the dialog")); 818 818 sc = Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask | KeyEvent.SHIFT_DOWN_MASK); 819 819 if (sc != null) { 820 lines.add(sc.getKeyText() + " "+ tr("to add first suggestion without closing the dialog"));820 lines.add(sc.getKeyText() + ' ' + tr("to add first suggestion without closing the dialog")); 821 821 } 822 822 final JLabel helpLabel = new JLabel("<html>" + Utils.join("<br>", lines) + "</html>"); -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r10179 r10300 1625 1625 return null; 1626 1626 if (Main.isTraceEnabled()) { 1627 Main.trace("Clicked on tile: " + clickedTile.getXtile() + " "+ clickedTile.getYtile() +1627 Main.trace("Clicked on tile: " + clickedTile.getXtile() + ' ' + clickedTile.getYtile() + 1628 1628 " currentZoomLevel: " + currentZoomLevel); 1629 1629 } -
trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
r10179 r10300 304 304 return process(to); 305 305 } 306 307 @Override 308 public String toString() { 309 return "GammaImageProcessor [gamma=" + gamma + ']'; 310 } 306 311 } 307 312 … … 387 392 @Override 388 393 public String toString() { 389 return "SharpenImageProcessor [sharpenLevel=" + sharpenLevel + "]";394 return "SharpenImageProcessor [sharpenLevel=" + sharpenLevel + ']'; 390 395 } 391 396 } … … 437 442 @Override 438 443 public String toString() { 439 return "ColorfulImageProcessor [colorfulness=" + colorfulness + "]";444 return "ColorfulImageProcessor [colorfulness=" + colorfulness + ']'; 440 445 } 441 446 } … … 470 475 int type = src.getType(); 471 476 if (type != dest.getType()) { 472 Main.trace("Cannot apply color filter: Src / Dest differ in type (" + type + "/" + dest.getType() + ")");477 Main.trace("Cannot apply color filter: Src / Dest differ in type (" + type + '/' + dest.getType() + ')'); 473 478 return src; 474 479 } -
trunk/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
r10031 r10300 31 31 */ 32 32 public PaintableInvalidationEvent(MapViewPaintable paintable) { 33 super();34 33 this.paintable = paintable; 35 34 } … … 45 44 @Override 46 45 public String toString() { 47 return "LayerInvalidationEvent [layer=" + paintable + "]";46 return "LayerInvalidationEvent [layer=" + paintable + ']'; 48 47 } 49 48 } -
trunk/src/org/openstreetmap/josm/gui/layer/NativeScaleLayer.java
r9914 r10300 240 240 StringBuilder stringBuilder = new StringBuilder(); 241 241 for (Scale s: this.scales) { 242 stringBuilder.append(s + "\n");242 stringBuilder.append(s.toString() + '\n'); 243 243 } 244 244 return stringBuilder.toString(); -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r10280 r10300 804 804 final GpxLayer gpxLayer = new GpxLayer(gpxData, tr("Converted from: {0}", getName())); 805 805 if (getAssociatedFile() != null) { 806 final String filename = getAssociatedFile().getName().replaceAll(Pattern.quote(".gpx.osm") + "$", "") + ".gpx";806 String filename = getAssociatedFile().getName().replaceAll(Pattern.quote(".gpx.osm") + '$', "") + ".gpx"; 807 807 gpxLayer.setAssociatedFile(new File(getAssociatedFile().getParentFile(), filename)); 808 808 } -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
r9277 r10300 95 95 96 96 private BufferedImage loadThumb(ImageEntry entry) { 97 final String cacheIdent = entry.getFile() +":"+maxSize;97 final String cacheIdent = entry.getFile().toString()+':'+maxSize; 98 98 99 99 if (!cacheOff && cache != null) { -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r10050 r10300 222 222 @Override 223 223 public String getToolTipText() { 224 return data.size()+" "+trn("marker", "markers", data.size());224 return Integer.toString(data.size())+' '+trn("marker", "markers", data.size()); 225 225 } 226 226 227 227 @Override 228 228 public void mergeFrom(Layer from) { 229 MarkerLayer layer = (MarkerLayer) from; 230 data.addAll(layer.data); 231 Collections.sort(data, new Comparator<Marker>() { 232 @Override 233 public int compare(Marker o1, Marker o2) { 234 return Double.compare(o1.time, o2.time); 235 } 236 }); 229 if (from instanceof MarkerLayer) { 230 data.addAll(((MarkerLayer) from).data); 231 Collections.sort(data, new Comparator<Marker>() { 232 @Override 233 public int compare(Marker o1, Marker o2) { 234 return Double.compare(o1.time, o2.time); 235 } 236 }); 237 } 237 238 } 238 239 -
trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java
r10200 r10300 130 130 } catch (NumberFormatException e) { 131 131 if (Main.isDebugEnabled()) { 132 Main.debug( "'"+o+"' cannot be converted to float");132 Main.debug('\'' + (String) o + "' cannot be converted to float"); 133 133 } 134 134 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
r10245 r10300 743 743 private final Expression e; 744 744 745 /** 746 * Constructs a new {@code ExpressionFactory} 747 * @param e expression 748 */ 745 749 public ExpressionCondition(Expression e) { 746 750 this.e = e; … … 755 759 @Override 756 760 public String toString() { 757 return "[" + e+ ']';761 return '[' + e.toString() + ']'; 758 762 } 759 763 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java
r8846 r10300 9 9 /** 10 10 * Simple literal value, that does not depend on other expressions. 11 * @since 5705 11 12 */ 12 13 public class LiteralExpression implements Expression { 13 14 private final Object literal; 14 15 16 /** 17 * Constructs a new {@code LiteralExpression}. 18 * @param literal literal 19 */ 15 20 public LiteralExpression(Object literal) { 16 21 CheckParameterUtil.ensureParameterNotNull(literal); … … 28 33 return Arrays.toString((float[]) literal); 29 34 } 30 return "<" + literal+ '>';35 return '<' + literal.toString() + '>'; 31 36 } 32 37 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
r10033 r10300 435 435 @Override 436 436 public String toString() { 437 return left + " "+ (ChildOrParentSelectorType.PARENT.equals(type) ? '<' : '>') + link + ' ' + right;437 return left.toString() + ' ' + (ChildOrParentSelectorType.PARENT.equals(type) ? '<' : '>') + link + ' ' + right; 438 438 } 439 439 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java
r9371 r10300 269 269 @Override 270 270 public String toString() { 271 return "{" + getClass().getSimpleName() +'}';271 return '{' + getClass().getSimpleName() + '}'; 272 272 } 273 273 -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
r10254 r10300 530 530 @Override 531 531 public String toString() { 532 return (types == null ? "" : types ) + " "+ name;532 return (types == null ? "" : types.toString()) + ' ' + name; 533 533 } 534 534 -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java
r9422 r10300 168 168 @Override 169 169 public String toString() { 170 return classification + " "+ preset;170 return Integer.toString(classification) + ' ' + preset; 171 171 } 172 172 }
Note:
See TracChangeset
for help on using the changeset viewer.