Changeset 8514 in josm
- Timestamp:
- 2015-06-21T03:19:37+02:00 (9 years ago)
- Location:
- trunk
- Files:
-
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
r8510 r8514 7 7 8 8 import javax.imageio.ImageIO; 9 10 9 11 10 /** -
trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java
r8510 r8514 28 28 * 29 29 */ 30 31 30 public class HostLimitQueue extends LinkedBlockingDeque<Runnable> { 32 31 private static final long serialVersionUID = 1L; -
trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
r8510 r8514 34 34 * @since 8168 35 35 */ 36 public class JCSCacheManager {36 public final class JCSCacheManager { 37 37 private static final Logger log = FeatureAdapter.getLogger(JCSCacheManager.class.getCanonicalName()); 38 38 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java
r8510 r8514 479 479 * A utility class to fetch changesets and display the changeset dialog. 480 480 */ 481 public static class LaunchChangesetManager {481 public static final class LaunchChangesetManager { 482 482 483 483 private LaunchChangesetManager() { -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java
r8510 r8514 486 486 public final boolean not; 487 487 488 pr ivatePseudoClassCondition(Method method, boolean not) {488 protected PseudoClassCondition(Method method, boolean not) { 489 489 this.method = method; 490 490 this.not = not; … … 501 501 } 502 502 throw new IllegalArgumentException("Invalid pseudo class specified: " + id); 503 504 503 } 505 504 -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
r8510 r8514 108 108 */ 109 109 @SuppressWarnings("UnusedDeclaration") 110 public static class Functions {110 public static final class Functions { 111 111 112 112 private Functions() { -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
r8510 r8514 266 266 267 267 private class ContainsFinder extends AbstractFinder { 268 pr ivateContainsFinder(Environment e) {268 protected ContainsFinder(Environment e) { 269 269 super(e); 270 270 CheckParameterUtil.ensureThat(!(e.osm instanceof Node), "Nodes not supported"); -
trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
r8487 r8514 21 21 * Look up, if there is right- or left-hand traffic at a certain place. 22 22 */ 23 public class RightAndLefthandTraffic {23 public final class RightAndLefthandTraffic { 24 24 25 25 private static class RLTrafficGeoProperty implements GeoProperty<Boolean> { -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java
r8511 r8514 70 70 } 71 71 72 public static void main(String args[]) {72 public static void main(String[] args) { 73 73 NodeListMergerTest test = new NodeListMergerTest(); 74 74 test.setSize(600, 600); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
r8511 r8514 45 45 } 46 46 47 public static void main(String args[]) {47 public static void main(String[] args) { 48 48 PropertiesMergerTest app = new PropertiesMergerTest(); 49 49 app.setSize(600, 400); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java
r8511 r8514 49 49 } 50 50 51 public static void main(String args[]) {51 public static void main(String[] args) { 52 52 RelationMemberMergerTest test = new RelationMemberMergerTest(); 53 53 test.setSize(600, 600); -
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java
r8510 r8514 34 34 } 35 35 36 public static void main(String args[]) {36 public static void main(String[] args) { 37 37 TagMergerTest test = new TagMergerTest(); 38 38 test.setSize(600, 600); -
trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
r8511 r8514 44 44 } 45 45 46 public static void main(String args[]) {46 public static void main(String[] args) { 47 47 ConflictResolutionDialogTest test = new ConflictResolutionDialogTest(); 48 48 test.setVisible(true); -
trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java
r8511 r8514 16 16 } 17 17 18 public static void main(String args[]) {18 public static void main(String[] args) { 19 19 new ChangesetCacheManagerTest().start(); 20 20 } -
trunk/test/functional/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialogTest.java
r8511 r8514 17 17 } 18 18 19 public static void main(String args[]) {19 public static void main(String[] args) { 20 20 new ChangesetQueryDialogTest().start(); 21 21 } -
trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java
r8511 r8514 59 59 } 60 60 61 public static void main(String args[]) {61 public static void main(String[] args) { 62 62 HistoryBrowserTest.init(); 63 63 new HistoryBrowserTest().setVisible(true); -
trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java
r8510 r8514 60 60 } 61 61 62 public static void main(String args[]) throws OsmApiInitializationException, OsmTransferCanceledException {62 public static void main(String[] args) throws OsmApiInitializationException, OsmTransferCanceledException { 63 63 OsmApi.getOsmApi().initialize(NullProgressMonitor.INSTANCE); 64 64 new UploadStrategySelectionPanelTest().setVisible(true); -
trunk/test/unit/org/CustomMatchers.java
r7937 r8514 1 1 // License: GPL. For details, see LICENSE file. 2 2 package org; 3 4 import java.util.Collection; 3 5 4 6 import org.hamcrest.Description; … … 8 10 import org.openstreetmap.josm.tools.Predicate; 9 11 10 import java.util.Collection; 12 @Ignore("no test") 13 public final class CustomMatchers { 11 14 12 @Ignore("no test") 13 public class CustomMatchers { 15 private CustomMatchers() { 16 // Hide constructor for utility classes 17 } 14 18 15 19 public static <T> Matcher<? extends T> forPredicate(final Predicate<T> predicate) { -
trunk/test/unit/org/openstreetmap/josm/TestUtils.java
r8510 r8514 10 10 * Various utils, useful for unit tests. 11 11 */ 12 public class TestUtils { 12 public final class TestUtils { 13 14 private TestUtils() { 15 // Hide constructor for utility classes 16 } 13 17 14 18 /** -
trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java
r8510 r8514 18 18 Date d = new Date(); 19 19 HistoryNode node = new HistoryNode( 20 1 l,21 2 l,20 1L, 21 2L, 22 22 true, 23 23 User.createOsmUser(3, "testuser"), 24 4 l,24 4L, 25 25 d, 26 26 new LatLon(0, 0) -
trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
r8513 r8514 60 60 } 61 61 try { 62 int rows[]= (int[]) idx[i];62 int[] rows = (int[]) idx[i]; 63 63 if (rows.length != 2) { 64 64 fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows)); -
trunk/tools/checkstyle/josm_checks.xml
r8513 r8514 90 90 <property name="allowSingleLineStatement" value="true"/> 91 91 </module> 92 <module name="ArrayTypeStyle"/> 93 <module name="UpperEll"/> 94 <module name="OuterTypeFilename"/> 95 <module name="FinalClass"/> 96 <module name="HideUtilityClassConstructor"/> 92 97 </module> 93 98 <module name="Header"> … … 104 109 </module> 105 110 <module name="FileTabCharacter"/> 111 <module name="NewlineAtEndOfFile"> 112 <property name="lineSeparator" value="lf"/> 113 </module> 106 114 </module>
Note:
See TracChangeset
for help on using the changeset viewer.