Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergerTest.java (revision 8510) @@ -22,9 +22,9 @@ Node n1; w1.addNode(n1 = new Node(1)); - for (int i=0; i < 20; i++) { + for (int i = 0; i < 20; i++) { n1.put("key" + i, "value" + i); } StringBuilder note = new StringBuilder(); - for (int i=0; i < 50; i++) { + for (int i = 0; i < 50; i++) { note.append(" A very long text "); } @@ -49,5 +49,5 @@ Way w2 = new Way(); - for (int i = 1; i < 200; i+=2) { + for (int i = 1; i < 200; i += 2) { w2.addNode(new Node(i)); } @@ -72,5 +72,5 @@ static public void main(String args[]) { NodeListMergerTest test = new NodeListMergerTest(); - test.setSize(600,600); + test.setSize(600, 600); test.setVisible(true); } Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (revision 8510) @@ -28,9 +28,9 @@ protected void populate() { Node my = new Node(1); - my.setCoor(new LatLon(1,1)); + my.setCoor(new LatLon(1, 1)); my.setDeleted(true); Node their = new Node(2); - their.setCoor(new LatLon(10,10)); + their.setCoor(new LatLon(10, 10)); merger.getModel().populate(new Conflict(my, their)); Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMergerTest.java (revision 8510) @@ -51,5 +51,5 @@ static public void main(String args[]) { RelationMemberMergerTest test = new RelationMemberMergerTest(); - test.setSize(600,600); + test.setSize(600, 600); test.setVisible(true); } Index: trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergerTest.java (revision 8510) @@ -29,5 +29,5 @@ tagMerger.getModel().addItem(new TagMergeItem("a very long key asdfasdf asdfasdf", "a very long value asdfasdf", "a very long value asdfasdf")); - for (int i=0; i< 50; i++) { + for (int i = 0; i < 50; i++) { tagMerger.getModel().addItem(new TagMergeItem("key", "myvalue", "theirvalue")); } @@ -36,5 +36,5 @@ public static void main(String args[]) { TagMergerTest test = new TagMergerTest(); - test.setSize(600,600); + test.setSize(600, 600); test.setVisible(true); } Index: trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java (revision 8510) @@ -16,7 +16,7 @@ protected void build() { - setSize(100,100); + setSize(100, 100); dialog = new ConflictResolutionDialog(this); - dialog.setSize(600,600); + dialog.setSize(600, 600); } Index: trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java (revision 8510) @@ -29,5 +29,5 @@ protected void build() { - setSize(500,500); + setSize(500, 500); getContentPane().setLayout(new BorderLayout()); browser = new HistoryBrowser(); @@ -40,5 +40,5 @@ try { ds = reader.parseHistory(NullProgressMonitor.INSTANCE); - } catch(OsmTransferException e) { + } catch (OsmTransferException e) { Main.error(e); return; @@ -51,9 +51,9 @@ * Constructs a new {@code HistoryBrowserTest}. */ - public HistoryBrowserTest(){ + public HistoryBrowserTest() { build(); //populate(OsmPrimitiveType.NODE,354117); //populate(OsmPrimitiveType.WAY,37951); - populate(OsmPrimitiveType.RELATION,5055); + populate(OsmPrimitiveType.RELATION, 5055); } Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (revision 8510) @@ -57,7 +57,7 @@ // create a set of nodes // - for (int i=0; i< numNodes; i++) { + for (int i = 0; i < numNodes; i++) { Node n = new Node(); - n.setCoor(new LatLon(-36.6,47.6)); + n.setCoor(new LatLon(-36.6, 47.6)); n.put("name", "node-"+i); ds.addPrimitive(n); @@ -65,12 +65,11 @@ } - // create a set of ways, each with a random number of - // nodes + // create a set of ways, each with a random number of nodes // - for (int i=0; i< numWays; i++) { + for (int i = 0; i < numWays; i++) { Way w = new Way(); - int numNodesInWay = 2 + (int)Math.round(Math.random() * 5); - int start = (int)Math.round(Math.random() * numNodes); - for (int j = 0; j < numNodesInWay;j++) { + int numNodesInWay = 2 + (int) Math.round(Math.random() * 5); + int start = (int) Math.round(Math.random() * numNodes); + for (int j = 0; j < numNodesInWay; j++) { int idx = (start + j) % numNodes; Node n = nodes.get(idx); @@ -82,20 +81,19 @@ } - // create a set of relations each with a random number of nodes, - // and ways + // create a set of relations each with a random number of nodes, and ways // - for (int i=0; i< numRelations; i++) { + for (int i = 0; i < numRelations; i++) { Relation r = new Relation(); r.put("name", "relation-" +i); - int numNodesInRelation = (int)Math.round(Math.random() * 10); - int start = (int)Math.round(Math.random() * numNodes); - for (int j = 0; j < numNodesInRelation;j++) { + int numNodesInRelation = (int) Math.round(Math.random() * 10); + int start = (int) Math.round(Math.random() * numNodes); + for (int j = 0; j < numNodesInRelation; j++) { int idx = (start + j) % 500; Node n = nodes.get(idx); r.addMember(new RelationMember("role-" + j, n)); } - int numWaysInRelation = (int)Math.round(Math.random() * 10); - start = (int)Math.round(Math.random() * numWays); - for (int j = 0; j < numWaysInRelation;j++) { + int numWaysInRelation = (int) Math.round(Math.random() * 10); + start = (int) Math.round(Math.random() * numWays); + for (int j = 0; j < numWaysInRelation; j++) { int idx = (start + j) % 500; Way w = ways.get(idx); @@ -167,5 +165,5 @@ w.footer(); } - } catch(IOException e) { + } catch (IOException e) { fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString())); } @@ -191,5 +189,5 @@ MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); ArrayList nodes = new ArrayList<>(ds.getNodes()); - for (int i =0; i< 10; i++) { + for (int i = 0; i < 10; i++) { reader.append(nodes.get(i)); } @@ -197,7 +195,7 @@ assertEquals(10, out.getNodes().size()); for (Node n1:out.getNodes()) { - Node n2 = (Node)ds.getPrimitiveById(n1); + Node n2 = (Node) ds.getPrimitiveById(n1); assertNotNull(n2); - assertEquals(n2.get("name"),n2.get("name")); + assertEquals(n2.get("name"), n2.get("name")); } assertTrue(reader.getMissingPrimitives().isEmpty()); @@ -207,6 +205,6 @@ public void testMultiGet10Ways() throws OsmTransferException { MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); - ArrayList ways= new ArrayList<>(ds.getWays()); - for (int i =0; i< 10; i++) { + ArrayList ways = new ArrayList<>(ds.getWays()); + for (int i = 0; i < 10; i++) { reader.append(ways.get(i)); } @@ -214,8 +212,8 @@ assertEquals(10, out.getWays().size()); for (Way w1: out.getWays()) { - Way w2 = (Way)ds.getPrimitiveById(w1); + Way w2 = (Way) ds.getPrimitiveById(w1); assertNotNull(w2); assertEquals(w2.getNodesCount(), w1.getNodesCount()); - assertEquals(w2.get("name"),w1.get("name")); + assertEquals(w2.get("name"), w1.get("name")); } assertTrue(reader.getMissingPrimitives().isEmpty()); @@ -225,6 +223,6 @@ public void testMultiGet10Relations() throws OsmTransferException { MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); - ArrayList relations= new ArrayList<>(ds.getRelations()); - for (int i =0; i< 10; i++) { + ArrayList relations = new ArrayList<>(ds.getRelations()); + for (int i = 0; i < 10; i++) { reader.append(relations.get(i)); } @@ -232,8 +230,8 @@ assertEquals(10, out.getRelations().size()); for (Relation r1: out.getRelations()) { - Relation r2 = (Relation)ds.getPrimitiveById(r1); + Relation r2 = (Relation) ds.getPrimitiveById(r1); assertNotNull(r2); assertEquals(r2.getMembersCount(), r1.getMembersCount()); - assertEquals(r2.get("name"),r2.get("name")); + assertEquals(r2.get("name"), r2.get("name")); } assertTrue(reader.getMissingPrimitives().isEmpty()); @@ -244,5 +242,5 @@ MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); ArrayList nodes = new ArrayList<>(ds.getNodes()); - for (int i =0; i< 812; i++) { + for (int i = 0; i < 812; i++) { reader.append(nodes.get(i)); } @@ -250,7 +248,7 @@ assertEquals(812, out.getNodes().size()); for (Node n1:out.getNodes()) { - Node n2 = (Node)ds.getPrimitiveById(n1); + Node n2 = (Node) ds.getPrimitiveById(n1); assertNotNull(n2); - assertEquals(n2.get("name"),n2.get("name")); + assertEquals(n2.get("name"), n2.get("name")); } assertTrue(reader.getMissingPrimitives().isEmpty()); @@ -261,5 +259,5 @@ MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader(); ArrayList nodes = new ArrayList<>(ds.getNodes()); - for (int i =0; i< 10; i++) { + for (int i = 0; i < 10; i++) { reader.append(nodes.get(i)); } @@ -269,7 +267,7 @@ assertEquals(10, out.getNodes().size()); for (Node n1:out.getNodes()) { - Node n2 = (Node)ds.getPrimitiveById(n1); + Node n2 = (Node) ds.getPrimitiveById(n1); assertNotNull(n2); - assertEquals(n2.get("name"),n2.get("name")); + assertEquals(n2.get("name"), n2.get("name")); } assertFalse(reader.getMissingPrimitives().isEmpty()); Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java (revision 8510) @@ -73,7 +73,7 @@ protected static void populateTestDataSetWithNodes(DataSet ds) { - for (int i=0;i<100;i++) { + for (int i = 0; i < 100; i++) { Node n = new Node(); - n.setCoor(new LatLon(-36.6,47.6)); + n.setCoor(new LatLon(-36.6, 47.6)); n.put("name", "node-"+i); ds.addPrimitive(n); @@ -82,7 +82,7 @@ protected static void populateTestDataSetWithWays(DataSet ds) { - for (int i=0;i<20;i++) { + for (int i = 0; i < 20; i++) { Way w = new Way(); - for (int j = 0; j < 10;j++) { + for (int j = 0; j < 10; j++) { w.addNode(lookupNode(ds, i+j)); } @@ -93,17 +93,17 @@ protected static void populateTestDataSetWithRelations(DataSet ds) { - for (int i=0;i<10;i++) { + for (int i = 0; i < 10; i++) { Relation r = new Relation(); r.put("name", "relation-" +i); - for (int j =0; j < 10; j++) { + for (int j = 0; j < 10; j++) { RelationMember member = new RelationMember("node-" + j, lookupNode(ds, i + j)); r.addMember(member); } - for (int j =0; j < 5; j++) { + for (int j = 0; j < 5; j++) { RelationMember member = new RelationMember("way-" + j, lookupWay(ds, i + j)); r.addMember(member); } if (i > 5) { - for (int j =0; j < 3; j++) { + for (int j = 0; j < 3; j++) { RelationMember member = new RelationMember("relation-" + j, lookupRelation(ds, j)); logger.info(MessageFormat.format("adding relation {0} to relation {1}", j, i)); @@ -185,5 +185,5 @@ w.footer(); } - } catch(IOException e) { + } catch (IOException e) { fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString())); } @@ -456,5 +456,5 @@ protected static Set getNodeIdsInWay(Way way) { HashSet ret = new HashSet<>(); - if (way == null)return ret; + if (way == null) return ret; for (Node n: way.getNodes()) { ret.add(n.getId()); Index: trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java =================================================================== --- trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java (revision 8509) +++ trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java (revision 8510) @@ -27,7 +27,6 @@ getContentPane().add(uploadStrategySelectionPanel, BorderLayout.CENTER); getContentPane().add(buildControlPanel(), BorderLayout.SOUTH); - setSize(400,400); + setSize(400, 400); } - protected JPanel buildControlPanel() { @@ -42,5 +41,5 @@ try { n = Integer.parseInt(tf.getText()); - } catch(NumberFormatException e) { + } catch (NumberFormatException e) { Main.error(e); return; @@ -61,5 +60,5 @@ } - public static void main(String args[]) throws OsmApiInitializationException, OsmTransferCanceledException{ + public static void main(String args[]) throws OsmApiInitializationException, OsmTransferCanceledException { OsmApi.getOsmApi().initialize(NullProgressMonitor.INSTANCE); new UploadStrategySelectionPanelTest().setVisible(true);