- Timestamp:
- 2015-10-08T00:22:36+02:00 (9 years ago)
- Location:
- trunk
- Files:
-
- 196 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java
r8513 r8836 63 63 * Create an InvalidSelection exception with default message 64 64 */ 65 publicInvalidSelection() {65 InvalidSelection() { 66 66 super(tr("Please select at least three nodes.")); 67 67 } … … 71 71 * @param msg Message that will be display to the user 72 72 */ 73 publicInvalidSelection(String msg) {73 InvalidSelection(String msg) { 74 74 super(msg); 75 75 } … … 356 356 * @throws InvalidSelection if nodes have same coordinates 357 357 */ 358 publicLine(Node first, Node last) throws InvalidSelection {358 Line(Node first, Node last) throws InvalidSelection { 359 359 xM = first.getEastNorth().getX(); 360 360 yM = first.getEastNorth().getY(); … … 376 376 * @throws InvalidSelection if nodes have same coordinates 377 377 */ 378 publicLine(Way way) throws InvalidSelection {378 Line(Way way) throws InvalidSelection { 379 379 this(way.firstNode(), way.lastNode()); 380 380 } -
trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
r8513 r8836 364 364 private TreeSelectionListener validatorSelectionListener; 365 365 366 publicMapFrameAdapter() {366 MapFrameAdapter() { 367 367 if ("conflict".equals(mode)) { 368 368 conflictSelectionListener = new ListSelectionListener() { -
trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
r8513 r8836 191 191 * Constructs a new {@code ImageryOffsetDialog}. 192 192 */ 193 publicImageryOffsetDialog() {193 ImageryOffsetDialog() { 194 194 super(Main.parent, 195 195 tr("Adjust imagery offset"), -
trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java
r8795 r8836 85 85 public final String role; 86 86 87 publicRelationRole(Relation rel, String role) {87 RelationRole(Relation rel, String role) { 88 88 this.rel = rel; 89 89 this.role = role; … … 197 197 198 198 /** Constructor */ 199 publicWayTraverser(Collection<WayInPolygon> ways) {199 WayTraverser(Collection<WayInPolygon> ways) { 200 200 availableWays = new HashSet<>(ways); 201 201 lastWay = null; … … 381 381 public final AssembledMultipolygon pol; 382 382 383 publicPolygonLevel(AssembledMultipolygon pol, int level) {383 PolygonLevel(AssembledMultipolygon pol, int level) { 384 384 this.pol = pol; 385 385 this.level = level; -
trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
r8823 r8836 411 411 public double heading; // heading of segSum == approximate heading of the way 412 412 413 publicWayData(Way pWay) {413 WayData(Way pWay) { 414 414 way = pWay; 415 415 nNode = way.getNodes().size(); -
trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java
r8540 r8836 193 193 private Set<OsmPrimitive> hull; 194 194 195 publicUploadHullBuilder() {195 UploadHullBuilder() { 196 196 hull = new HashSet<>(); 197 197 } … … 269 269 * @param toUpload the collection of primitives to upload 270 270 */ 271 publicDeletedParentsChecker(OsmDataLayer layer, Collection<OsmPrimitive> toUpload) {271 DeletedParentsChecker(OsmDataLayer layer, Collection<OsmPrimitive> toUpload) { 272 272 super(tr("Checking parents for deleted objects")); 273 273 this.toUpload = toUpload; -
trunk/src/org/openstreetmap/josm/actions/ValidateAction.java
r8510 r8836 124 124 * @param formerValidatedPrimitives the last collection of primitives being validates. May be null. 125 125 */ 126 publicValidationTask(Collection<Test> tests, Collection<OsmPrimitive> validatedPrimitives,126 ValidationTask(Collection<Test> tests, Collection<OsmPrimitive> validatedPrimitives, 127 127 Collection<OsmPrimitive> formerValidatedPrimitives) { 128 128 super(tr("Validating"), false /*don't ignore exceptions */); -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java
r8510 r8836 102 102 private final boolean newLayer; 103 103 104 publicDownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {104 DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) { 105 105 super(tr("Downloading GPS data"), progressMonitor, false); 106 106 this.reader = reader; -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
r8318 r8836 91 91 protected List<Note> notesData; 92 92 93 publicDownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) {93 DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) { 94 94 super(tr("Downloading Notes"), progressMonitor, false); 95 95 this.reader = reader; … … 137 137 class DownloadBoundingBoxTask extends DownloadTask { 138 138 139 publicDownloadBoundingBoxTask(OsmServerReader reader, ProgressMonitor progressMonitor) {139 DownloadBoundingBoxTask(OsmServerReader reader, ProgressMonitor progressMonitor) { 140 140 super(reader, progressMonitor); 141 141 } … … 173 173 class DownloadRawUrlTask extends DownloadTask { 174 174 175 publicDownloadRawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) {175 DownloadRawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) { 176 176 super(reader, progressMonitor); 177 177 } … … 199 199 class DownloadBzip2RawUrlTask extends DownloadTask { 200 200 201 publicDownloadBzip2RawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) {201 DownloadBzip2RawUrlTask(OsmServerReader reader, ProgressMonitor progressMonitor) { 202 202 super(reader, progressMonitor); 203 203 } -
trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
r8338 r8836 232 232 private final boolean osmData; 233 233 234 publicPostDownloadProcessor(boolean osmData) {234 PostDownloadProcessor(boolean osmData) { 235 235 this.osmData = osmData; 236 236 } -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r8645 r8836 1774 1774 * Constructs a new {@code SnapChangeAction}. 1775 1775 */ 1776 publicSnapChangeAction() {1776 SnapChangeAction() { 1777 1777 super(tr("Angle snapping"), /* ICON() */ "anglesnap", 1778 1778 tr("Switch angle snapping mode while drawing"), null, false); -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r8549 r8836 158 158 public final boolean perpendicular; 159 159 160 publicReferenceSegment(EastNorth en, EastNorth p1, EastNorth p2, boolean perpendicular) {160 ReferenceSegment(EastNorth en, EastNorth p1, EastNorth p2, boolean perpendicular) { 161 161 this.en = en; 162 162 this.p1 = p1; … … 189 189 190 190 private class DualAlignChangeAction extends JosmAction { 191 publicDualAlignChangeAction() {191 DualAlignChangeAction() { 192 192 super(tr("Dual alignment"), /* ICON() */ "mapmode/extrude/dualalign", 193 193 tr("Switch dual alignment mode while extruding"), null, false); … … 1179 1179 + Math.abs(heightpoint.getX()) + Math.abs(heightpoint.getY()); 1180 1180 1181 return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * linelength) 1181 return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * linelength), start.getY() 1182 1182 + (unitvector.getY() * linelength))); 1183 1183 } catch (NoninvertibleTransformException e) { 1184 return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * 10) 1184 return new Line2D.Double(start, new Point2D.Double(start.getX() + (unitvector.getX() * 10), start.getY() 1185 1185 + (unitvector.getY() * 10))); 1186 1186 } -
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r8674 r8836 84 84 85 85 // contains all possible cases the cursor can be in the SelectAction 86 private staticenum SelectActionCursor {86 private enum SelectActionCursor { 87 87 rect("normal", /* ICON(cursor/modifier/) */ "selection"), 88 88 rect_add("normal", /* ICON(cursor/modifier/) */ "select_add"), -
trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
r8821 r8836 62 62 private static final String SEARCH_EXPRESSION = "searchExpression"; 63 63 64 public staticenum SearchMode {64 public enum SearchMode { 65 65 replace('R'), add('A'), remove('D'), in_selection('S'); 66 66 … … 178 178 private final HistoryComboBox hcb; 179 179 180 publicSearchKeywordRow(HistoryComboBox hcb) {180 SearchKeywordRow(HistoryComboBox hcb) { 181 181 super(new FlowLayout(FlowLayout.LEFT)); 182 182 this.hcb = hcb; … … 352 352 .addTitle(tr("basic examples")) 353 353 .addKeyword(tr("Baker Street"), null, tr("''Baker'' and ''Street'' in any key")) 354 .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key")) 355 ,GBC.eol());354 .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key")), 355 GBC.eol()); 356 356 right.add(new SearchKeywordRow(hcbSearchString) 357 357 .addTitle(tr("basics")) … … 367 367 tr("to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped " + 368 368 "by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."), 369 "\"addr:street\"") 370 ,GBC.eol());369 "\"addr:street\""), 370 GBC.eol()); 371 371 right.add(new SearchKeywordRow(hcbSearchString) 372 372 .addTitle(tr("combinators")) … … 375 375 .addKeyword("<i>expr</i> OR <i>expr</i>", "OR ", tr("logical or (at least one expression has to be satisfied)")) 376 376 .addKeyword("-<i>expr</i>", null, tr("logical not")) 377 .addKeyword("(<i>expr</i>)", "()", tr("use parenthesis to group expressions")) 378 ,GBC.eol());377 .addKeyword("(<i>expr</i>)", "()", tr("use parenthesis to group expressions")), 378 GBC.eol()); 379 379 380 380 if (Main.pref.getBoolean("expert", false)) { … … 385 385 .addKeyword("type:relation", "type:relation ", tr("all relations")) 386 386 .addKeyword("closed", "closed ", tr("all closed ways")) 387 .addKeyword("untagged", "untagged ", tr("object without useful tags")) 388 ,GBC.eol());387 .addKeyword("untagged", "untagged ", tr("object without useful tags")), 388 GBC.eol()); 389 389 right.add(new SearchKeywordRow(hcbSearchString) 390 390 .addTitle(tr("metadata")) … … 395 395 "changeset:0 (objects without an assigned changeset)") 396 396 .addKeyword("timestamp:", "timestamp:", tr("objects with last modification timestamp within range"), "timestamp:2012/", 397 "timestamp:2008/2011-02-04T12") 398 ,GBC.eol());397 "timestamp:2008/2011-02-04T12"), 398 GBC.eol()); 399 399 right.add(new SearchKeywordRow(hcbSearchString) 400 400 .addTitle(tr("properties")) … … 404 404 .addKeyword("role:", "role:", tr("objects with given role in a relation")) 405 405 .addKeyword("areasize:<i>-100</i>", "areasize:", tr("closed ways with an area of 100 m\u00b2")) 406 .addKeyword("waylength:<i>200-</i>", "waylength:", tr("ways with a length of 200 m or more")) 407 ,GBC.eol());406 .addKeyword("waylength:<i>200-</i>", "waylength:", tr("ways with a length of 200 m or more")), 407 GBC.eol()); 408 408 right.add(new SearchKeywordRow(hcbSearchString) 409 409 .addTitle(tr("state")) … … 411 411 .addKeyword("new", "new ", tr("all new objects")) 412 412 .addKeyword("selected", "selected ", tr("all selected objects")) 413 .addKeyword("incomplete", "incomplete ", tr("all incomplete objects")) 414 ,GBC.eol());413 .addKeyword("incomplete", "incomplete ", tr("all incomplete objects")), 414 GBC.eol()); 415 415 right.add(new SearchKeywordRow(hcbSearchString) 416 416 .addTitle(tr("related objects")) … … 420 420 tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1") 421 421 .addKeyword("nth%:<i>7</i>", "nth%: ", 422 tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)") 423 ,GBC.eol());422 tr("every n-th member of relation and/or every n-th node of way"), "nth%:100 (child waterway)"), 423 GBC.eol()); 424 424 right.add(new SearchKeywordRow(hcbSearchString) 425 425 .addTitle(tr("view")) … … 428 428 .addKeyword("indownloadedarea", "indownloadedarea ", tr("objects in downloaded area")) 429 429 .addKeyword("allindownloadedarea", "allindownloadedarea ", 430 tr("objects (and all its way nodes / relation members) in downloaded area")) 431 ,GBC.eol());430 tr("objects (and all its way nodes / relation members) in downloaded area")), 431 GBC.eol()); 432 432 } 433 433 } -
trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
r8822 r8836 354 354 private final boolean defaultValue; 355 355 356 publicBooleanMatch(String key, boolean defaultValue) {356 BooleanMatch(String key, boolean defaultValue) { 357 357 this.key = key; 358 358 this.defaultValue = defaultValue; … … 435 435 */ 436 436 private static class Id extends RangeMatch { 437 publicId(Range range) {437 Id(Range range) { 438 438 super(range); 439 439 } 440 440 441 publicId(PushbackTokenizer tokenizer) throws ParseError {441 Id(PushbackTokenizer tokenizer) throws ParseError { 442 442 this(tokenizer.readRange(tr("Range of primitive ids expected"))); 443 443 } … … 458 458 */ 459 459 private static class ChangesetId extends RangeMatch { 460 publicChangesetId(Range range) {460 ChangesetId(Range range) { 461 461 super(range); 462 462 } 463 463 464 publicChangesetId(PushbackTokenizer tokenizer) throws ParseError {464 ChangesetId(PushbackTokenizer tokenizer) throws ParseError { 465 465 this(tokenizer.readRange(tr("Range of changeset ids expected"))); 466 466 } … … 481 481 */ 482 482 private static class Version extends RangeMatch { 483 publicVersion(Range range) {483 Version(Range range) { 484 484 super(range); 485 485 } 486 486 487 publicVersion(PushbackTokenizer tokenizer) throws ParseError {487 Version(PushbackTokenizer tokenizer) throws ParseError { 488 488 this(tokenizer.readRange(tr("Range of versions expected"))); 489 489 } … … 510 510 private final boolean caseSensitive; 511 511 512 publicKeyValue(String key, String value, boolean regexSearch, boolean caseSensitive) throws ParseError {513 this.caseSensitive = caseSensitive;512 KeyValue(String key, String value, boolean regexSearch, boolean caseSensitive) throws ParseError { 513 this.caseSensitive = caseSensitive; 514 514 if (regexSearch) { 515 515 int searchFlags = regexFlags(caseSensitive); … … 781 781 private final boolean caseSensitive; 782 782 783 publicAny(String s, boolean regexSearch, boolean caseSensitive) throws ParseError {783 Any(String s, boolean regexSearch, boolean caseSensitive) throws ParseError { 784 784 s = Normalizer.normalize(s, Normalizer.Form.NFC); 785 785 this.caseSensitive = caseSensitive; … … 845 845 private final OsmPrimitiveType type; 846 846 847 publicExactType(String type) throws ParseError {847 ExactType(String type) throws ParseError { 848 848 this.type = OsmPrimitiveType.from(type); 849 849 if (this.type == null) … … 869 869 private String user; 870 870 871 publicUserMatch(String user) {871 UserMatch(String user) { 872 872 if ("anonymous".equals(user)) { 873 873 this.user = null; … … 897 897 private String role; 898 898 899 publicRoleMatch(String role) {899 RoleMatch(String role) { 900 900 if (role == null) { 901 901 this.role = ""; … … 935 935 private final boolean modulo; 936 936 937 publicNth(PushbackTokenizer tokenizer, boolean modulo) throws ParseError {937 Nth(PushbackTokenizer tokenizer, boolean modulo) throws ParseError { 938 938 this((int) tokenizer.readNumber(tr("Positive integer expected")), modulo); 939 939 } … … 982 982 private final long max; 983 983 984 publicRangeMatch(long min, long max) {984 RangeMatch(long min, long max) { 985 985 this.min = Math.min(min, max); 986 986 this.max = Math.max(min, max); 987 987 } 988 988 989 publicRangeMatch(Range range) {989 RangeMatch(Range range) { 990 990 this(range.getStart(), range.getEnd()); 991 991 } … … 1014 1014 */ 1015 1015 private static class NodeCountRange extends RangeMatch { 1016 publicNodeCountRange(Range range) {1016 NodeCountRange(Range range) { 1017 1017 super(range); 1018 1018 } 1019 1019 1020 publicNodeCountRange(PushbackTokenizer tokenizer) throws ParseError {1020 NodeCountRange(PushbackTokenizer tokenizer) throws ParseError { 1021 1021 this(tokenizer.readRange(tr("Range of numbers expected"))); 1022 1022 } … … 1043 1043 */ 1044 1044 private static class WayCountRange extends RangeMatch { 1045 publicWayCountRange(Range range) {1045 WayCountRange(Range range) { 1046 1046 super(range); 1047 1047 } 1048 1048 1049 publicWayCountRange(PushbackTokenizer tokenizer) throws ParseError {1049 WayCountRange(PushbackTokenizer tokenizer) throws ParseError { 1050 1050 this(tokenizer.readRange(tr("Range of numbers expected"))); 1051 1051 } … … 1072 1072 */ 1073 1073 private static class TagCountRange extends RangeMatch { 1074 publicTagCountRange(Range range) {1074 TagCountRange(Range range) { 1075 1075 super(range); 1076 1076 } 1077 1077 1078 publicTagCountRange(PushbackTokenizer tokenizer) throws ParseError {1078 TagCountRange(PushbackTokenizer tokenizer) throws ParseError { 1079 1079 this(tokenizer.readRange(tr("Range of numbers expected"))); 1080 1080 } … … 1096 1096 private static class TimestampRange extends RangeMatch { 1097 1097 1098 publicTimestampRange(long minCount, long maxCount) {1098 TimestampRange(long minCount, long maxCount) { 1099 1099 super(minCount, maxCount); 1100 1100 } … … 1266 1266 private static class AreaSize extends RangeMatch { 1267 1267 1268 publicAreaSize(Range range) {1268 AreaSize(Range range) { 1269 1269 super(range); 1270 1270 } 1271 1271 1272 publicAreaSize(PushbackTokenizer tokenizer) throws ParseError {1272 AreaSize(PushbackTokenizer tokenizer) throws ParseError { 1273 1273 this(tokenizer.readRange(tr("Range of numbers expected"))); 1274 1274 } … … 1293 1293 private static class WayLength extends RangeMatch { 1294 1294 1295 publicWayLength(Range range) {1295 WayLength(Range range) { 1296 1296 super(range); 1297 1297 } 1298 1298 1299 publicWayLength(PushbackTokenizer tokenizer) throws ParseError {1299 WayLength(PushbackTokenizer tokenizer) throws ParseError { 1300 1300 this(tokenizer.readRange(tr("Range of numbers expected"))); 1301 1301 } … … 1325 1325 * @param all if true, all way nodes or relation members have to be within source area;if false, one suffices. 1326 1326 */ 1327 publicInArea(boolean all) {1327 InArea(boolean all) { 1328 1328 this.all = all; 1329 1329 } … … 1375 1375 private static class InView extends InArea { 1376 1376 1377 publicInView(boolean all) {1377 InView(boolean all) { 1378 1378 super(all); 1379 1379 } -
trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java
r8831 r8836 48 48 * @param monitor progress monitor 49 49 */ 50 publicUploadTask(String title, ProgressMonitor monitor) {50 UploadTask(String title, ProgressMonitor monitor) { 51 51 super(title, monitor, false); 52 52 } -
trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
r8512 r8836 66 66 private final Pattern pattern; 67 67 68 publicStringSwitcher(String a, String b) {68 StringSwitcher(String a, String b) { 69 69 this.a = a; 70 70 this.b = b; -
trunk/src/org/openstreetmap/josm/data/APIDataSet.java
r8510 r8836 276 276 private final boolean newOrUndeleted; 277 277 278 publicRelationUploadDependencyGraph(Collection<Relation> relations, boolean newOrUndeleted) {278 RelationUploadDependencyGraph(Collection<Relation> relations, boolean newOrUndeleted) { 279 279 this.newOrUndeleted = newOrUndeleted; 280 280 build(relations); -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r8817 r8836 522 522 private final Setting<?> newValue; 523 523 524 publicDefaultPreferenceChangeEvent(String key, Setting<?> oldValue, Setting<?> newValue) {524 DefaultPreferenceChangeEvent(String key, Setting<?> oldValue, Setting<?> newValue) { 525 525 this.key = key; 526 526 this.oldValue = oldValue; … … 1721 1721 private String key; 1722 1722 1723 publicSettingToXml(StringBuilder b, boolean noPassword) {1723 SettingToXml(StringBuilder b, boolean noPassword) { 1724 1724 this.b = b; 1725 1725 this.noPassword = noPassword; -
trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
r8510 r8836 46 46 private final Class<? extends OsmPrimitive> c; 47 47 48 publicFilterPredicate(Class<? extends OsmPrimitive> c) {48 FilterPredicate(Class<? extends OsmPrimitive> c) { 49 49 this.c = c; 50 50 } -
trunk/src/org/openstreetmap/josm/data/imagery/CachedAttributionBingAerialTileSource.java
r8718 r8836 48 48 class BingAttributionData extends CacheCustomContent<IOException> { 49 49 50 publicBingAttributionData() {50 BingAttributionData() { 51 51 super("bing.attribution.xml", CacheCustomContent.INTERVAL_HOURLY); 52 52 } -
trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
r8772 r8836 133 133 private final JTable list; 134 134 135 publicSelectLayerDialog(Collection<Layer> layers) {135 SelectLayerDialog(Collection<Layer> layers) { 136 136 super(Main.parent, tr("Select WMTS layer"), new String[]{tr("Add layers"), tr("Cancel")}); 137 137 this.layers = layers.toArray(new Layer[]{}); -
trunk/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
r8512 r8836 17 17 public class ChangesetDataSet { 18 18 19 public staticenum ChangesetModificationType {19 public enum ChangesetModificationType { 20 20 CREATED, 21 21 UPDATED, … … 156 156 private HistoryOsmPrimitive primitive; 157 157 158 publicDefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) {158 DefaultChangesetDataSetEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) { 159 159 this.modificationType = modificationType; 160 160 this.primitive = primitive; … … 175 175 private Iterator<Entry<PrimitiveId, ChangesetModificationType>> typeIterator; 176 176 177 publicDefaultIterator() {177 DefaultIterator() { 178 178 typeIterator = modificationTypes.entrySet().iterator(); 179 179 } -
trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java
r8734 r8836 99 99 public List<JoinedPolygon> innerWays; 100 100 101 publicPolygonLevel(JoinedPolygon pol, int level) {101 PolygonLevel(JoinedPolygon pol, int level) { 102 102 this.outerWay = pol; 103 103 this.level = level; … … 345 345 private final List<PolygonLevel> output; 346 346 347 publicWorker(List<JoinedPolygon> input, int from, int to, List<PolygonLevel> output) {347 Worker(List<JoinedPolygon> input, int from, int to, List<PolygonLevel> output) { 348 348 this.input = input; 349 349 this.from = from; -
trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
r8510 r8836 86 86 * Constructor for root node 87 87 */ 88 publicQBLevel(final QuadBuckets<T> buckets) {88 QBLevel(final QuadBuckets<T> buckets) { 89 89 level = 0; 90 90 index = 0; … … 95 95 } 96 96 97 publicQBLevel(QBLevel<T> parent, int parent_index, final QuadBuckets<T> buckets) {97 QBLevel(QBLevel<T> parent, int parent_index, final QuadBuckets<T> buckets) { 98 98 this.parent = parent; 99 99 this.level = parent.level + 1; … … 508 508 } 509 509 510 publicQuadBucketIterator(QuadBuckets<T> qb) {510 QuadBucketIterator(QuadBuckets<T> qb) { 511 511 if (!qb.root.hasChildren() || qb.root.hasContent()) { 512 512 currentNode = qb.root; -
trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
r8533 r8836 108 108 private final boolean consolidate; 109 109 110 publicListenerInfo(DataSetListener listener, boolean consolidate) {110 ListenerInfo(DataSetListener listener, boolean consolidate) { 111 111 this.listener = listener; 112 112 this.consolidate = consolidate; -
trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
r8510 r8836 29 29 private final SelectionChangedListener listener; 30 30 31 publicListenerInfo(SelectionChangedListener listener) {31 ListenerInfo(SelectionChangedListener listener) { 32 32 this.listener = listener; 33 33 } -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/LineClip.java
r8510 r8836 38 38 return false; 39 39 } 40 return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x 40 return cohenSutherland(p1.x, p1.y, p2.x, p2.y, clipBounds.x, clipBounds.y, 41 41 clipBounds.x + clipBounds.width, clipBounds.y + clipBounds.height); 42 42 } -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r8734 r8836 110 110 private int xPrev0, yPrev0; 111 111 112 publicOffsetIterator(List<Node> nodes, double offset) {112 OffsetIterator(List<Node> nodes, double offset) { 113 113 this.nodes = nodes; 114 114 this.offset = offset; … … 193 193 private final int flags; 194 194 195 publicStyleRecord(ElemStyle style, OsmPrimitive osm, int flags) {195 StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) { 196 196 this.style = style; 197 197 this.osm = osm; … … 1563 1563 * @param output the list of styles to which styles will be added 1564 1564 */ 1565 publicComputeStyleListWorker(final List<? extends OsmPrimitive> input, int from, int to, List<StyleRecord> output) {1565 ComputeStyleListWorker(final List<? extends OsmPrimitive> input, int from, int to, List<StyleRecord> output) { 1566 1566 this.input = input; 1567 1567 this.from = from; … … 1640 1640 private final List<StyleRecord> allStyleElems; 1641 1641 1642 publicConcurrentTasksHelper(List<StyleRecord> allStyleElems) {1642 ConcurrentTasksHelper(List<StyleRecord> allStyleElems) { 1643 1643 this.allStyleElems = allStyleElems; 1644 1644 } -
trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
r8638 r8836 56 56 * @since 7370 (public) 57 57 */ 58 public staticenum Param {58 public enum Param { 59 59 60 60 /** False easting */ -
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java
r8513 r8836 108 108 * @param members The list of relation members 109 109 */ 110 publicRelationMembers(List<RelationMember> members) {110 RelationMembers(List<RelationMember> members) { 111 111 this.members = new ArrayList<>(members.size()); 112 112 for (RelationMember member : members) { … … 141 141 * @param keys The set of tags of the relation 142 142 */ 143 publicRelationPair(List<RelationMember> members, Map<String, String> keys) {143 RelationPair(List<RelationMember> members, Map<String, String> keys) { 144 144 this.members = new RelationMembers(members); 145 145 this.keys = keys; -
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
r8510 r8836 42 42 private final Map<String, String> keys; 43 43 44 publicWayPair(List<LatLon> coor, Map<String, String> keys) {44 WayPair(List<LatLon> coor, Map<String, String> keys) { 45 45 this.coor = coor; 46 46 this.keys = keys; … … 68 68 private final List<LatLon> coor; 69 69 70 publicWayPairNoTags(List<LatLon> coor) {70 WayPairNoTags(List<LatLon> coor) { 71 71 this.coor = coor; 72 72 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
r8680 r8836 78 78 } 79 79 80 staticenum CheckMode {80 enum CheckMode { 81 81 TIME_RANGE(0), POINTS_IN_TIME(1), BOTH(2); 82 82 private final int code; -
trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
r8510 r8836 88 88 private final String name; 89 89 90 publicRolePreset(List<Role> roles, String name) {90 RolePreset(List<Role> roles, String name) { 91 91 this.roles = roles; 92 92 this.name = name; -
trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java
r8577 r8836 56 56 * @param engMessage The English message 57 57 */ 58 publicUnclosedWaysCheck(int code, String key, String engMessage) {58 UnclosedWaysCheck(int code, String key, String engMessage) { 59 59 this(code, key, engMessage, Collections.<String>emptySet()); 60 60 } … … 67 67 * @param ignoredValues The ignored values. 68 68 */ 69 publicUnclosedWaysCheck(int code, String key, String engMessage, Set<String> ignoredValues) {69 UnclosedWaysCheck(int code, String key, String engMessage, Set<String> ignoredValues) { 70 70 this(code, key, engMessage, ignoredValues, true); 71 71 } … … 79 79 * @param ignore indicates if special values must be ignored or considered only 80 80 */ 81 publicUnclosedWaysCheck(int code, String key, String engMessage, Set<String> specialValues, boolean ignore) {81 UnclosedWaysCheck(int code, String key, String engMessage, Set<String> specialValues, boolean ignore) { 82 82 this.code = code; 83 83 this.key = key; … … 123 123 * @param engMessage The English message 124 124 */ 125 publicUnclosedWaysBooleanCheck(int code, String key, String engMessage) {125 UnclosedWaysBooleanCheck(int code, String key, String engMessage) { 126 126 super(code, key, engMessage); 127 127 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
r8510 r8836 297 297 private final Node n2; 298 298 299 publicMyWaySegment(Way w, Node n1, Node n2) {299 MyWaySegment(Way w, Node n1, Node n2) { 300 300 this.w = w; 301 301 String railway = w.get("railway"); -
trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
r8540 r8836 204 204 * An enum designating how long to not show this message again, i.e., for how long to store 205 205 */ 206 staticenum NotShowAgain {206 enum NotShowAgain { 207 207 NO, OPERATION, SESSION, PERMANENT; 208 208 … … 262 262 * @param displayImmediateOption whether to provide "Do not show again (this session)" 263 263 */ 264 publicMessagePanel(Object message, boolean displayImmediateOption) {264 MessagePanel(Object message, boolean displayImmediateOption) { 265 265 cbStandard.setSelected(true); 266 266 ButtonGroup group = new ButtonGroup(); -
trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
r8510 r8836 657 657 * Constructs a new {@code HelpAction}. 658 658 */ 659 publicHelpAction() {659 HelpAction() { 660 660 putValue(SHORT_DESCRIPTION, tr("Show help information")); 661 661 putValue(NAME, tr("Help")); -
trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
r8378 r8836 73 73 */ 74 74 private static class MotdContent extends CacheCustomContent<IOException> { 75 publicMotdContent() {75 MotdContent() { 76 76 super("motd.html", CacheCustomContent.INTERVAL_DAILY); 77 77 } -
trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
r8512 r8836 111 111 private int value; 112 112 113 publicDefaultAction(JDialog dialog, JOptionPane pane, int value) {113 DefaultAction(JDialog dialog, JOptionPane pane, int value) { 114 114 this.dialog = dialog; 115 115 this.pane = pane; -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r8736 r8836 594 594 private final DefaultProxySelector proxySelector; 595 595 596 publicGuiFinalizationWorker(Map<Option, Collection<String>> args, DefaultProxySelector proxySelector) {596 GuiFinalizationWorker(Map<Option, Collection<String>> args, DefaultProxySelector proxySelector) { 597 597 this.args = args; 598 598 this.proxySelector = proxySelector; -
trunk/src/org/openstreetmap/josm/gui/MainMenu.java
r8801 r8836 145 145 public class MainMenu extends JMenuBar { 146 146 147 public staticenum WINDOW_MENU_GROUP { ALWAYS, TOGGLE_DIALOG, VOLATILE }147 public enum WINDOW_MENU_GROUP { ALWAYS, TOGGLE_DIALOG, VOLATILE } 148 148 149 149 /* File menu */ … … 343 343 * @since 6082 (moved from Utilsplugin2) 344 344 */ 345 // CHECKSTYLE.OFF: LineLength 345 346 public final JMenu moreToolsMenu = addMenu("More tools", /* I18N: mnemonic: M */ trc("menu", "More tools"), KeyEvent.VK_M, 4, ht("/Menu/MoreTools")); 346 347 /** … … 367 368 * imageryMenu contains all imagery-related actions 368 369 */ 369 // CHECKSTYLE.OFF: LineLength370 370 public final ImageryMenu imageryMenu = addMenu(new ImageryMenu(imagerySubMenu), /* I18N: mnemonic: I */ "Imagery", KeyEvent.VK_I, 8, ht("/Menu/Imagery")); 371 371 // CHECKSTYLE.ON: LineLength … … 948 948 private JMenu presetsMenu; 949 949 950 publicPresetsMenuEnabler(JMenu presetsMenu) {950 PresetsMenuEnabler(JMenu presetsMenu) { 951 951 MapView.addLayerChangeListener(this); 952 952 this.presetsMenu = presetsMenu; … … 1017 1017 private String currentSearchText = null; 1018 1018 1019 publicSearchFieldTextListener(MainMenu mainMenu, JTextField searchField) {1019 SearchFieldTextListener(MainMenu mainMenu, JTextField searchField) { 1020 1020 this.mainMenu = mainMenu; 1021 1021 this.searchField = searchField; -
trunk/src/org/openstreetmap/josm/gui/MapFrame.java
r8719 r8836 548 548 private transient Collection<? extends HideableButton> buttons; 549 549 550 publicListAllButtonsAction(Collection<? extends HideableButton> buttons) {550 ListAllButtonsAction(Collection<? extends HideableButton> buttons) { 551 551 this.buttons = buttons; 552 552 } -
trunk/src/org/openstreetmap/josm/gui/MapMover.java
r8540 r8836 38 38 private final String action; 39 39 40 publicZoomerAction(String action) {40 ZoomerAction(String action) { 41 41 this.action = action; 42 42 } -
trunk/src/org/openstreetmap/josm/gui/MapSlider.java
r8510 r8836 19 19 private boolean preventChange = false; 20 20 21 publicMapSlider(MapView mv) {21 MapSlider(MapView mv) { 22 22 super(35, 150); 23 23 setOpaque(false); -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r8554 r8836 211 211 private final String text; 212 212 213 publicStatusTextHistory(Object id, String text) {213 StatusTextHistory(Object id, String text) { 214 214 this.id = id; 215 215 this.text = text; … … 348 348 private MapFrame parent; 349 349 350 publicCollector(MapFrame parent) {350 Collector(MapFrame parent) { 351 351 this.parent = parent; 352 352 } … … 751 751 }); 752 752 753 publicMapStatusPopupMenu() {753 MapStatusPopupMenu() { 754 754 for (final String key : new TreeSet<>(SystemOfMeasurement.ALL_SYSTEMS.keySet())) { 755 755 JCheckBoxMenuItem item = new JCheckBoxMenuItem(new AbstractAction(key) { -
trunk/src/org/openstreetmap/josm/gui/MenuScroller.java
r8510 r8836 428 428 private class MenuScrollTimer extends Timer { 429 429 430 publicMenuScrollTimer(final int increment, int interval) {430 MenuScrollTimer(final int increment, int interval) { 431 431 super(interval, new ActionListener() { 432 432 … … 445 445 private MenuScrollTimer timer; 446 446 447 publicMenuScrollItem(MenuIcon icon, int increment) {447 MenuScrollItem(MenuIcon icon, int increment) { 448 448 setIcon(icon); 449 449 setDisabledIcon(icon); … … 467 467 } 468 468 469 private staticenum MenuIcon implements Icon {469 private enum MenuIcon implements Icon { 470 470 471 471 UP(9, 1, 9), -
trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
r8736 r8836 635 635 private final double scale; 636 636 637 publicZoomData(EastNorth center, double scale) {637 ZoomData(EastNorth center, double scale) { 638 638 this.center = Projections.inverseProject(center); 639 639 this.scale = scale; -
trunk/src/org/openstreetmap/josm/gui/NotificationManager.java
r8510 r8836 83 83 } 84 84 85 publicNotificationManager() {85 NotificationManager() { 86 86 queue = new LinkedList<>(); 87 87 hideTimer = new Timer(defaultNotificationTime, new HideEvent()); … … 186 186 private JPanel innerPanel; 187 187 188 publicNotificationPanel(Notification note) {188 NotificationPanel(Notification note) { 189 189 setVisible(false); 190 190 build(note); … … 310 310 class HideAction extends AbstractAction { 311 311 312 publicHideAction() {312 HideAction() { 313 313 putValue(SMALL_ICON, ImageProvider.get("misc", "grey_x")); 314 314 } … … 345 345 public static class RoundedPanel extends JPanel { 346 346 347 publicRoundedPanel() {347 RoundedPanel() { 348 348 super(); 349 349 setOpaque(false); -
trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java
r8510 r8836 41 41 private int direction; 42 42 43 publicScrollViewPortMouseListener(int direction) {43 ScrollViewPortMouseListener(int direction) { 44 44 this.direction = direction; 45 45 } 46 46 47 @Override public void mouseExited(MouseEvent arg0) { 47 @Override 48 public void mouseExited(MouseEvent arg0) { 48 49 ScrollViewport.this.scrollDirection = NO_SCROLL; 49 50 timer.stop(); 50 51 } 51 52 52 @Override public void mouseReleased(MouseEvent arg0) { 53 @Override 54 public void mouseReleased(MouseEvent arg0) { 53 55 ScrollViewport.this.scrollDirection = NO_SCROLL; 54 56 timer.stop(); -
trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
r8525 r8836 155 155 private String duration = ""; 156 156 157 publicMeasurableTask(String name) {157 MeasurableTask(String name) { 158 158 this.name = name; 159 159 this.start = System.currentTimeMillis(); … … 381 381 * Constructs a new {@code SplashScreenProgressRenderer}. 382 382 */ 383 publicSplashScreenProgressRenderer() {383 SplashScreenProgressRenderer() { 384 384 build(); 385 385 } -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java
r8444 r8836 170 170 private int direction; 171 171 172 publicMoveXAction(int direction) {172 MoveXAction(int direction) { 173 173 this.direction = direction; 174 174 } … … 184 184 private int direction; 185 185 186 publicMoveYAction(int direction) {186 MoveYAction(int direction) { 187 187 this.direction = direction; 188 188 } -
trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
r8771 r8836 333 333 } 334 334 335 publicTileGridInputPanel() {335 TileGridInputPanel() { 336 336 build(); 337 337 } … … 500 500 } 501 501 502 publicTileAddressInputPanel() {502 TileAddressInputPanel() { 503 503 setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); 504 504 build(); … … 510 510 511 511 class ApplyTileAddressAction extends AbstractAction { 512 publicApplyTileAddressAction() {512 ApplyTileAddressAction() { 513 513 putValue(SMALL_ICON, ImageProvider.get("apply")); 514 514 putValue(SHORT_DESCRIPTION, tr("Apply the tile address")); … … 532 532 private TileBounds tileBounds = null; 533 533 534 publicTileAddressValidator(JTextComponent tc) {534 TileAddressValidator(JTextComponent tc) { 535 535 super(tc); 536 536 } … … 591 591 private int tileIndex; 592 592 593 publicTileCoordinateValidator(JTextComponent tc) {593 TileCoordinateValidator(JTextComponent tc) { 594 594 super(tc); 595 595 } -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
r8512 r8836 435 435 class CopyStartLeftAction extends CopyAction { 436 436 437 publicCopyStartLeftAction() {437 CopyStartLeftAction() { 438 438 super(/* ICON(dialogs/conflict/)*/ "copystartleft", tr("> top"), 439 439 tr("Copy my selected nodes to the start of the merged node list")); … … 457 457 class CopyEndLeftAction extends CopyAction { 458 458 459 publicCopyEndLeftAction() {459 CopyEndLeftAction() { 460 460 super(/* ICON(dialogs/conflict/)*/ "copyendleft", tr("> bottom"), 461 461 tr("Copy my selected elements to the end of the list of merged elements.")); … … 479 479 class CopyBeforeCurrentLeftAction extends CopyAction { 480 480 481 publicCopyBeforeCurrentLeftAction() {481 CopyBeforeCurrentLeftAction() { 482 482 super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentleft", tr("> before"), 483 483 tr("Copy my selected elements before the first selected element in the list of merged elements.")); … … 509 509 class CopyAfterCurrentLeftAction extends CopyAction { 510 510 511 publicCopyAfterCurrentLeftAction() {511 CopyAfterCurrentLeftAction() { 512 512 super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentleft", tr("> after"), 513 513 tr("Copy my selected elements after the first selected element in the list of merged elements.")); … … 535 535 class CopyStartRightAction extends CopyAction { 536 536 537 publicCopyStartRightAction() {537 CopyStartRightAction() { 538 538 super(/* ICON(dialogs/conflict/)*/ "copystartright", tr("< top"), 539 539 tr("Copy their selected element to the start of the list of merged elements.")); … … 553 553 class CopyEndRightAction extends CopyAction { 554 554 555 publicCopyEndRightAction() {555 CopyEndRightAction() { 556 556 super(/* ICON(dialogs/conflict/)*/ "copyendright", tr("< bottom"), 557 557 tr("Copy their selected elements to the end of the list of merged elements.")); … … 571 571 class CopyBeforeCurrentRightAction extends CopyAction { 572 572 573 publicCopyBeforeCurrentRightAction() {573 CopyBeforeCurrentRightAction() { 574 574 super(/* ICON(dialogs/conflict/)*/ "copybeforecurrentright", tr("< before"), 575 575 tr("Copy their selected elements before the first selected element in the list of merged elements.")); … … 597 597 class CopyAfterCurrentRightAction extends CopyAction { 598 598 599 publicCopyAfterCurrentRightAction() {599 CopyAfterCurrentRightAction() { 600 600 super(/* ICON(dialogs/conflict/)*/ "copyaftercurrentright", tr("< after"), 601 601 tr("Copy their selected element after the first selected element in the list of merged elements")); … … 623 623 class CopyAllLeft extends AbstractAction implements Observer, PropertyChangeListener { 624 624 625 publicCopyAllLeft() {625 CopyAllLeft() { 626 626 ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft"); 627 627 putValue(Action.SMALL_ICON, icon); … … 652 652 class CopyAllRight extends AbstractAction implements Observer, PropertyChangeListener { 653 653 654 publicCopyAllRight() {654 CopyAllRight() { 655 655 ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright"); 656 656 putValue(Action.SMALL_ICON, icon); … … 681 681 class MoveUpMergedAction extends AbstractAction implements ListSelectionListener { 682 682 683 publicMoveUpMergedAction() {683 MoveUpMergedAction() { 684 684 ImageIcon icon = ImageProvider.get("dialogs/conflict", "moveup"); 685 685 putValue(Action.SMALL_ICON, icon); … … 715 715 class MoveDownMergedAction extends AbstractAction implements ListSelectionListener { 716 716 717 publicMoveDownMergedAction() {717 MoveDownMergedAction() { 718 718 ImageIcon icon = ImageProvider.get("dialogs/conflict", "movedown"); 719 719 putValue(Action.SMALL_ICON, icon); … … 749 749 class RemoveMergedAction extends AbstractAction implements ListSelectionListener { 750 750 751 publicRemoveMergedAction() {751 RemoveMergedAction() { 752 752 ImageIcon icon = ImageProvider.get("dialogs/conflict", "remove"); 753 753 putValue(Action.SMALL_ICON, icon); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r8785 r8836 392 392 393 393 class KeepMyCoordinatesAction extends AbstractAction implements Observer { 394 publicKeepMyCoordinatesAction() {394 KeepMyCoordinatesAction() { 395 395 putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine")); 396 396 putValue(Action.SHORT_DESCRIPTION, tr("Keep my coordinates")); … … 409 409 410 410 class KeepTheirCoordinatesAction extends AbstractAction implements Observer { 411 publicKeepTheirCoordinatesAction() {411 KeepTheirCoordinatesAction() { 412 412 putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir")); 413 413 putValue(Action.SHORT_DESCRIPTION, tr("Keep their coordinates")); … … 426 426 427 427 class UndecideCoordinateConflictAction extends AbstractAction implements Observer { 428 publicUndecideCoordinateConflictAction() {428 UndecideCoordinateConflictAction() { 429 429 putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide")); 430 430 putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between different coordinates")); … … 443 443 444 444 class KeepMyDeletedStateAction extends AbstractAction implements Observer { 445 publicKeepMyDeletedStateAction() {445 KeepMyDeletedStateAction() { 446 446 putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeepmine")); 447 447 putValue(Action.SHORT_DESCRIPTION, tr("Keep my deleted state")); … … 460 460 461 461 class KeepTheirDeletedStateAction extends AbstractAction implements Observer { 462 publicKeepTheirDeletedStateAction() {462 KeepTheirDeletedStateAction() { 463 463 putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagkeeptheir")); 464 464 putValue(Action.SHORT_DESCRIPTION, tr("Keep their deleted state")); … … 477 477 478 478 class UndecideDeletedStateConflictAction extends AbstractAction implements Observer { 479 publicUndecideDeletedStateConflictAction() {479 UndecideDeletedStateConflictAction() { 480 480 putValue(Action.SMALL_ICON, ImageProvider.get("dialogs/conflict", "tagundecide")); 481 481 putValue(Action.SHORT_DESCRIPTION, tr("Undecide conflict between deleted state")); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
r8510 r8836 270 270 */ 271 271 class KeepMineAction extends AbstractAction implements ListSelectionListener { 272 publicKeepMineAction() {272 KeepMineAction() { 273 273 ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeepmine"); 274 274 if (icon != null) { … … 302 302 */ 303 303 class KeepTheirAction extends AbstractAction implements ListSelectionListener { 304 publicKeepTheirAction() {304 KeepTheirAction() { 305 305 ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagkeeptheir"); 306 306 if (icon != null) { … … 339 339 private final Set<Adjustable> synchronizedAdjustables; 340 340 341 publicAdjustmentSynchronizer() {341 AdjustmentSynchronizer() { 342 342 synchronizedAdjustables = new HashSet<>(); 343 343 } … … 400 400 class UndecideAction extends AbstractAction implements ListSelectionListener { 401 401 402 publicUndecideAction() {402 UndecideAction() { 403 403 ImageIcon icon = ImageProvider.get("dialogs/conflict", "tagundecide"); 404 404 if (icon != null) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
r8540 r8836 406 406 class CancelAction extends AbstractAction { 407 407 408 publicCancelAction() {408 CancelAction() { 409 409 putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution")); 410 410 putValue(Action.NAME, tr("Cancel")); … … 465 465 private double dividerLocation; 466 466 467 publicAutoAdjustingSplitPane(int newOrientation) {467 AutoAdjustingSplitPane(int newOrientation) { 468 468 super(newOrientation); 469 469 addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, this); -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
r8540 r8836 196 196 * Construct a new {@link EditorCellRenderer}. 197 197 */ 198 publicEditorCellRenderer() {198 EditorCellRenderer() { 199 199 setOpaque(true); 200 200 } -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
r8510 r8836 154 154 155 155 class ApplyRoleAction extends AbstractAction { 156 publicApplyRoleAction() {156 ApplyRoleAction() { 157 157 putValue(NAME, tr("Apply")); 158 158 putValue(SMALL_ICON, ImageProvider.get("ok")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
r8514 r8836 293 293 class SelectObjectsAction extends AbstractAction implements ListSelectionListener, ItemListener{ 294 294 295 publicSelectObjectsAction() {295 SelectObjectsAction() { 296 296 putValue(NAME, tr("Select")); 297 297 putValue(SHORT_DESCRIPTION, tr("Select all objects assigned to the currently selected changesets")); … … 346 346 */ 347 347 class ReadChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener{ 348 publicReadChangesetsAction() {348 ReadChangesetsAction() { 349 349 putValue(NAME, tr("Download")); 350 350 putValue(SHORT_DESCRIPTION, tr("Download information about the selected changesets from the OSM server")); … … 384 384 */ 385 385 class CloseOpenChangesetsAction extends AbstractAction implements ListSelectionListener, ItemListener { 386 publicCloseOpenChangesetsAction() {386 CloseOpenChangesetsAction() { 387 387 putValue(NAME, tr("Close open changesets")); 388 388 putValue(SHORT_DESCRIPTION, tr("Closes the selected open changesets")); … … 419 419 */ 420 420 class ShowChangesetInfoAction extends AbstractAction implements ListSelectionListener, ItemListener { 421 publicShowChangesetInfoAction() {421 ShowChangesetInfoAction() { 422 422 putValue(NAME, tr("Show info")); 423 423 putValue(SHORT_DESCRIPTION, tr("Open a web page for each selected changeset")); … … 462 462 */ 463 463 class LaunchChangesetManagerAction extends AbstractAction { 464 publicLaunchChangesetManagerAction() {464 LaunchChangesetManagerAction() { 465 465 putValue(NAME, tr("Details")); 466 466 putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets")); … … 561 561 562 562 class ChangesetDialogPopup extends ListPopupMenu { 563 publicChangesetDialogPopup(JList<?> ... lists) {563 ChangesetDialogPopup(JList<?> ... lists) { 564 564 super(lists); 565 565 add(selectObjectsAction); -
trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
r8633 r8836 169 169 private JTree source; 170 170 171 publicUndoRedoSelectionListener(JTree source) {171 UndoRedoSelectionListener(JTree source) { 172 172 this.source = source; 173 173 } … … 486 486 class MouseEventHandler extends PopupMenuLauncher { 487 487 488 publicMouseEventHandler() {488 MouseEventHandler() { 489 489 super(new CommandStackPopup()); 490 490 } … … 499 499 500 500 private class CommandStackPopup extends JPopupMenu { 501 publicCommandStackPopup() {501 CommandStackPopup() { 502 502 add(selectAction); 503 503 add(selectAndZoomAction); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r8512 r8836 352 352 * Constructs a new {@code MouseEventHandler}. 353 353 */ 354 publicMouseEventHandler() {354 MouseEventHandler() { 355 355 super(popupMenu); 356 356 } … … 374 374 * Constructs a new {@code ConflictListModel}. 375 375 */ 376 publicConflictListModel() {376 ConflictListModel() { 377 377 listeners = new CopyOnWriteArrayList<>(); 378 378 } … … 431 431 432 432 class ResolveAction extends AbstractAction implements ListSelectionListener { 433 publicResolveAction() {433 ResolveAction() { 434 434 putValue(NAME, tr("Resolve")); 435 435 putValue(SHORT_DESCRIPTION, tr("Open a merge dialog of all selected items in the list above.")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
r8510 r8836 155 155 */ 156 156 class CancelAction extends AbstractAction { 157 publicCancelAction() {157 CancelAction() { 158 158 putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution and close the dialog")); 159 159 putValue(Action.NAME, tr("Cancel")); … … 172 172 */ 173 173 static class HelpAction extends AbstractAction { 174 publicHelpAction() {174 HelpAction() { 175 175 putValue(Action.SHORT_DESCRIPTION, tr("Show help information")); 176 176 putValue(Action.NAME, tr("Help")); … … 190 190 */ 191 191 class ApplyResolutionAction extends AbstractAction implements PropertyChangeListener { 192 publicApplyResolutionAction() {192 ApplyResolutionAction() { 193 193 putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts and close the dialog")); 194 194 putValue(Action.NAME, tr("Apply Resolution")); … … 213 213 + "Click <strong>{0}</strong> to close anyway.<strong> Already<br>" 214 214 + "resolved differences will not be applied.</strong><br>" 215 + "Click <strong>{1}</strong> to return to resolving conflicts.</html>" 216 ,options[0].toString(), options[1].toString()215 + "Click <strong>{1}</strong> to return to resolving conflicts.</html>", 216 options[0].toString(), options[1].toString() 217 217 ), 218 218 tr("Conflict not resolved completely"), -
trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java
r8510 r8836 316 316 } 317 317 318 publicRelationMemberTableColumnModel() {318 RelationMemberTableColumnModel() { 319 319 createColumns(); 320 320 } … … 322 322 323 323 class OKAction extends AbstractAction { 324 publicOKAction() {324 OKAction() { 325 325 putValue(NAME, tr("OK")); 326 326 putValue(SMALL_ICON, ImageProvider.get("ok")); … … 336 336 337 337 class CancelAction extends AbstractAction { 338 publicCancelAction() {338 CancelAction() { 339 339 putValue(NAME, tr("Cancel")); 340 340 putValue(SMALL_ICON, ImageProvider.get("cancel")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
r8510 r8836 431 431 private class HidingFilterAction extends AbstractFilterAction { 432 432 433 publicHidingFilterAction() {433 HidingFilterAction() { 434 434 putValue(SHORT_DESCRIPTION, tr("Hiding filter")); 435 435 HIDING_FILTER_SHORTCUT.setAccelerator(this); … … 451 451 } 452 452 } 453 454 453 } 455 454 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
r8510 r8836 349 349 */ 350 350 private static class OSDLabel extends JLabel { 351 publicOSDLabel(String text) {351 OSDLabel(String text) { 352 352 super(text); 353 353 setOpaque(true); -
trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
r8818 r8836 125 125 private int layerIndex = -1; 126 126 127 publicToggleLayerIndexVisibility(int layerIndex) {127 ToggleLayerIndexVisibility(int layerIndex) { 128 128 this.layerIndex = layerIndex; 129 129 } … … 981 981 982 982 private static class ActiveLayerCheckBox extends JCheckBox { 983 publicActiveLayerCheckBox() {983 ActiveLayerCheckBox() { 984 984 setHorizontalAlignment(javax.swing.SwingConstants.CENTER); 985 985 ImageIcon blank = ImageProvider.get("dialogs/layerlist", "blank"); … … 1001 1001 * Constructs a new {@code LayerVisibleCheckBox}. 1002 1002 */ 1003 publicLayerVisibleCheckBox() {1003 LayerVisibleCheckBox() { 1004 1004 setHorizontalAlignment(javax.swing.SwingConstants.RIGHT); 1005 1005 iconEye = ImageProvider.get("dialogs/layerlist", "eye"); … … 1037 1037 * Constructs a new {@code ActiveLayerCellRenderer}. 1038 1038 */ 1039 publicActiveLayerCellRenderer() {1039 ActiveLayerCellRenderer() { 1040 1040 cb = new ActiveLayerCheckBox(); 1041 1041 } … … 1056 1056 * Constructs a new {@code LayerVisibleCellRenderer}. 1057 1057 */ 1058 publicLayerVisibleCellRenderer() {1058 LayerVisibleCellRenderer() { 1059 1059 this.cb = new LayerVisibleCheckBox(); 1060 1060 } … … 1072 1072 private final LayerVisibleCheckBox cb; 1073 1073 1074 publicLayerVisibleCellEditor(LayerVisibleCheckBox cb) {1074 LayerVisibleCellEditor(LayerVisibleCheckBox cb) { 1075 1075 super(cb); 1076 1076 this.cb = cb; … … 1132 1132 1133 1133 private static class LayerNameCellEditor extends DefaultCellEditor { 1134 publicLayerNameCellEditor(DisableShortcutsOnFocusGainedTextField tf) {1134 LayerNameCellEditor(DisableShortcutsOnFocusGainedTextField tf) { 1135 1135 super(tf); 1136 1136 } … … 1157 1157 */ 1158 1158 class MoveUpAction extends AbstractAction implements IEnabledStateUpdating{ 1159 publicMoveUpAction() {1159 MoveUpAction() { 1160 1160 putValue(NAME, tr("Move up")); 1161 1161 putValue(SMALL_ICON, ImageProvider.get("dialogs", "up")); … … 1179 1179 */ 1180 1180 class MoveDownAction extends AbstractAction implements IEnabledStateUpdating { 1181 publicMoveDownAction() {1181 MoveDownAction() { 1182 1182 putValue(NAME, tr("Move down")); 1183 1183 putValue(SMALL_ICON, ImageProvider.get("dialogs", "down")); … … 1666 1666 1667 1667 static class LayerList extends JTable { 1668 publicLayerList(TableModel dataModel) {1668 LayerList(TableModel dataModel) { 1669 1669 super(dataModel); 1670 1670 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
r8510 r8836 296 296 * Constructs a new {@code MyCheckBoxRenderer}. 297 297 */ 298 publicMyCheckBoxRenderer() {298 MyCheckBoxRenderer() { 299 299 setHorizontalAlignment(SwingConstants.CENTER); 300 300 setVerticalAlignment(SwingConstants.CENTER); … … 493 493 private boolean error; 494 494 495 publicSaveToFileTask(StyleSource s, File file) {495 SaveToFileTask(StyleSource s, File file) { 496 496 super(tr("Reloading style sources")); 497 497 this.s = s; … … 536 536 se.url = file.getPath(); 537 537 MapPaintStyles.addStyle(se); 538 tblStyles.getSelectionModel().setSelectionInterval(model.getRowCount() - 1 538 tblStyles.getSelectionModel().setSelectionInterval(model.getRowCount() - 1, model.getRowCount() - 1); 539 539 model.ensureSelectedIsVisible(); 540 540 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
r8510 r8836 268 268 * Constructs a new {@code NoteTableModel}. 269 269 */ 270 publicNoteTableModel() {270 NoteTableModel() { 271 271 data = new ArrayList<>(); 272 272 } … … 303 303 * Constructs a new {@code AddCommentAction}. 304 304 */ 305 publicAddCommentAction() {305 AddCommentAction() { 306 306 putValue(SHORT_DESCRIPTION, tr("Add comment")); 307 307 putValue(NAME, tr("Comment")); … … 335 335 * Constructs a new {@code CloseAction}. 336 336 */ 337 publicCloseAction() {337 CloseAction() { 338 338 putValue(SHORT_DESCRIPTION, tr("Close note")); 339 339 putValue(NAME, tr("Close")); … … 360 360 * Constructs a new {@code NewAction}. 361 361 */ 362 publicNewAction() {362 NewAction() { 363 363 putValue(SHORT_DESCRIPTION, tr("Create a new note")); 364 364 putValue(NAME, tr("Create")); … … 380 380 * Constructs a new {@code ReopenAction}. 381 381 */ 382 publicReopenAction() {382 ReopenAction() { 383 383 putValue(SHORT_DESCRIPTION, tr("Reopen note")); 384 384 putValue(NAME, tr("Reopen")); … … 406 406 * Constructs a new {@code SortAction}. 407 407 */ 408 publicSortAction() {408 SortAction() { 409 409 putValue(SHORT_DESCRIPTION, tr("Sort notes")); 410 410 putValue(NAME, tr("Sort")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r8811 r8836 317 317 class MouseEventHandler extends PopupMenuLauncher { 318 318 319 publicMouseEventHandler() {319 MouseEventHandler() { 320 320 super(popupMenu); 321 321 } … … 352 352 */ 353 353 static class NewAction extends AbstractAction implements LayerChangeListener{ 354 publicNewAction() {354 NewAction() { 355 355 putValue(SHORT_DESCRIPTION, tr("Create a new relation")); 356 356 putValue(NAME, tr("New")); … … 398 398 private transient SearchCompiler.Match filter; 399 399 400 publicRelationListModel(DefaultListSelectionModel selectionModel) {400 RelationListModel(DefaultListSelectionModel selectionModel) { 401 401 this.selectionModel = selectionModel; 402 402 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r8510 r8836 200 200 private boolean highlightEnabled = Main.pref.getBoolean("draw.target-highlight", true); 201 201 202 publicMouseEventHandler() {202 MouseEventHandler() { 203 203 super(popupMenu); 204 204 } … … 293 293 * Constructs a new {@code SearchAction}. 294 294 */ 295 publicSearchAction() {295 SearchAction() { 296 296 putValue(NAME, tr("Search")); 297 297 putValue(SHORT_DESCRIPTION, tr("Search for objects")); … … 324 324 * Constructs a new {@code SelectAction}. 325 325 */ 326 publicSelectAction() {326 SelectAction() { 327 327 updateEnabledState(); 328 328 } … … 355 355 * Constructs a new {@code ShowHistoryAction}. 356 356 */ 357 publicShowHistoryAction() {357 ShowHistoryAction() { 358 358 putValue(NAME, tr("History")); 359 359 putValue(SHORT_DESCRIPTION, tr("Display the history of the selected objects.")); … … 395 395 class ZoomToJOSMSelectionAction extends AbstractAction implements ListDataListener { 396 396 397 publicZoomToJOSMSelectionAction() {397 ZoomToJOSMSelectionAction() { 398 398 putValue(NAME, tr("Zoom to selection")); 399 399 putValue(SHORT_DESCRIPTION, tr("Zoom to selection")); … … 436 436 * Constructs a new {@code ZoomToListSelection}. 437 437 */ 438 publicZoomToListSelection() {438 ZoomToListSelection() { 439 439 putValue(NAME, tr("Zoom to selected element(s)")); 440 440 putValue(SHORT_DESCRIPTION, tr("Zoom to selected element(s)")); … … 486 486 * @param selectionModel the selection model used in the list 487 487 */ 488 publicSelectionListModel(DefaultListSelectionModel selectionModel) {488 SelectionListModel(DefaultListSelectionModel selectionModel) { 489 489 this.selectionModel = selectionModel; 490 490 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r8510 r8836 610 610 * Constructs a new {@code DialogPopupMenu}. 611 611 */ 612 publicDialogPopupMenu() {612 DialogPopupMenu() { 613 613 alwaysShown.setSelected(buttonHiding == ButtonHidingType.ALWAYS_SHOWN); 614 614 dynamic.setSelected(buttonHiding == ButtonHidingType.DYNAMIC); … … 636 636 * Constructs a new {@code MouseEventHandler}. 637 637 */ 638 publicMouseEventHandler() {638 MouseEventHandler() { 639 639 super(popupMenu); 640 640 } … … 660 660 */ 661 661 private class DetachedDialog extends JDialog { 662 publicDetachedDialog() {662 DetachedDialog() { 663 663 super(JOptionPane.getFrameForComponent(Main.parent)); 664 664 getContentPane().add(ToggleDialog.this); -
trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
r8510 r8836 137 137 public void run() { 138 138 if (model.getRowCount() != 0) { 139 setTitle(trn("{0} Author", "{0} Authors", model.getRowCount() 139 setTitle(trn("{0} Author", "{0} Authors", model.getRowCount(), model.getRowCount())); 140 140 } else { 141 141 setTitle(tr("Authors")); … … 156 156 157 157 class SelectUsersPrimitivesAction extends AbstractAction implements ListSelectionListener{ 158 public SelectUsersPrimitivesAction() { 158 159 /** 160 * Constructs a new {@code SelectUsersPrimitivesAction}. 161 */ 162 SelectUsersPrimitivesAction() { 159 163 putValue(NAME, tr("Select")); 160 164 putValue(SHORT_DESCRIPTION, tr("Select objects submitted by this user")); … … 189 193 class ShowUserInfoAction extends AbstractInfoAction implements ListSelectionListener { 190 194 191 publicShowUserInfoAction() {195 ShowUserInfoAction() { 192 196 super(false); 193 197 putValue(NAME, tr("Show info")); … … 286 290 private transient List<UserInfo> data; 287 291 288 publicUserTableModel() {292 UserTableModel() { 289 293 setColumnIdentifiers(new String[]{tr("Author"), tr("# Objects"), "%"}); 290 294 data = new ArrayList<>(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
r8683 r8836 474 474 class MouseEventHandler extends PopupMenuLauncher { 475 475 476 publicMouseEventHandler() {476 MouseEventHandler() { 477 477 super(popupMenu); 478 478 } … … 589 589 private boolean canceled; 590 590 591 publicFixTask(Collection<TestError> testErrors) {591 FixTask(Collection<TestError> testErrors) { 592 592 super(tr("Fixing errors ..."), false /* don't ignore exceptions */); 593 593 this.testErrors = testErrors == null ? new ArrayList<TestError>() : testErrors; -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java
r8510 r8836 349 349 */ 350 350 static class CancelAction extends AbstractAction { 351 publicCancelAction() {351 CancelAction() { 352 352 putValue(NAME, tr("Close")); 353 353 putValue(SMALL_ICON, ImageProvider.get("cancel")); … … 369 369 */ 370 370 class QueryAction extends AbstractAction { 371 publicQueryAction() {371 QueryAction() { 372 372 putValue(NAME, tr("Query")); 373 373 putValue(SMALL_ICON, ImageProvider.get("dialogs", "search")); … … 400 400 */ 401 401 class RemoveFromCacheAction extends AbstractAction implements ListSelectionListener{ 402 publicRemoveFromCacheAction() {402 RemoveFromCacheAction() { 403 403 putValue(NAME, tr("Remove from cache")); 404 404 putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); … … 420 420 public void valueChanged(ListSelectionEvent e) { 421 421 updateEnabledState(); 422 423 422 } 424 423 } … … 429 428 */ 430 429 class CloseSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{ 431 publicCloseSelectedChangesetsAction() {430 CloseSelectedChangesetsAction() { 432 431 putValue(NAME, tr("Close")); 433 432 putValue(SMALL_ICON, ImageProvider.get("closechangeset")); … … 471 470 */ 472 471 class DownloadSelectedChangesetsAction extends AbstractAction implements ListSelectionListener{ 473 publicDownloadSelectedChangesetsAction() {472 DownloadSelectedChangesetsAction() { 474 473 putValue(NAME, tr("Update changeset")); 475 474 putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "updatechangeset")); … … 500 499 */ 501 500 class DownloadSelectedChangesetContentAction extends AbstractAction implements ListSelectionListener{ 502 publicDownloadSelectedChangesetContentAction() {501 DownloadSelectedChangesetContentAction() { 503 502 putValue(NAME, tr("Download changeset content")); 504 503 putValue(SMALL_ICON, DOWNLOAD_CONTENT_ICON); … … 538 537 539 538 class DownloadMyChangesets extends AbstractAction { 540 publicDownloadMyChangesets() {539 DownloadMyChangesets() { 541 540 putValue(NAME, tr("My changesets")); 542 541 putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangeset")); … … 578 577 class MouseEventHandler extends PopupMenuLauncher { 579 578 580 publicMouseEventHandler() {579 MouseEventHandler() { 581 580 super(new ChangesetTablePopupMenu()); 582 581 } … … 591 590 592 591 class ChangesetTablePopupMenu extends JPopupMenu { 593 publicChangesetTablePopupMenu() {592 ChangesetTablePopupMenu() { 594 593 add(actRemoveFromCacheAction); 595 594 add(actCloseSelectedChangesetsAction); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
r8512 r8836 192 192 */ 193 193 class DownloadChangesetContentAction extends AbstractAction{ 194 publicDownloadChangesetContentAction() {194 DownloadChangesetContentAction() { 195 195 putValue(NAME, tr("Download content")); 196 196 putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON); … … 225 225 226 226 class ChangesetContentTablePopupMenu extends JPopupMenu { 227 publicChangesetContentTablePopupMenu() {227 ChangesetContentTablePopupMenu() { 228 228 add(actDownloadContentAction); 229 229 add(actShowHistory); … … 269 269 } 270 270 271 publicShowHistoryAction() {271 ShowHistoryAction() { 272 272 putValue(NAME, tr("Show history")); 273 273 putValue(SMALL_ICON, ImageProvider.get("dialogs", "history")); … … 319 319 class SelectInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{ 320 320 321 publicSelectInCurrentLayerAction() {321 SelectInCurrentLayerAction() { 322 322 putValue(NAME, tr("Select in layer")); 323 323 putValue(SMALL_ICON, ImageProvider.get("dialogs", "select")); … … 369 369 class ZoomInCurrentLayerAction extends AbstractAction implements ListSelectionListener, EditLayerChangeListener{ 370 370 371 publicZoomInCurrentLayerAction() {371 ZoomInCurrentLayerAction() { 372 372 putValue(NAME, tr("Zoom to in layer")); 373 373 putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection")); … … 433 433 } 434 434 435 publicHeaderPanel() {435 HeaderPanel() { 436 436 build(); 437 437 } … … 443 443 444 444 private class DownloadAction extends AbstractAction { 445 publicDownloadAction() {445 DownloadAction() { 446 446 putValue(NAME, tr("Download now")); 447 447 putValue(SHORT_DESCRIPTION, tr("Download the changeset content")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
r8510 r8836 143 143 private final HistoryOsmPrimitive primitive; 144 144 145 publicChangesetContentEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) {145 ChangesetContentEntry(ChangesetModificationType modificationType, HistoryOsmPrimitive primitive) { 146 146 this.modificationType = modificationType; 147 147 this.primitive = primitive; 148 148 } 149 149 150 publicChangesetContentEntry(ChangesetDataSetEntry entry) {150 ChangesetContentEntry(ChangesetDataSetEntry entry) { 151 151 this(entry.getModificationType(), entry.getPrimitive()); 152 152 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
r8510 r8836 268 268 */ 269 269 class RemoveFromCacheAction extends AbstractAction { 270 publicRemoveFromCacheAction() {270 RemoveFromCacheAction() { 271 271 putValue(NAME, tr("Remove from cache")); 272 272 putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); … … 291 291 */ 292 292 class DownloadChangesetContentAction extends AbstractAction { 293 publicDownloadChangesetContentAction() {293 DownloadChangesetContentAction() { 294 294 putValue(NAME, tr("Download content")); 295 295 putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON); … … 328 328 */ 329 329 class UpdateChangesetAction extends AbstractAction{ 330 publicUpdateChangesetAction() {330 UpdateChangesetAction() { 331 331 putValue(NAME, tr("Update changeset")); 332 332 putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON); … … 357 357 class SelectInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{ 358 358 359 publicSelectInCurrentLayerAction() {359 SelectInCurrentLayerAction() { 360 360 putValue(NAME, tr("Select in layer")); 361 361 putValue(SMALL_ICON, ImageProvider.get("dialogs", "select")); … … 418 418 class ZoomInCurrentLayerAction extends AbstractAction implements EditLayerChangeListener{ 419 419 420 publicZoomInCurrentLayerAction() {420 ZoomInCurrentLayerAction() { 421 421 putValue(NAME, tr("Zoom to in layer")); 422 422 putValue(SMALL_ICON, ImageProvider.get("dialogs/autoscale", "selection")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java
r8510 r8836 60 60 */ 61 61 class UpdateChangesetDiscussionAction extends AbstractAction { 62 publicUpdateChangesetDiscussionAction() {62 UpdateChangesetDiscussionAction() { 63 63 putValue(NAME, tr("Update changeset discussion")); 64 64 putValue(SMALL_ICON, ChangesetCacheManager.UPDATE_CONTENT_ICON); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
r8510 r8836 78 78 class DownloadAction extends AbstractAction implements DocumentListener{ 79 79 80 publicDownloadAction() {80 DownloadAction() { 81 81 putValue(SMALL_ICON, ChangesetCacheManager.DOWNLOAD_CONTENT_ICON); 82 82 putValue(SHORT_DESCRIPTION, tr("Download the changeset with the specified id, including the changeset content")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
r8540 r8836 329 329 } 330 330 331 publicOpenAndCloseStateRestrictionPanel() {331 OpenAndCloseStateRestrictionPanel() { 332 332 build(); 333 333 } … … 490 490 } 491 491 492 publicUserRestrictionPanel() {492 UserRestrictionPanel() { 493 493 build(); 494 494 } … … 807 807 } 808 808 809 publicTimeRestrictionPanel() {809 TimeRestrictionPanel() { 810 810 build(); 811 811 } … … 928 928 929 929 private static class BBoxRestrictionPanel extends BoundingBoxSelectionPanel { 930 publicBBoxRestrictionPanel() {930 BBoxRestrictionPanel() { 931 931 setBorder(BorderFactory.createCompoundBorder( 932 932 BorderFactory.createEmptyBorder(3, 3, 3, 3), … … 972 972 } 973 973 974 publicUidInputFieldValidator(JTextComponent tc) {974 UidInputFieldValidator(JTextComponent tc) { 975 975 super(tc); 976 976 } … … 1019 1019 } 1020 1020 1021 publicUserNameInputValidator(JTextComponent tc) {1021 UserNameInputValidator(JTextComponent tc) { 1022 1022 super(tc); 1023 1023 } … … 1050 1050 } 1051 1051 1052 publicDateValidator(JTextComponent tc) {1052 DateValidator(JTextComponent tc) { 1053 1053 super(tc); 1054 1054 } … … 1117 1117 } 1118 1118 1119 publicTimeValidator(JTextComponent tc) {1119 TimeValidator(JTextComponent tc) { 1120 1120 super(tc); 1121 1121 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
r8510 r8836 35 35 * Enumeration of basic, predefined queries 36 36 */ 37 private staticenum BasicQuery {37 private enum BasicQuery { 38 38 MOST_RECENT_CHANGESETS, 39 39 MY_OPEN_CHANGESETS, -
trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java
r8510 r8836 158 158 159 159 class QueryAction extends AbstractAction { 160 publicQueryAction() {160 QueryAction() { 161 161 putValue(NAME, tr("Query")); 162 162 putValue(SMALL_ICON, ImageProvider.get("dialogs", "search")); … … 207 207 class CancelAction extends AbstractAction { 208 208 209 publicCancelAction() {209 CancelAction() { 210 210 putValue(NAME, tr("Cancel")); 211 211 putValue(SMALL_ICON, ImageProvider.get("cancel")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r8811 r8836 56 56 import org.openstreetmap.josm.actions.relation.SelectMembersAction; 57 57 import org.openstreetmap.josm.actions.relation.SelectRelationAction; 58 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;59 58 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting; 60 59 import org.openstreetmap.josm.command.ChangeCommand; … … 894 893 private static final String DELETE_FROM_RELATION_PREF = "delete_from_relation"; 895 894 896 publicDeleteAction() {895 DeleteAction() { 897 896 super(tr("Delete"), /* ICON() */ "dialogs/delete", tr("Delete the selected key in all objects"), 898 897 Shortcut.registerShortcut("properties:delete", tr("Delete Tags"), KeyEvent.VK_D, … … 1002 1001 */ 1003 1002 class AddAction extends JosmAction { 1004 publicAddAction() {1003 AddAction() { 1005 1004 super(tr("Add"), /* ICON() */ "dialogs/add", tr("Add a new key/value pair to all objects"), 1006 1005 Shortcut.registerShortcut("properties:add", tr("Add Tag"), KeyEvent.VK_A, … … 1019 1018 */ 1020 1019 class EditAction extends JosmAction implements ListSelectionListener { 1021 publicEditAction() {1020 EditAction() { 1022 1021 super(tr("Edit"), /* ICON() */ "dialogs/edit", tr("Edit the value of the selected key for all objects"), 1023 1022 Shortcut.registerShortcut("properties:edit", tr("Edit Tags"), KeyEvent.VK_S, … … 1054 1053 1055 1054 class HelpAction extends AbstractAction { 1056 publicHelpAction() {1055 HelpAction() { 1057 1056 putValue(NAME, tr("Go to OSM wiki for tag help (F1)")); 1058 1057 putValue(SHORT_DESCRIPTION, tr("Launch browser with wiki help for selected object")); … … 1155 1154 final StringProperty TAGINFO_URL_PROP = new StringProperty("taginfo.url", "https://taginfo.openstreetmap.org/"); 1156 1155 1157 publicTaginfoAction() {1156 TaginfoAction() { 1158 1157 super(tr("Go to Taginfo"), "dialogs/taginfo", tr("Launch browser with Taginfo statistics for selected object"), null, false); 1159 1158 } … … 1184 1183 1185 1184 class PasteValueAction extends AbstractAction { 1186 publicPasteValueAction() {1185 PasteValueAction() { 1187 1186 putValue(NAME, tr("Paste Value")); 1188 1187 putValue(SHORT_DESCRIPTION, tr("Paste the value of the selected tag from clipboard")); … … 1235 1234 * Constructs a new {@code CopyValueAction}. 1236 1235 */ 1237 publicCopyValueAction() {1236 CopyValueAction() { 1238 1237 putValue(NAME, tr("Copy Value")); 1239 1238 putValue(SHORT_DESCRIPTION, tr("Copy the value of the selected tag to clipboard")); … … 1249 1248 class CopyKeyValueAction extends AbstractCopyAction { 1250 1249 1251 publicCopyKeyValueAction() {1250 CopyKeyValueAction() { 1252 1251 putValue(NAME, tr("Copy selected Key(s)/Value(s)")); 1253 1252 putValue(SHORT_DESCRIPTION, tr("Copy the key and value of the selected tag(s) to clipboard")); … … 1263 1262 class CopyAllKeyValueAction extends AbstractCopyAction { 1264 1263 1265 publicCopyAllKeyValueAction() {1264 CopyAllKeyValueAction() { 1266 1265 putValue(NAME, tr("Copy all Keys/Values")); 1267 1266 putValue(SHORT_DESCRIPTION, tr("Copy the key and value of all the tags to clipboard")); … … 1281 1280 private final boolean sameType; 1282 1281 1283 publicSearchAction(boolean sameType) {1282 SearchAction(boolean sameType) { 1284 1283 this.sameType = sameType; 1285 1284 if (sameType) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
r8540 r8836 424 424 protected Component componentUnderMouse; 425 425 426 publicAbstractTagsDialog(Component parent, String title, String[] buttonTexts) {426 AbstractTagsDialog(Component parent, String title, String[] buttonTexts) { 427 427 super(parent, title, buttonTexts); 428 428 addMouseListener(new PopupMenuLauncher(popupMenu)); … … 541 541 private int commandCount; 542 542 543 publicAddTagsDialog() {543 AddTagsDialog() { 544 544 super(Main.parent, tr("Add value?"), new String[] {tr("OK"), tr("Cancel")}); 545 545 setButtonIcons(new String[] {"ok", "cancel"}); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
r8510 r8836 173 173 */ 174 174 class EditAction extends AbstractAction implements TreeSelectionListener { 175 publicEditAction() {175 EditAction() { 176 176 putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to.")); 177 177 putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); … … 218 218 */ 219 219 class DownloadAllChildRelationsAction extends AbstractAction{ 220 publicDownloadAllChildRelationsAction() {220 DownloadAllChildRelationsAction() { 221 221 putValue(SHORT_DESCRIPTION, tr("Download all child relations (recursively)")); 222 222 putValue(SMALL_ICON, ImageProvider.get("download")); … … 240 240 */ 241 241 class DownloadSelectedAction extends AbstractAction implements TreeSelectionListener { 242 publicDownloadSelectedAction() {242 DownloadSelectedAction() { 243 243 putValue(SHORT_DESCRIPTION, tr("Download selected relations")); 244 244 // FIXME: replace with better icon … … 283 283 protected Exception lastException; 284 284 285 publicDownloadTask(String title, Dialog parent) {285 DownloadTask(String title, Dialog parent) { 286 286 super(title, new PleaseWaitProgressMonitor(parent), false); 287 287 } … … 332 332 private final Set<Long> downloadedRelationIds; 333 333 334 publicDownloadAllChildrenTask(Dialog parent, Relation r) {334 DownloadAllChildrenTask(Dialog parent, Relation r) { 335 335 super(tr("Download relation members"), parent); 336 336 this.relation = r; … … 443 443 private final Set<Relation> relations; 444 444 445 publicDownloadRelationSetTask(Dialog parent, Set<Relation> relations) {445 DownloadRelationSetTask(Dialog parent, Set<Relation> relations) { 446 446 super(tr("Download relation members"), parent); 447 447 this.relations = relations; -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r8540 r8836 827 827 828 828 class AddSelectedAtStartAction extends AddFromSelectionAction implements TableModelListener { 829 publicAddSelectedAtStartAction() {829 AddSelectedAtStartAction() { 830 830 putValue(SHORT_DESCRIPTION, 831 831 tr("Add all objects selected in the current dataset before the first member")); … … 858 858 859 859 class AddSelectedAtEndAction extends AddFromSelectionAction implements TableModelListener { 860 publicAddSelectedAtEndAction() {860 AddSelectedAtEndAction() { 861 861 putValue(SHORT_DESCRIPTION, tr("Add all objects selected in the current dataset after the last member")); 862 862 putValue(SMALL_ICON, ImageProvider.get("dialogs/conflict", "copyendright")); … … 891 891 * Constructs a new {@code AddSelectedBeforeSelection}. 892 892 */ 893 publicAddSelectedBeforeSelection() {893 AddSelectedBeforeSelection() { 894 894 putValue(SHORT_DESCRIPTION, 895 895 tr("Add all objects selected in the current dataset before the first selected member")); … … 929 929 930 930 class AddSelectedAfterSelection extends AddFromSelectionAction implements TableModelListener, ListSelectionListener { 931 publicAddSelectedAfterSelection() {931 AddSelectedAfterSelection() { 932 932 putValue(SHORT_DESCRIPTION, 933 933 tr("Add all objects selected in the current dataset after the last selected member")); … … 970 970 * Constructs a new {@code RemoveSelectedAction}. 971 971 */ 972 publicRemoveSelectedAction() {972 RemoveSelectedAction() { 973 973 putValue(SHORT_DESCRIPTION, tr("Remove all members referring to one of the selected objects")); 974 974 putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "deletemembers")); … … 1005 1005 */ 1006 1006 class SelectedMembersForSelectionAction extends AbstractAction implements TableModelListener { 1007 publicSelectedMembersForSelectionAction() {1007 SelectedMembersForSelectionAction() { 1008 1008 putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to objects in the current selection")); 1009 1009 putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectmembers")); … … 1041 1041 */ 1042 1042 class SelectPrimitivesForSelectedMembersAction extends AbstractAction implements ListSelectionListener { 1043 publicSelectPrimitivesForSelectedMembersAction() {1043 SelectPrimitivesForSelectedMembersAction() { 1044 1044 putValue(SHORT_DESCRIPTION, tr("Select objects for selected relation members")); 1045 1045 putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "selectprimitives")); … … 1063 1063 1064 1064 class SortAction extends AbstractAction implements TableModelListener { 1065 publicSortAction() {1065 SortAction() { 1066 1066 String tooltip = tr("Sort the relation members"); 1067 1067 putValue(SMALL_ICON, ImageProvider.get("dialogs", "sort")); … … 1090 1090 1091 1091 class SortBelowAction extends AbstractAction implements TableModelListener, ListSelectionListener { 1092 publicSortBelowAction() {1092 SortBelowAction() { 1093 1093 putValue(SMALL_ICON, ImageProvider.get("dialogs", "sort_below")); 1094 1094 putValue(NAME, tr("Sort below")); … … 1118 1118 1119 1119 class ReverseAction extends AbstractAction implements TableModelListener { 1120 publicReverseAction() {1120 ReverseAction() { 1121 1121 putValue(SHORT_DESCRIPTION, tr("Reverse the order of the relation members")); 1122 1122 putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "reverse")); … … 1143 1143 1144 1144 class MoveUpAction extends AbstractAction implements ListSelectionListener { 1145 publicMoveUpAction() {1145 MoveUpAction() { 1146 1146 String tooltip = tr("Move the currently selected members up"); 1147 1147 putValue(SMALL_ICON, ImageProvider.get("dialogs", "moveup")); … … 1165 1165 1166 1166 class MoveDownAction extends AbstractAction implements ListSelectionListener { 1167 publicMoveDownAction() {1167 MoveDownAction() { 1168 1168 String tooltip = tr("Move the currently selected members down"); 1169 1169 putValue(SMALL_ICON, ImageProvider.get("dialogs", "movedown")); … … 1187 1187 1188 1188 class RemoveAction extends AbstractAction implements ListSelectionListener { 1189 publicRemoveAction() {1189 RemoveAction() { 1190 1190 String tooltip = tr("Remove the currently selected members from this relation"); 1191 1191 putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); … … 1210 1210 1211 1211 class DeleteCurrentRelationAction extends AbstractAction implements PropertyChangeListener{ 1212 publicDeleteCurrentRelationAction() {1212 DeleteCurrentRelationAction() { 1213 1213 putValue(SHORT_DESCRIPTION, tr("Delete the currently edited relation")); 1214 1214 putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); … … 1322 1322 tr("Yes, create a conflict and close"), 1323 1323 ImageProvider.get("ok"), 1324 tr("Click to create a conflict and close this relation editor") 1324 tr("Click to create a conflict and close this relation editor"), 1325 1325 null /* no specific help topic */ 1326 1326 ), … … 1328 1328 tr("No, continue editing"), 1329 1329 ImageProvider.get("cancel"), 1330 tr("Click to return to the relation editor and to resume relation editing") 1330 tr("Click to return to the relation editor and to resume relation editing"), 1331 1331 null /* no specific help topic */ 1332 1332 ) … … 1365 1365 1366 1366 class ApplyAction extends SavingAction { 1367 publicApplyAction() {1367 ApplyAction() { 1368 1368 putValue(SHORT_DESCRIPTION, tr("Apply the current updates")); 1369 1369 putValue(SMALL_ICON, ImageProvider.get("save")); … … 1399 1399 1400 1400 class OKAction extends SavingAction { 1401 publicOKAction() {1401 OKAction() { 1402 1402 putValue(SHORT_DESCRIPTION, tr("Apply the updates and close the dialog")); 1403 1403 putValue(SMALL_ICON, ImageProvider.get("ok")); … … 1436 1436 1437 1437 class CancelAction extends SavingAction { 1438 publicCancelAction() {1438 CancelAction() { 1439 1439 putValue(SHORT_DESCRIPTION, tr("Cancel the updates and close the dialog")); 1440 1440 putValue(SMALL_ICON, ImageProvider.get("cancel")); … … 1487 1487 tr("Yes, save the changes and close"), 1488 1488 ImageProvider.get("ok"), 1489 tr("Click to save the changes and close this relation editor") 1489 tr("Click to save the changes and close this relation editor"), 1490 1490 null /* no specific help topic */ 1491 1491 ), … … 1493 1493 tr("No, discard the changes and close"), 1494 1494 ImageProvider.get("cancel"), 1495 tr("Click to discard the changes and close this relation editor") 1495 tr("Click to discard the changes and close this relation editor"), 1496 1496 null /* no specific help topic */ 1497 1497 ), … … 1499 1499 tr("Cancel, continue editing"), 1500 1500 ImageProvider.get("cancel"), 1501 tr("Click to return to the relation editor and to resume relation editing") 1501 tr("Click to return to the relation editor and to resume relation editing"), 1502 1502 null /* no specific help topic */ 1503 1503 ) … … 1520 1520 1521 1521 class AddTagAction extends AbstractAction { 1522 publicAddTagAction() {1522 AddTagAction() { 1523 1523 putValue(SHORT_DESCRIPTION, tr("Add an empty tag")); 1524 1524 putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); … … 1533 1533 1534 1534 class DownloadIncompleteMembersAction extends AbstractAction implements TableModelListener { 1535 publicDownloadIncompleteMembersAction() {1535 DownloadIncompleteMembersAction() { 1536 1536 String tooltip = tr("Download all incomplete members"); 1537 1537 putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincomplete")); … … 1567 1567 1568 1568 class DownloadSelectedIncompleteMembersAction extends AbstractAction implements ListSelectionListener, TableModelListener{ 1569 publicDownloadSelectedIncompleteMembersAction() {1569 DownloadSelectedIncompleteMembersAction() { 1570 1570 putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members")); 1571 1571 putValue(SMALL_ICON, ImageProvider.get("dialogs/relation", "downloadincompleteselected")); … … 1604 1604 1605 1605 class SetRoleAction extends AbstractAction implements ListSelectionListener, DocumentListener { 1606 publicSetRoleAction() {1606 SetRoleAction() { 1607 1607 putValue(SHORT_DESCRIPTION, tr("Sets a role for the selected members")); 1608 1608 putValue(SMALL_ICON, ImageProvider.get("apply")); … … 1684 1684 */ 1685 1685 class DuplicateRelationAction extends AbstractAction { 1686 publicDuplicateRelationAction() {1686 DuplicateRelationAction() { 1687 1687 putValue(SHORT_DESCRIPTION, tr("Create a copy of this relation and open it in another editor window")); 1688 1688 // FIXME provide an icon … … 1706 1706 */ 1707 1707 class EditAction extends AbstractAction implements ListSelectionListener { 1708 publicEditAction() {1708 EditAction() { 1709 1709 putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to")); 1710 1710 putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
r8677 r8836 231 231 private class SelectPreviousGapAction extends AbstractAction { 232 232 233 publicSelectPreviousGapAction() {233 SelectPreviousGapAction() { 234 234 putValue(NAME, tr("Select previous Gap")); 235 235 putValue(SHORT_DESCRIPTION, tr("Select the previous relation member which gives rise to a gap")); … … 250 250 private class SelectNextGapAction extends AbstractAction { 251 251 252 publicSelectNextGapAction() {252 SelectNextGapAction() { 253 253 putValue(NAME, tr("Select next Gap")); 254 254 putValue(SHORT_DESCRIPTION, tr("Select the next relation member which gives rise to a gap")); … … 272 272 * Constructs a new {@code ZoomToGapAction}. 273 273 */ 274 publicZoomToGapAction() {274 ZoomToGapAction() { 275 275 putValue(NAME, tr("Zoom to Gap")); 276 276 putValue(SHORT_DESCRIPTION, tr("Zoom to the gap in the way sequence")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java
r8510 r8836 86 86 */ 87 87 class ReloadAction extends AbstractAction implements ListDataListener { 88 publicReloadAction() {88 ReloadAction() { 89 89 putValue(SHORT_DESCRIPTION, tr("Load parent relations")); 90 90 putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); … … 140 140 */ 141 141 class EditAction extends AbstractAction implements ListSelectionListener { 142 publicEditAction() {142 EditAction() { 143 143 putValue(SHORT_DESCRIPTION, tr("Edit the currently selected relation")); 144 144 putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
r8510 r8836 47 47 public final OsmDataLayer layer; 48 48 49 publicDialogContext(OsmDataLayer layer, Relation relation) {49 DialogContext(OsmDataLayer layer, Relation relation) { 50 50 this.layer = layer; 51 51 this.relation = relation; -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
r8540 r8836 109 109 private TreePath path; 110 110 111 publicRelationLoader(Dialog dialog, Relation relation, TreePath path) {111 RelationLoader(Dialog dialog, Relation relation, TreePath path) { 112 112 super( 113 113 tr("Load relation"), -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
r8510 r8836 36 36 public final boolean oneWay; 37 37 38 publicNodesWays(boolean oneWay) {38 NodesWays(boolean oneWay) { 39 39 this.oneWay = oneWay; 40 40 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
r8682 r8836 51 51 private static final class GroupTreeNode extends DefaultMutableTreeNode { 52 52 53 publicGroupTreeNode(Object userObject) {53 GroupTreeNode(Object userObject) { 54 54 super(userObject); 55 55 } -
trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java
r8510 r8836 198 198 * Constructs a new {@code BookmarkCellRenderer}. 199 199 */ 200 publicBookmarkCellRenderer() {200 BookmarkCellRenderer() { 201 201 setOpaque(true); 202 202 setIcon(ImageProvider.get("dialogs", "bookmark")); -
trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
r8510 r8836 176 176 */ 177 177 class AddAction extends AbstractAction { 178 publicAddAction() {178 AddAction() { 179 179 putValue(NAME, tr("Create bookmark")); 180 180 putValue(SMALL_ICON, ImageProvider.get("dialogs", "bookmark-new")); … … 212 212 * Constructs a new {@code RemoveAction}. 213 213 */ 214 publicRemoveAction() {214 RemoveAction() { 215 215 putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); 216 216 putValue(SHORT_DESCRIPTION, tr("Remove the currently selected bookmarks")); … … 243 243 * Constructs a new {@code RenameAction}. 244 244 */ 245 publicRenameAction() {245 RenameAction() { 246 246 putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); 247 247 putValue(SHORT_DESCRIPTION, tr("Rename the currently selected bookmark")); -
trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
r8510 r8836 191 191 private JosmTextField tfLatValue; 192 192 193 publicLatValueChecker(JosmTextField tfLatValue) {193 LatValueChecker(JosmTextField tfLatValue) { 194 194 this.tfLatValue = tfLatValue; 195 195 } … … 224 224 private JosmTextField tfLonValue; 225 225 226 publicLonValueChecker(JosmTextField tfLonValue) {226 LonValueChecker(JosmTextField tfLonValue) { 227 227 this.tfLonValue = tfLonValue; 228 228 } … … 257 257 private JTextComponent tfTarget; 258 258 259 publicSelectAllOnFocusHandler(JTextComponent tfTarget) {259 SelectAllOnFocusHandler(JTextComponent tfTarget) { 260 260 this.tfTarget = tfTarget; 261 261 } -
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r8713 r8836 474 474 475 475 class CancelAction extends AbstractAction { 476 publicCancelAction() {476 CancelAction() { 477 477 putValue(NAME, tr("Cancel")); 478 478 putValue(SMALL_ICON, ImageProvider.get("cancel")); … … 492 492 493 493 class DownloadAction extends AbstractAction { 494 publicDownloadAction() {494 DownloadAction() { 495 495 putValue(NAME, tr("Download")); 496 496 putValue(SMALL_ICON, ImageProvider.get("download")); -
trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
r8510 r8836 85 85 public final String fourthcol; 86 86 87 publicServer(String n, String u, String t, String f) {87 Server(String n, String u, String t, String f) { 88 88 name = n; 89 89 url = u; … … 288 288 class SearchAction extends AbstractAction implements DocumentListener { 289 289 290 publicSearchAction() {290 SearchAction() { 291 291 putValue(NAME, tr("Search ...")); 292 292 putValue(SMALL_ICON, ImageProvider.get("dialogs", "search")); … … 334 334 private Exception lastException; 335 335 336 publicNameQueryTask(String searchExpression) {336 NameQueryTask(String searchExpression) { 337 337 super(tr("Querying name server"), false /* don't ignore exceptions */); 338 338 this.searchExpression = searchExpression; … … 413 413 private transient ListSelectionModel selectionModel; 414 414 415 publicNamedResultTableModel(ListSelectionModel selectionModel) {415 NamedResultTableModel(ListSelectionModel selectionModel) { 416 416 data = new ArrayList<>(); 417 417 this.selectionModel = selectionModel; … … 497 497 } 498 498 499 publicNamedResultTableColumnModel() {499 NamedResultTableColumnModel() { 500 500 createColumns(); 501 501 } … … 517 517 * Constructs a new {@code NamedResultCellRenderer}. 518 518 */ 519 publicNamedResultCellRenderer() {519 NamedResultCellRenderer() { 520 520 setOpaque(true); 521 521 setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); -
trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
r8510 r8836 427 427 428 428 class OpenInBrowserAction extends AbstractAction { 429 publicOpenInBrowserAction() {429 OpenInBrowserAction() { 430 430 putValue(SHORT_DESCRIPTION, tr("Open the current help page in an external browser")); 431 431 putValue(SMALL_ICON, ImageProvider.get("help", "internet")); … … 442 442 * Constructs a new {@code EditAction}. 443 443 */ 444 publicEditAction() {444 EditAction() { 445 445 putValue(SHORT_DESCRIPTION, tr("Edit the current help page")); 446 446 putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit")); … … 474 474 475 475 class ReloadAction extends AbstractAction { 476 publicReloadAction() {476 ReloadAction() { 477 477 putValue(SHORT_DESCRIPTION, tr("Reload the current help page")); 478 478 putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); … … 488 488 private transient HelpBrowserHistory history; 489 489 490 publicBackAction(HelpBrowserHistory history) {490 BackAction(HelpBrowserHistory history) { 491 491 this.history = history; 492 492 history.addObserver(this); … … 510 510 private transient HelpBrowserHistory history; 511 511 512 publicForwardAction(HelpBrowserHistory history) {512 ForwardAction(HelpBrowserHistory history) { 513 513 this.history = history; 514 514 history.addObserver(this); … … 533 533 * Constructs a new {@code HomeAction}. 534 534 */ 535 publicHomeAction() {535 HomeAction() { 536 536 putValue(SHORT_DESCRIPTION, tr("Go to the JOSM help home page")); 537 537 putValue(SMALL_ICON, ImageProvider.get("help", "home")); -
trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
r8510 r8836 246 246 * @param role the role for this viewer. 247 247 */ 248 publicLatLonViewer(HistoryBrowserModel model, PointInTimeType role) {248 LatLonViewer(HistoryBrowserModel model, PointInTimeType role) { 249 249 build(); 250 250 this.model = model; … … 297 297 private JLabel lblDistance; 298 298 299 publicDistanceViewer(HistoryBrowserModel model) {299 DistanceViewer(HistoryBrowserModel model) { 300 300 super(model, PointInTimeType.REFERENCE_POINT_IN_TIME); 301 301 } -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
r8686 r8836 154 154 155 155 class CloseAction extends AbstractAction { 156 publicCloseAction() {156 CloseAction() { 157 157 putValue(NAME, tr("Close")); 158 158 putValue(SHORT_DESCRIPTION, tr("Close the dialog")); … … 173 173 174 174 class ReloadAction extends AbstractAction { 175 publicReloadAction() {175 ReloadAction() { 176 176 putValue(NAME, tr("Reload")); 177 177 putValue(SHORT_DESCRIPTION, tr("Reload the history from the server")); -
trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
r8702 r8836 201 201 private final ShowHistoryAction showHistoryAction; 202 202 203 publicNodeListPopupMenu() {203 NodeListPopupMenu() { 204 204 zoomToNodeAction = new ZoomToNodeAction(); 205 205 add(zoomToNodeAction); … … 223 223 * Constructs a new {@code ZoomToNodeAction}. 224 224 */ 225 publicZoomToNodeAction() {225 ZoomToNodeAction() { 226 226 putValue(NAME, tr("Zoom to node")); 227 227 putValue(SHORT_DESCRIPTION, tr("Zoom to this node in the current data layer")); … … 269 269 * Constructs a new {@code ShowHistoryAction}. 270 270 */ 271 publicShowHistoryAction() {271 ShowHistoryAction() { 272 272 putValue(NAME, tr("Show history")); 273 273 putValue(SHORT_DESCRIPTION, tr("Open a history browser with the history of this node")); … … 319 319 320 320 class InternalPopupMenuLauncher extends PopupMenuLauncher { 321 publicInternalPopupMenuLauncher() {321 InternalPopupMenuLauncher() { 322 322 super(popupMenu); 323 323 } 324 324 325 @Override protected int checkTableSelection(JTable table, Point p) { 325 @Override 326 protected int checkTableSelection(JTable table, Point p) { 326 327 int row = super.checkTableSelection(table, p); 327 328 popupMenu.prepare(primitiveIdAtRow(table.getModel(), row)); … … 334 335 private ShowHistoryAction showHistoryAction; 335 336 336 publicDoubleClickAdapter(JTable table) {337 DoubleClickAdapter(JTable table) { 337 338 this.table = table; 338 339 showHistoryAction = new ShowHistoryAction(); -
trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java
r8702 r8836 49 49 } 50 50 51 publicItem(DiffItemType state, Object value) {51 Item(DiffItemType state, Object value) { 52 52 this.state = state; 53 53 this.value = state == DiffItemType.EMPTY ? null : value; … … 64 64 boolean referenceReversed = false; 65 65 66 publicTwoColumnDiff(Object[] reference, Object[] current) {66 TwoColumnDiff(Object[] reference, Object[] current) { 67 67 this.reference = Utils.copyArray(reference); 68 68 this.current = Utils.copyArray(current); -
trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
r8510 r8836 248 248 private Integer id; 249 249 250 publicOpenChangesetDialogAction() {250 OpenChangesetDialogAction() { 251 251 super(tr("Changeset"), new ImageProvider("dialogs/changeset", "changesetmanager").resetMaxSize(new Dimension(16, 16)).get()); 252 252 putValue(SHORT_DESCRIPTION, tr("Opens the Changeset Manager window for the selected changesets")); -
trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
r8510 r8836 155 155 * Constructs a new {@code ChangesetInfoAction}. 156 156 */ 157 publicChangesetInfoAction() {157 ChangesetInfoAction() { 158 158 super(true); 159 159 putValue(NAME, tr("Changeset info")); … … 192 192 * Constructs a new {@code UserInfoAction}. 193 193 */ 194 publicUserInfoAction() {194 UserInfoAction() { 195 195 super(true); 196 196 putValue(NAME, tr("User info")); … … 233 233 * Constructs a new {@code VersionTablePopupMenu}. 234 234 */ 235 publicVersionTablePopupMenu() {235 VersionTablePopupMenu() { 236 236 super(); 237 237 build(); -
trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java
r8510 r8836 50 50 * Constructs a new {@code ActionFlagsTableCell}. 51 51 */ 52 publicActionFlagsTableCell() {52 ActionFlagsTableCell() { 53 53 checkBoxes[0] = new JCheckBox(tr("Upload")); 54 54 checkBoxes[1] = new JCheckBox(tr("Save")); -
trunk/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java
r8510 r8836 301 301 */ 302 302 class RefreshAction extends AbstractAction { 303 publicRefreshAction() {303 RefreshAction() { 304 304 putValue(SHORT_DESCRIPTION, tr("Load the list of your open changesets from the server")); 305 305 putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); … … 318 318 */ 319 319 class CloseChangesetAction extends AbstractAction implements ItemListener{ 320 publicCloseChangesetAction() {320 CloseChangesetAction() { 321 321 putValue(SMALL_ICON, ImageProvider.get("closechangeset")); 322 322 putValue(SHORT_DESCRIPTION, tr("Close the currently selected open changeset")); -
trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
r8510 r8836 119 119 120 120 class CloseAction extends AbstractAction implements ListSelectionListener { 121 publicCloseAction() {121 CloseAction() { 122 122 putValue(NAME, tr("Close changesets")); 123 123 putValue(SMALL_ICON, ImageProvider.get("closechangeset")); … … 145 145 class CancelAction extends AbstractAction { 146 146 147 publicCancelAction() {147 CancelAction() { 148 148 putValue(NAME, tr("Cancel")); 149 149 putValue(SMALL_ICON, ImageProvider.get("cancel")); -
trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
r8510 r8836 278 278 } 279 279 280 publicOsmApiCredentialsPanel(CredentialDialog owner) {280 OsmApiCredentialsPanel(CredentialDialog owner) { 281 281 super(owner); 282 282 build(); … … 299 299 } 300 300 301 publicOtherHostCredentialsPanel(CredentialDialog owner, String host) {301 OtherHostCredentialsPanel(CredentialDialog owner, String host) { 302 302 super(owner); 303 303 this.host = host; … … 321 321 } 322 322 323 publicHttpProxyCredentialsPanel(CredentialDialog owner) {323 HttpProxyCredentialsPanel(CredentialDialog owner) { 324 324 super(owner); 325 325 build(); … … 349 349 protected JTextField nextTF; 350 350 351 publicTFKeyListener(CredentialDialog owner, JTextField currentTF, JTextField nextTF) {351 TFKeyListener(CredentialDialog owner, JTextField currentTF, JTextField nextTF) { 352 352 this.owner = owner; 353 353 this.currentTF = currentTF; … … 382 382 383 383 class OKAction extends AbstractAction { 384 publicOKAction() {384 OKAction() { 385 385 putValue(NAME, tr("Authenticate")); 386 386 putValue(SHORT_DESCRIPTION, tr("Authenticate with the supplied username and password")); … … 396 396 397 397 class CancelAction extends AbstractAction { 398 publicCancelAction() {398 CancelAction() { 399 399 putValue(NAME, tr("Cancel")); 400 400 putValue(SHORT_DESCRIPTION, tr("Cancel authentication")); -
trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
r8510 r8836 62 62 * permitted, and indicates that the cause is nonexistent or unknown.) 63 63 */ 64 publicDownloadException(String message, Throwable cause) {64 DownloadException(String message, Throwable cause) { 65 65 super(message, cause); 66 66 } -
trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
r8510 r8836 46 46 47 47 /** constructor that sets the default on each element **/ 48 publicLayerNameAndFilePathTableCell() {48 LayerNameAndFilePathTableCell() { 49 49 setLayout(new GridBagLayout()); 50 50 … … 217 217 218 218 private class LaunchFileChooserAction extends AbstractAction { 219 publicLaunchFileChooserAction() {219 LaunchFileChooserAction() { 220 220 putValue(NAME, "..."); 221 221 putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file")); -
trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java
r8377 r8836 81 81 private static class ClearAction extends AbstractAction { 82 82 83 publicClearAction() {83 ClearAction() { 84 84 super(tr("Clear")); 85 85 putValue(SHORT_DESCRIPTION, tr("Clear the list of recently opened files")); -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java
r8291 r8836 28 28 * @throws IllegalArgumentException if layer is null 29 29 */ 30 publicSaveLayerInfo(AbstractModifiableLayer layer) {30 SaveLayerInfo(AbstractModifiableLayer layer) { 31 31 CheckParameterUtil.ensureParameterNotNull(layer, "layer"); 32 32 this.layer = layer; -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r8736 r8836 55 55 56 56 public class SaveLayersDialog extends JDialog implements TableModelListener { 57 public staticenum UserAction {57 public enum UserAction { 58 58 /** save/upload layers was successful, proceed with operation */ 59 59 PROCEED, … … 196 196 } 197 197 198 publicLayerListWarningMessagePanel(String msg, List<SaveLayerInfo> infos) {198 LayerListWarningMessagePanel(String msg, List<SaveLayerInfo> infos) { 199 199 build(); 200 200 lblMessage.setText(msg); … … 301 301 302 302 class CancelAction extends AbstractAction { 303 publicCancelAction() {303 CancelAction() { 304 304 putValue(NAME, tr("Cancel")); 305 305 putValue(SHORT_DESCRIPTION, tr("Close this dialog and resume editing in JOSM")); … … 333 333 334 334 class DiscardAndProceedAction extends AbstractAction implements PropertyChangeListener { 335 publicDiscardAndProceedAction() {335 DiscardAndProceedAction() { 336 336 initForDiscardAndExit(); 337 337 } … … 375 375 private final transient Image upldDis = new BufferedImage(is, is, BufferedImage.TYPE_4BYTE_ABGR); 376 376 377 publicSaveAndProceedAction() {377 SaveAndProceedAction() { 378 378 // get disabled versions of icons 379 379 new JLabel(ImageProvider.get("save")).getDisabledIcon().paintIcon(new JPanel(), saveDis.getGraphics(), 0, 0); -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java
r8510 r8836 11 11 12 12 class SaveLayersTable extends JTable implements PropertyChangeListener { 13 publicSaveLayersTable(SaveLayersModel model) {13 SaveLayersTable(SaveLayersModel model) { 14 14 super(model, new SaveLayersTableColumnModel()); 15 15 putClientProperty("terminateEditOnFocusLost", Boolean.TRUE); -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
r8510 r8836 28 28 * Constructs a new {@code RecommendedActionsTableCell}. 29 29 */ 30 publicRecommendedActionsTableCell() {30 RecommendedActionsTableCell() { 31 31 pnlEmpty.setPreferredSize(new Dimension(1, 19)); 32 32 needsUpload.setPreferredSize(new Dimension(needsUpload.getPreferredSize().width, 19)); … … 72 72 * Constructs a new {@code SaveLayersTableColumnModel}. 73 73 */ 74 publicSaveLayersTableColumnModel() {74 SaveLayersTableColumnModel() { 75 75 build(); 76 76 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
r8510 r8836 24 24 * Constructs a new {@code UploadAndSaveProgressRenderer}. 25 25 */ 26 publicUploadAndSaveProgressRenderer() {26 UploadAndSaveProgressRenderer() { 27 27 build(); 28 28 // initially not visible -
trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
r8510 r8836 381 381 */ 382 382 class UploadAction extends AbstractAction { 383 publicUploadAction() {383 UploadAction() { 384 384 putValue(NAME, tr("Upload Changes")); 385 385 putValue(SMALL_ICON, ImageProvider.get("upload")); … … 504 504 */ 505 505 class CancelAction extends AbstractAction { 506 publicCancelAction() {506 CancelAction() { 507 507 putValue(NAME, tr("Cancel")); 508 508 putValue(SMALL_ICON, ImageProvider.get("cancel")); -
trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
r8510 r8836 184 184 } 185 185 186 publicOsmPrimitiveList() {186 OsmPrimitiveList() { 187 187 this(new OsmPrimitiveListModel()); 188 188 } 189 189 190 publicOsmPrimitiveList(OsmPrimitiveListModel model) {190 OsmPrimitiveList(OsmPrimitiveListModel model) { 191 191 super(model); 192 192 init(); … … 257 257 258 258 class CancelAction extends AbstractAction { 259 publicCancelAction() {259 CancelAction() { 260 260 putValue(Action.SHORT_DESCRIPTION, tr("Cancel uploading")); 261 261 putValue(Action.NAME, tr("Cancel")); … … 275 275 276 276 class ContinueAction extends AbstractAction implements ListSelectionListener { 277 publicContinueAction() {277 ContinueAction() { 278 278 putValue(Action.SHORT_DESCRIPTION, tr("Continue uploading")); 279 279 putValue(Action.NAME, tr("Continue")); -
trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java
r8510 r8836 147 147 * Constructs a new {@code PrimitiveList}. 148 148 */ 149 publicPrimitiveList() {149 PrimitiveList() { 150 150 super(new PrimitiveListModel()); 151 151 } … … 165 165 * Constructs a new {@code PrimitiveListModel}. 166 166 */ 167 publicPrimitiveListModel() {167 PrimitiveListModel() { 168 168 primitives = new ArrayList<>(); 169 169 } 170 170 171 publicPrimitiveListModel(List<OsmPrimitive> primitives) {171 PrimitiveListModel(List<OsmPrimitive> primitives) { 172 172 setPrimitives(primitives); 173 173 } -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r8764 r8836 377 377 378 378 private class AutoZoomAction extends AbstractAction implements LayerAction { 379 publicAutoZoomAction() {379 AutoZoomAction() { 380 380 super(tr("Auto Zoom")); 381 381 } … … 400 400 401 401 private class AutoLoadTilesAction extends AbstractAction implements LayerAction { 402 publicAutoLoadTilesAction() {402 AutoLoadTilesAction() { 403 403 super(tr("Auto load tiles")); 404 404 } … … 422 422 423 423 private class LoadAllTilesAction extends AbstractAction { 424 publicLoadAllTilesAction() {424 LoadAllTilesAction() { 425 425 super(tr("Load All Tiles")); 426 426 } … … 434 434 435 435 private class LoadErroneusTilesAction extends AbstractAction { 436 publicLoadErroneusTilesAction() {436 LoadErroneusTilesAction() { 437 437 super(tr("Load All Error Tiles")); 438 438 } … … 446 446 447 447 private class ZoomToNativeLevelAction extends AbstractAction { 448 publicZoomToNativeLevelAction() {448 ZoomToNativeLevelAction() { 449 449 super(tr("Zoom to native resolution")); 450 450 } … … 459 459 460 460 private class ZoomToBestAction extends AbstractAction { 461 publicZoomToBestAction() {461 ZoomToBestAction() { 462 462 super(tr("Change resolution")); 463 463 } … … 487 487 private Field field; 488 488 489 publicBooleanButtonModel(Field field) {489 BooleanButtonModel(Field field) { 490 490 this.field = field; 491 491 } … … 1236 1236 Tile t; 1237 1237 if (create) { 1238 t = getOrCreateTile(x, y 1238 t = getOrCreateTile(x, y, zoom); 1239 1239 } else { 1240 1240 t = getTile(x, y, zoom); … … 1329 1329 private final TileSet[] tileSets; 1330 1330 private final TileSetInfo[] tileSetInfos; 1331 publicDeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) {1331 DeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) { 1332 1332 this.topLeft = topLeft; 1333 1333 this.botRight = botRight; -
trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
r8832 r8836 266 266 /** 267 267 * Returns the currently set gamma value. 268 * @return the currently set gamma value 268 269 */ 269 270 public double getGamma() { … … 273 274 /** 274 275 * Sets a new gamma value, {@code 1} stands for no correction. 276 * @param gamma new gamma value 275 277 */ 276 278 public void setGamma(double gamma) { … … 294 296 } 295 297 } catch (IllegalArgumentException ignore) { 298 if (Main.isTraceEnabled()) { 299 Main.trace(ignore.getMessage()); 300 } 296 301 } 297 302 final int type = image.getTransparency() == Transparency.OPAQUE ? BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB; … … 304 309 /** 305 310 * Returns the currently set gamma value. 311 * @return the currently set gamma value 306 312 */ 307 313 public double getGamma() { … … 311 317 /** 312 318 * Sets a new gamma value, {@code 1} stands for no correction. 319 * @param gamma new gamma value 313 320 */ 314 321 public void setGamma(double gamma) { -
trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
r8510 r8836 49 49 private transient WeakReference<Layer> lastLayer; 50 50 51 publicJumpToMarker(JumpToMarkerLayer layer, Shortcut shortcut) {51 JumpToMarker(JumpToMarkerLayer layer, Shortcut shortcut) { 52 52 this.layer = (Layer) layer; 53 53 this.multikeyShortcut = shortcut; -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r8830 r8836 825 825 private class ConsistencyTestAction extends AbstractAction { 826 826 827 publicConsistencyTestAction() {827 ConsistencyTestAction() { 828 828 super(tr("Dataset consistency test")); 829 829 } -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
r8660 r8836 213 213 private File file; 214 214 215 publicGpxDataWrapper(String name, GpxData data, File file) {215 GpxDataWrapper(String name, GpxData data, File file) { 216 216 this.name = name; 217 217 this.data = data; … … 779 779 private boolean doRepaint; 780 780 781 publicStatusBarUpdater(boolean doRepaint) {781 StatusBarUpdater(boolean doRepaint) { 782 782 this.doRepaint = doRepaint; 783 783 } -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
r8818 r8836 120 120 } 121 121 122 publicLoader(Collection<File> selection, GpxLayer gpxLayer) {122 Loader(Collection<File> selection, GpxLayer gpxLayer) { 123 123 super(tr("Extracting GPS locations from EXIF")); 124 124 this.selection = selection; … … 127 127 } 128 128 129 @Override protected void realRun() throws IOException { 129 @Override 130 protected void realRun() throws IOException { 130 131 131 132 progressMonitor.subTask(tr("Starting directory scan")); -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java
r8736 r8836 62 62 private int orientation; 63 63 64 publicLoadImageRunnable(File file, Integer orientation) {64 LoadImageRunnable(File file, Integer orientation) { 65 65 this.file = file; 66 66 this.orientation = orientation == null ? -1 : orientation; -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java
r8510 r8836 204 204 private final String action; 205 205 206 publicImageAction(String action, ImageIcon icon, String toolTipText) {206 ImageAction(String action, ImageIcon icon, String toolTipText) { 207 207 this.action = action; 208 208 putValue(SHORT_DESCRIPTION, toolTipText); -
trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java
r8765 r8836 30 30 private GeoImageLayer layer; 31 31 private MediaTracker tracker; 32 private ICacheAccess<String 32 private ICacheAccess<String, BufferedImageCacheEntry> cache; 33 33 private boolean cacheOff = Main.pref.getBoolean("geoimage.noThumbnailCache", false); 34 34 -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DateFilterPanel.java
r8510 r8836 73 73 }; 74 74 75 private Timer t = new Timer(200 75 private Timer t = new Timer(200, new ActionListener() { 76 76 @Override public void actionPerformed(ActionEvent e) { 77 77 applyFilter(); -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java
r8510 r8836 106 106 private Rectangle2D r = new Rectangle2D.Double(); 107 107 108 publicCalculateDownloadArea() {108 CalculateDownloadArea() { 109 109 super(tr("Calculating Download Area"), displayProgress ? null : NullProgressMonitor.INSTANCE, false); 110 110 } -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
r8806 r8836 196 196 } 197 197 198 URL url = null; 199 if (uri != null) { 200 try { 201 url = new URL(uri); 202 } catch (MalformedURLException e) { 203 // Try a relative file:// url, if the link is not in an URL-compatible form 204 if (relativePath != null) { 205 url = Utils.fileToURL(new File(relativePath.getParentFile(), uri)); 206 } 207 } 208 } 198 URL url = uriToUrl(uri, relativePath); 209 199 210 200 String urlStr = url == null ? "" : url.toString(); … … 229 219 return Arrays.asList(marker, audioMarker); 230 220 } else if (urlStr.endsWith(".png") || urlStr.endsWith(".jpg") || urlStr.endsWith(".jpeg") || urlStr.endsWith(".gif")) { 231 final ImageMarker imageMarker = new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset); 232 return Arrays.asList(marker, imageMarker); 221 return Arrays.asList(marker, new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset)); 233 222 } else { 234 final WebMarker webMarker = new WebMarker(wpt.getCoor(), url, parentLayer, time, offset); 235 return Arrays.asList(marker, webMarker); 223 return Arrays.asList(marker, new WebMarker(wpt.getCoor(), url, parentLayer, time, offset)); 236 224 } 237 225 } 238 226 }); 227 } 228 229 private static URL uriToUrl(String uri, File relativePath) { 230 URL url = null; 231 if (uri != null) { 232 try { 233 url = new URL(uri); 234 } catch (MalformedURLException e) { 235 // Try a relative file:// url, if the link is not in an URL-compatible form 236 if (relativePath != null) { 237 url = Utils.fileToURL(new File(relativePath.getParentFile(), uri)); 238 } 239 } 240 } 241 return url; 239 242 } 240 243 -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r8818 r8836 505 505 * Constructs a new {@code SynchronizeAudio} action. 506 506 */ 507 publicSynchronizeAudio() {507 SynchronizeAudio() { 508 508 super(tr("Synchronize Audio"), ImageProvider.get("audio-sync")); 509 509 putValue("help", ht("/Action/SynchronizeAudio")); … … 542 542 private class MoveAudio extends AbstractAction { 543 543 544 publicMoveAudio() {544 MoveAudio() { 545 545 super(tr("Make Audio Marker at Play Head"), ImageProvider.get("addmarkers")); 546 546 putValue("help", ht("/Action/MakeAudioMarkerAtPlayHead")); … … 565 565 } 566 566 } 567 568 567 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
r8510 r8836 132 132 public int size; 133 133 134 publicFontDescriptor(String name, int style, int size) {134 FontDescriptor(String name, int style, int size) { 135 135 this.name = name; 136 136 this.style = style; -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
r8510 r8836 33 33 private JCheckBoxMenuItem button; 34 34 35 publicMapPaintAction(StyleSource style) {35 MapPaintAction(StyleSource style) { 36 36 super(style.getDisplayString(), style.getIconProvider(), 37 37 tr("Select the map painting styles"), null, true, "mappaint/" + style.getDisplayString(), true); -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
r8654 r8836 87 87 * This is the operation that {@link KeyValueCondition} uses to match. 88 88 */ 89 public staticenum Op {89 public enum Op { 90 90 /** The value equals the given reference. */ 91 91 EQ, … … 170 170 * Context, where the condition applies. 171 171 */ 172 public staticenum Context {172 public enum Context { 173 173 /** 174 174 * normal primitive selector, e.g. way[highway=residential] … … 340 340 * This defines how {@link KeyCondition} matches a given key. 341 341 */ 342 public staticenum KeyMatchType {342 public enum KeyMatchType { 343 343 /** 344 344 * The key needs to be equal to the given label. -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
r8833 r8836 128 128 * @param e the environment against which we match 129 129 */ 130 publicMatchingReferrerFinder(Environment e) {130 MatchingReferrerFinder(Environment e) { 131 131 this.e = e; 132 132 } … … 227 227 } 228 228 229 publicMultipolygonOpenEndFinder(Environment e) {229 MultipolygonOpenEndFinder(Environment e) { 230 230 super(e); 231 231 } … … 245 245 } 246 246 }; 247 248 247 } 249 248 -
trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
r7509 r8836 25 25 26 26 private static class AuthorisationProcedureCellRenderer extends JLabel implements ListCellRenderer<AuthorizationProcedure> { 27 publicAuthorisationProcedureCellRenderer() {27 AuthorisationProcedureCellRenderer() { 28 28 setOpaque(true); 29 29 } -
trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
r8510 r8836 337 337 */ 338 338 class RunAuthorisationAction extends AbstractAction implements DocumentListener{ 339 publicRunAuthorisationAction() {339 RunAuthorisationAction() { 340 340 putValue(NAME, tr("Authorize now")); 341 341 putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); … … 373 373 */ 374 374 class BackAction extends AbstractAction { 375 publicBackAction() {375 BackAction() { 376 376 putValue(NAME, tr("Back")); 377 377 putValue(SHORT_DESCRIPTION, tr("Run the automatic authorization steps again")); … … 389 389 */ 390 390 class TestAccessTokenAction extends AbstractAction { 391 publicTestAccessTokenAction() {391 TestAccessTokenAction() { 392 392 putValue(NAME, tr("Test Access Token")); 393 393 putValue(SMALL_ICON, ImageProvider.get("logo")); … … 406 406 407 407 private static class UserNameValidator extends AbstractTextComponentValidator { 408 publicUserNameValidator(JTextComponent tc) {408 UserNameValidator(JTextComponent tc) { 409 409 super(tc); 410 410 } … … 427 427 private static class PasswordValidator extends AbstractTextComponentValidator { 428 428 429 publicPasswordValidator(JTextComponent tc) {429 PasswordValidator(JTextComponent tc) { 430 430 super(tc); 431 431 } … … 450 450 private OsmOAuthAuthorizationClient authClient; 451 451 452 publicFullyAutomaticAuthorisationTask(Component parent) {452 FullyAutomaticAuthorisationTask(Component parent) { 453 453 super(parent, tr("Authorize JOSM to access the OSM API"), false /* don't ignore exceptions */); 454 454 } -
trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java
r8510 r8836 76 76 private static class UserNameValidator extends AbstractTextComponentValidator { 77 77 78 publicUserNameValidator(JTextComponent tc) {78 UserNameValidator(JTextComponent tc) { 79 79 super(tc); 80 80 } -
trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java
r8510 r8836 177 177 private static class AccessTokenKeyValidator extends AbstractTextComponentValidator { 178 178 179 publicAccessTokenKeyValidator(JTextComponent tc) {179 AccessTokenKeyValidator(JTextComponent tc) { 180 180 super(tc); 181 181 } … … 197 197 198 198 private static class AccessTokenSecretValidator extends AbstractTextComponentValidator { 199 publicAccessTokenSecretValidator(JTextComponent tc) {199 AccessTokenSecretValidator(JTextComponent tc) { 200 200 super(tc); 201 201 } … … 246 246 */ 247 247 class TestAccessTokenAction extends AbstractAction implements PropertyChangeListener { 248 publicTestAccessTokenAction() {248 TestAccessTokenAction() { 249 249 putValue(NAME, tr("Test Access Token")); 250 250 putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); -
trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java
r8510 r8836 323 323 * Constructs a new {@code CancelAction}. 324 324 */ 325 publicCancelAction() {325 CancelAction() { 326 326 putValue(NAME, tr("Cancel")); 327 327 putValue(SMALL_ICON, ImageProvider.get("cancel")); … … 345 345 * Constructs a new {@code AcceptAccessTokenAction}. 346 346 */ 347 publicAcceptAccessTokenAction() {347 AcceptAccessTokenAction() { 348 348 putValue(NAME, tr("Accept Access Token")); 349 349 putValue(SMALL_ICON, ImageProvider.get("ok")); -
trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java
r8510 r8836 117 117 * Constructs a new {@code RetrieveRequestTokenPanel}. 118 118 */ 119 publicRetrieveRequestTokenPanel() {119 RetrieveRequestTokenPanel() { 120 120 build(); 121 121 } … … 214 214 * Constructs a new {@code RetrieveAccessTokenPanel}. 215 215 */ 216 publicRetrieveAccessTokenPanel() {216 RetrieveAccessTokenPanel() { 217 217 build(); 218 218 } … … 284 284 */ 285 285 class BackAction extends AbstractAction { 286 publicBackAction() {286 BackAction() { 287 287 putValue(NAME, tr("Back")); 288 288 putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3")); … … 305 305 * Constructs a new {@code ShowAccessTokenPanel}. 306 306 */ 307 publicShowAccessTokenPanel() {307 ShowAccessTokenPanel() { 308 308 build(); 309 309 } … … 362 362 */ 363 363 class RestartAction extends AbstractAction { 364 publicRestartAction() {364 RestartAction() { 365 365 putValue(NAME, tr("Restart")); 366 366 putValue(SHORT_DESCRIPTION, tr("Go back to step 1/3")); … … 384 384 class RetrieveRequestTokenAction extends AbstractAction{ 385 385 386 publicRetrieveRequestTokenAction() {386 RetrieveRequestTokenAction() { 387 387 putValue(NAME, tr("Retrieve Request Token")); 388 388 putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); … … 420 420 class RetrieveAccessTokenAction extends AbstractAction { 421 421 422 publicRetrieveAccessTokenAction() {422 RetrieveAccessTokenAction() { 423 423 putValue(NAME, tr("Retrieve Access Token")); 424 424 putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); … … 457 457 class TestAccessTokenAction extends AbstractAction { 458 458 459 publicTestAccessTokenAction() {459 TestAccessTokenAction() { 460 460 putValue(NAME, tr("Test Access Token")); 461 461 putValue(SMALL_ICON, ImageProvider.get("oauth", "oauth-small")); -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java
r8510 r8836 140 140 141 141 class CancelAction extends AbstractAction { 142 publicCancelAction() {142 CancelAction() { 143 143 putValue(NAME, tr("Cancel")); 144 144 putValue(SMALL_ICON, ImageProvider.get("cancel")); … … 159 159 160 160 class OKAction extends AbstractAction { 161 publicOKAction() {161 OKAction() { 162 162 putValue(NAME, tr("OK")); 163 163 putValue(SMALL_ICON, ImageProvider.get("ok")); -
trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
r8835 r8836 821 821 822 822 class LaunchFileChooserAction extends AbstractAction { 823 publicLaunchFileChooserAction() {823 LaunchFileChooserAction() { 824 824 putValue(SMALL_ICON, ImageProvider.get("open")); 825 825 putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file")); … … 870 870 871 871 class NewActiveSourceAction extends AbstractAction { 872 publicNewActiveSourceAction() {872 NewActiveSourceAction() { 873 873 putValue(NAME, tr("New")); 874 874 putValue(SHORT_DESCRIPTION, getStr(I18nString.NEW_SOURCE_ENTRY_TOOLTIP)); … … 900 900 class RemoveActiveSourcesAction extends AbstractAction implements ListSelectionListener { 901 901 902 publicRemoveActiveSourcesAction() {902 RemoveActiveSourcesAction() { 903 903 putValue(NAME, tr("Remove")); 904 904 putValue(SHORT_DESCRIPTION, getStr(I18nString.REMOVE_SOURCE_TOOLTIP)); … … 923 923 924 924 class EditActiveSourceAction extends AbstractAction implements ListSelectionListener { 925 publicEditActiveSourceAction() {925 EditActiveSourceAction() { 926 926 putValue(NAME, tr("Edit")); 927 927 putValue(SHORT_DESCRIPTION, getStr(I18nString.EDIT_SOURCE_TOOLTIP)); … … 970 970 private final int increment; 971 971 972 publicMoveUpDownAction(boolean isDown) {972 MoveUpDownAction(boolean isDown) { 973 973 increment = isDown ? 1 : -1; 974 974 putValue(SMALL_ICON, isDown ? ImageProvider.get("dialogs", "down") : ImageProvider.get("dialogs", "up")); … … 998 998 999 999 class ActivateSourcesAction extends AbstractAction implements ListSelectionListener { 1000 publicActivateSourcesAction() {1000 ActivateSourcesAction() { 1001 1001 putValue(SHORT_DESCRIPTION, getStr(I18nString.ACTIVATE_TOOLTIP)); 1002 1002 putValue(SMALL_ICON, ImageProvider.get("preferences", "activate-right")); … … 1051 1051 class ResetAction extends AbstractAction { 1052 1052 1053 publicResetAction() {1053 ResetAction() { 1054 1054 putValue(NAME, tr("Reset")); 1055 1055 putValue(SHORT_DESCRIPTION, tr("Reset to default")); … … 1067 1067 private final transient List<SourceProvider> sourceProviders; 1068 1068 1069 publicReloadSourcesAction(String url, List<SourceProvider> sourceProviders) {1069 ReloadSourcesAction(String url, List<SourceProvider> sourceProviders) { 1070 1070 putValue(NAME, tr("Reload")); 1071 1071 putValue(SHORT_DESCRIPTION, tr(getStr(I18nString.RELOAD_ALL_AVAILABLE), url)); … … 1185 1185 1186 1186 class NewIconPathAction extends AbstractAction { 1187 publicNewIconPathAction() {1187 NewIconPathAction() { 1188 1188 putValue(NAME, tr("New")); 1189 1189 putValue(SHORT_DESCRIPTION, tr("Add a new icon path")); … … 1199 1199 1200 1200 class RemoveIconPathAction extends AbstractAction implements ListSelectionListener { 1201 publicRemoveIconPathAction() {1201 RemoveIconPathAction() { 1202 1202 putValue(NAME, tr("Remove")); 1203 1203 putValue(SHORT_DESCRIPTION, tr("Remove the selected icon paths")); … … 1222 1222 1223 1223 class EditIconPathAction extends AbstractAction implements ListSelectionListener { 1224 publicEditIconPathAction() {1224 EditIconPathAction() { 1225 1225 putValue(NAME, tr("Edit")); 1226 1226 putValue(SHORT_DESCRIPTION, tr("Edit the selected icon path")); … … 1290 1290 private final List<ExtendedSourceEntry> sources = new ArrayList<>(); 1291 1291 1292 publicSourceLoader(String url, List<SourceProvider> sourceProviders) {1292 SourceLoader(String url, List<SourceProvider> sourceProviders) { 1293 1293 super(tr(getStr(I18nString.LOADING_SOURCES_FROM), url)); 1294 1294 this.url = url; … … 1478 1478 } 1479 1479 1480 publicFileOrUrlCellEditor(boolean isFile) {1480 FileOrUrlCellEditor(boolean isFile) { 1481 1481 this.isFile = isFile; 1482 1482 listeners = new CopyOnWriteArrayList<>(); … … 1554 1554 1555 1555 class LaunchFileChooserAction extends AbstractAction { 1556 publicLaunchFileChooserAction() {1556 LaunchFileChooserAction() { 1557 1557 putValue(NAME, "..."); 1558 1558 putValue(SHORT_DESCRIPTION, tr("Launch a file chooser to select a file")); -
trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
r8510 r8836 644 644 private final List<ActionDefinition> actions; 645 645 646 publicActionTransferable(List<ActionDefinition> actions) {646 ActionTransferable(List<ActionDefinition> actions) { 647 647 this.actions = actions; 648 648 } -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java
r8510 r8836 411 411 private final String type; 412 412 413 publicImportProfileAction(String name, File file, String type) {413 ImportProfileAction(String name, File file, String type) { 414 414 super(name); 415 415 this.file = file; -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/ListListEditor.java
r8510 r8836 138 138 139 139 class NewEntryAction extends AbstractAction { 140 publicNewEntryAction() {140 NewEntryAction() { 141 141 putValue(NAME, tr("New")); 142 142 putValue(SHORT_DESCRIPTION, tr("add entry")); … … 151 151 152 152 class RemoveEntryAction extends AbstractAction implements ListSelectionListener { 153 publicRemoveEntryAction() {153 RemoveEntryAction() { 154 154 putValue(NAME, tr("Remove")); 155 155 putValue(SHORT_DESCRIPTION, tr("Remove the selected entry")); -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/MapListEditor.java
r8510 r8836 158 158 159 159 class NewEntryAction extends AbstractAction { 160 publicNewEntryAction() {160 NewEntryAction() { 161 161 putValue(NAME, tr("New")); 162 162 putValue(SHORT_DESCRIPTION, tr("add entry")); … … 171 171 172 172 class RemoveEntryAction extends AbstractAction implements ListSelectionListener { 173 publicRemoveEntryAction() {173 RemoveEntryAction() { 174 174 putValue(NAME, tr("Remove")); 175 175 putValue(SHORT_DESCRIPTION, tr("Remove the selected entry")); -
trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java
r8510 r8836 264 264 private class AllSettingsTableModel extends DefaultTableModel { 265 265 266 publicAllSettingsTableModel() {266 AllSettingsTableModel() { 267 267 setColumnIdentifiers(new String[]{tr("Key"), tr("Value")}); 268 268 } … … 347 347 348 348 private static class SettingCellEditor extends DefaultCellEditor { 349 publicSettingCellEditor() {349 SettingCellEditor() { 350 350 super(new JosmTextField()); 351 351 } -
trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java
r8510 r8836 79 79 private final List<Locale> data = new ArrayList<>(); 80 80 81 publicLanguageComboBoxModel() {81 LanguageComboBoxModel() { 82 82 data.add(0, null); 83 83 data.addAll(Arrays.asList(I18n.getAvailableTranslations())); … … 117 117 * Constructs a new {@code LanguageCellRenderer}. 118 118 */ 119 publicLanguageCellRenderer() {119 LanguageCellRenderer() { 120 120 this.dispatch = new DefaultListCellRenderer(); 121 121 } -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
r8598 r8836 131 131 pane.addTab(tr("Settings"), buildSettingsPanel()); 132 132 pane.addTab(tr("Offset bookmarks"), new OffsetBookmarksPanel(gui)); 133 pane.addTab(tr("Cache contents") 133 pane.addTab(tr("Cache contents"), new CacheContentsPanel()); 134 134 loadSettings(); 135 135 p.add(pane, GBC.std().fill(GBC.BOTH)); … … 239 239 private transient List<ImageryInfo> layers; 240 240 241 publicImageryURLTableCellRenderer(List<ImageryInfo> layers) {241 ImageryURLTableCellRenderer(List<ImageryInfo> layers) { 242 242 this.layers = layers; 243 243 } … … 480 480 private final ImageryInfo.ImageryType type; 481 481 482 publicNewEntryAction(ImageryInfo.ImageryType type) {482 NewEntryAction(ImageryInfo.ImageryType type) { 483 483 putValue(NAME, type.toString()); 484 484 putValue(SHORT_DESCRIPTION, tr("Add a new {0} entry by entering the URL", type.toString())); … … 542 542 * Constructs a new {@code RemoveEntryAction}. 543 543 */ 544 publicRemoveEntryAction() {544 RemoveEntryAction() { 545 545 putValue(NAME, tr("Remove")); 546 546 putValue(SHORT_DESCRIPTION, tr("Remove entry")); … … 572 572 * Constructs a new {@code ActivateAction}. 573 573 */ 574 publicActivateAction() {574 ActivateAction() { 575 575 putValue(NAME, tr("Activate")); 576 576 putValue(SHORT_DESCRIPTION, tr("copy selected defaults")); … … 639 639 * Constructs a new {@code ReloadAction}. 640 640 */ 641 publicReloadAction() {641 ReloadAction() { 642 642 putValue(SHORT_DESCRIPTION, tr("reload defaults")); 643 643 putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); … … 813 813 * Constructs a new {@code OffsetBookmarksPanel}. 814 814 */ 815 publicOffsetBookmarksPanel(final PreferenceTabbedPane gui) {815 OffsetBookmarksPanel(final PreferenceTabbedPane gui) { 816 816 super(new GridBagLayout()); 817 817 final JTable list = new JTable(model) { … … 872 872 * Constructs a new {@code OffsetsBookmarksModel}. 873 873 */ 874 publicOffsetsBookmarksModel() {874 OffsetsBookmarksModel() { 875 875 setColumnIdentifiers(new String[] {tr("Projection"), tr("Layer"), tr("Name"), tr("Easting"), tr("Northing")}); 876 876 } -
trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java
r7937 r8836 133 133 } 134 134 } 135 layerTree.firePropertyChange("selectedLayers", /*dummy values*/ false 135 layerTree.firePropertyChange("selectedLayers", /*dummy values*/ false, true); 136 136 } 137 137 } -
trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java
r8835 r8836 88 88 private static final String iconpref = "mappaint.icon.sources"; 89 89 90 publicMapPaintSourceEditor() {90 MapPaintSourceEditor() { 91 91 super(SourceType.MAP_PAINT_STYLE, Main.getJOSMWebsite()+"/styles", styleSourceProviders, true); 92 92 } … … 176 176 } 177 177 } catch (RuntimeException ignore) { 178 if (Main.isTraceEnabled()) { 179 Main.trace(ignore.getMessage()); 180 } 178 181 } 179 182 return null; -
trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
r8513 r8836 185 185 private static final String iconpref = "taggingpreset.icon.sources"; 186 186 187 publicTaggingPresetSourceEditor() {187 TaggingPresetSourceEditor() { 188 188 super(SourceType.TAGGING_PRESET, Main.getJOSMWebsite()+"/presets", presetSourceProviders, true); 189 189 } -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java
r8510 r8836 112 112 public final transient PluginInformation pi; 113 113 114 publicJPluginCheckBox(final PluginInformation pi, boolean selected) {114 JPluginCheckBox(final PluginInformation pi, boolean selected) { 115 115 this.pi = pi; 116 116 setSelected(selected); … … 127 127 private final JPluginCheckBox cb; 128 128 129 publicPluginCbActionListener(JPluginCheckBox cb) {129 PluginCbActionListener(JPluginCheckBox cb) { 130 130 this.cb = cb; 131 131 } -
trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreference.java
r8510 r8836 329 329 * Constructs a new {@code DownloadAvailablePluginsAction}. 330 330 */ 331 publicDownloadAvailablePluginsAction() {331 DownloadAvailablePluginsAction() { 332 332 putValue(NAME, tr("Download list")); 333 333 putValue(SHORT_DESCRIPTION, tr("Download the list of available plugins")); … … 365 365 */ 366 366 class UpdateSelectedPluginsAction extends AbstractAction { 367 publicUpdateSelectedPluginsAction() {367 UpdateSelectedPluginsAction() { 368 368 putValue(NAME, tr("Update plugins")); 369 369 putValue(SHORT_DESCRIPTION, tr("Update the selected plugins")); … … 467 467 */ 468 468 class ConfigureSitesAction extends AbstractAction { 469 publicConfigureSitesAction() {469 ConfigureSitesAction() { 470 470 putValue(NAME, tr("Configure sites...")); 471 471 putValue(SHORT_DESCRIPTION, tr("Configure the list of sites where plugins are downloaded from")); … … 581 581 } 582 582 583 publicPluginConfigurationSitesPanel() {583 PluginConfigurationSitesPanel() { 584 584 build(); 585 585 } -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeProjectionChoice.java
r8510 r8836 56 56 private transient ActionListener listener; 57 57 58 publicCodeSelectionPanel(String initialCode, ActionListener listener) {58 CodeSelectionPanel(String initialCode, ActionListener listener) { 59 59 this.listener = listener; 60 60 data = new ArrayList<>(Projections.getAllProjectionCodes()); -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
r8533 r8836 51 51 private HistoryComboBox cbInput; 52 52 53 publicPreferencePanel(String initialText, ActionListener listener) {53 PreferencePanel(String initialText, ActionListener listener) { 54 54 build(initialText, listener); 55 55 } -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertCC9ZonesProjectionChoice.java
r8510 r8836 37 37 38 38 private class LambertCC9CBPanel extends CBPanel { 39 publicLambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {39 LambertCC9CBPanel(String[] entries, int initialIndex, String label, ActionListener listener) { 40 40 super(entries, initialIndex, label, listener); 41 41 this.add(new JLabel(ImageProvider.get("data/projection", "LambertCC9Zones.png")), GBC.eol().fill(GBC.HORIZONTAL)); -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/LambertProjectionChoice.java
r8510 r8836 32 32 33 33 private class LambertCBPanel extends CBPanel { 34 publicLambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) {34 LambertCBPanel(String[] entries, int initialIndex, String label, ActionListener listener) { 35 35 super(entries, initialIndex, label, listener); 36 36 this.add(new JLabel(ImageProvider.get("data/projection", "Departements_Lambert4Zones.png")), GBC.eol().fill(GBC.HORIZONTAL)); -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/UTMProjectionChoice.java
r8510 r8836 51 51 public JRadioButton north, south; 52 52 53 publicUTMPanel(String[] entries, int initialIndex, String label, ActionListener listener) {53 UTMPanel(String[] entries, int initialIndex, String label, ActionListener listener) { 54 54 super(entries, initialIndex, label, listener); 55 55 -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
r8510 r8836 183 183 * Constructs a new {@code NotYetAuthorisedPanel}. 184 184 */ 185 publicNotYetAuthorisedPanel() {185 NotYetAuthorisedPanel() { 186 186 build(); 187 187 } … … 305 305 * Constructs a new {@code AlreadyAuthorisedPanel}. 306 306 */ 307 publicAlreadyAuthorisedPanel() {307 AlreadyAuthorisedPanel() { 308 308 build(); 309 309 refreshView(); … … 315 315 */ 316 316 private class AuthoriseNowAction extends AbstractAction { 317 publicAuthoriseNowAction() {317 AuthoriseNowAction() { 318 318 putValue(NAME, tr("Authorize now")); 319 319 putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process")); … … 344 344 * Constructs a new {@code RenewAuthorisationAction}. 345 345 */ 346 publicRenewAuthorisationAction() {346 RenewAuthorisationAction() { 347 347 putValue(NAME, tr("New Access Token")); 348 348 putValue(SHORT_DESCRIPTION, tr("Click to step through the OAuth authorization process and generate a new Access Token")); … … 374 374 * Constructs a new {@code TestAuthorisationAction}. 375 375 */ 376 publicTestAuthorisationAction() {376 TestAuthorisationAction() { 377 377 putValue(NAME, tr("Test Access Token")); 378 378 putValue(SHORT_DESCRIPTION, tr("Click test access to the OSM server with the current access token")); -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java
r8510 r8836 170 170 private String lastTestedUrl = null; 171 171 172 publicValidateApiUrlAction() {172 ValidateApiUrlAction() { 173 173 putValue(NAME, tr("Validate")); 174 174 putValue(SHORT_DESCRIPTION, tr("Test the API URL")); … … 243 243 244 244 private static class ApiUrlValidator extends AbstractTextComponentValidator { 245 publicApiUrlValidator(JTextComponent tc) {245 ApiUrlValidator(JTextComponent tc) { 246 246 super(tc); 247 247 } -
trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java
r8540 r8836 128 128 * Constructs a new {@code ScListModel}. 129 129 */ 130 publicScListModel() {130 ScListModel() { 131 131 data = Shortcut.listAll(); 132 132 } … … 157 157 private boolean name; 158 158 159 publicShortcutTableCellRenderer(boolean name) {159 ShortcutTableCellRenderer(boolean name) { 160 160 this.name = name; 161 161 } … … 288 288 private PrefJPanel panel; 289 289 290 publicCbAction(PrefJPanel panel) {290 CbAction(PrefJPanel panel) { 291 291 this.panel = panel; 292 292 } -
trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java
r8835 r8836 55 55 return false; 56 56 } 57 57 58 58 static class TagCheckerRulesSourceEditor extends SourceEditor { 59 59 60 publicTagCheckerRulesSourceEditor() {60 TagCheckerRulesSourceEditor() { 61 61 super(SourceType.TAGCHECKER_RULE, Main.getJOSMWebsite()+"/rules", ruleSourceProviders, false); 62 62 } … … 122 122 } 123 123 } 124 124 125 125 /** 126 126 * Helper class for validator tag checker rules preferences. … … 143 143 public Collection<ExtendedSourceEntry> getDefault() { 144 144 List<ExtendedSourceEntry> def = new ArrayList<>(); 145 145 146 146 addDefault(def, "addresses", tr("Addresses"), tr("Checks for errors on addresses")); 147 147 addDefault(def, "combinations", tr("Tag combinations"), tr("Checks for missing tag or suspicious combinations")); … … 156 156 addDefault(def, "unnecessary", tr("Unnecessary tags"), tr("Checks for unnecessary tags")); 157 157 addDefault(def, "wikipedia", tr("Wikipedia"), tr("Checks for wrong wikipedia tags")); 158 158 159 159 return def; 160 160 } 161 161 162 162 private void addDefault(List<ExtendedSourceEntry> defaults, String filename, String title, String description) { 163 163 ExtendedSourceEntry i = new ExtendedSourceEntry(filename+".mapcss", "resource://data/validator/"+filename+".mapcss"); … … 188 188 final ValidatorPreference valPref = gui.getValidatorPreference(); 189 189 sources = new TagCheckerRulesSourceEditor(); 190 190 191 191 valPref.addSubTab(this, tr("Tag checker rules"), 192 192 sources, tr("Choose Tag checker rules to enable")); -
trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
r8581 r8836 612 612 private int colMax; 613 613 614 publicSelectionStateMemento() {614 SelectionStateMemento() { 615 615 rowMin = rowSelectionModel.getMinSelectionIndex(); 616 616 rowMax = rowSelectionModel.getMaxSelectionIndex(); -
trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
r8760 r8836 73 73 */ 74 74 static class TagTableColumnModel extends DefaultTableColumnModel { 75 publicTagTableColumnModel(DefaultListSelectionModel selectionModel) {75 TagTableColumnModel(DefaultListSelectionModel selectionModel) { 76 76 setSelectionModel(selectionModel); 77 77 TableColumn col = null; … … 196 196 class DeleteAction extends RunnableAction implements ListSelectionListener { 197 197 198 publicDeleteAction() {198 DeleteAction() { 199 199 putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete")); 200 200 putValue(SHORT_DESCRIPTION, tr("Delete the selection in the tag table")); … … 285 285 */ 286 286 class AddAction extends RunnableAction implements PropertyChangeListener{ 287 publicAddAction() {287 AddAction() { 288 288 putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); 289 289 putValue(SHORT_DESCRIPTION, tr("Add a new tag")); … … 320 320 */ 321 321 class PasteAction extends RunnableAction implements PropertyChangeListener{ 322 publicPasteAction() {322 PasteAction() { 323 323 putValue(SMALL_ICON, ImageProvider.get("", "pastetags")); 324 324 putValue(SHORT_DESCRIPTION, tr("Paste tags from buffer")); … … 618 618 private KeyboardFocusManager focusManager; 619 619 620 publicCellEditorRemover(KeyboardFocusManager fm) {620 CellEditorRemover(KeyboardFocusManager fm) { 621 621 this.focusManager = fm; 622 622 } -
trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
r8814 r8836 344 344 345 345 private static