Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/AllUnitTests.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions; Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/AllEditorTests.java (revision 32519) @@ -1,8 +1,9 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; - -import junit.framework.TestCase; import org.junit.runner.RunWith; import org.junit.runners.Suite; + +import junit.framework.TestCase; @RunWith(Suite.class) Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanelTest.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanelTest.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanelTest.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -11,6 +12,6 @@ /** - * Simple functional test for the layout / basic functionality of {@see BasicEditorPanel} - * + * Simple functional test for the layout / basic functionality of {@see BasicEditorPanel} + * */ @Ignore("no test") @@ -19,32 +20,34 @@ private TurnRestrictionEditorModel model; private DataSet ds; - + public BasicEditorPanelTest() { ds = new DataSet(); - OsmDataLayer layer =new OsmDataLayer(ds, "test",null); - // mock a controler + OsmDataLayer layer = new OsmDataLayer(ds, "test", null); + // mock a controler NavigationControler controler = new NavigationControler() { + @Override public void gotoAdvancedEditor() { } + @Override public void gotoBasicEditor() { } + @Override public void gotoBasicEditor(BasicEditorFokusTargets focusTarget) { - } + } }; model = new TurnRestrictionEditorModel(layer, controler); - + BasicEditorPanel panel = new BasicEditorPanel(model); - + Container c = getContentPane(); c.setLayout(new BorderLayout()); - c.add(panel, BorderLayout.CENTER); - setSize(600,600); + c.add(panel, BorderLayout.CENTER); + setSize(600, 600); setDefaultCloseOperation(EXIT_ON_CLOSE); } - - - static public void main(String args[]) { + + public static void main(String[] args) { new BasicEditorPanelTest().setVisible(true); } Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxTest.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxTest.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionComboBoxTest.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -12,30 +13,33 @@ /** - * This is a simple test application to test the functionality/layout of + * This is a simple test application to test the functionality/layout of * the {@see TurnRestrictionComboBox} - * + * */ @Ignore("no test") public class TurnRestrictionComboBoxTest extends JFrame { - + private TurnRestrictionEditorModel model; private DataSet ds = new DataSet(); - + protected void build() { ds = new DataSet(); - OsmDataLayer layer =new OsmDataLayer(ds, "test",null); - // mock a controler + OsmDataLayer layer = new OsmDataLayer(ds, "test", null); + // mock a controler NavigationControler controler = new NavigationControler() { + @Override public void gotoAdvancedEditor() { } + @Override public void gotoBasicEditor() { } + @Override public void gotoBasicEditor(BasicEditorFokusTargets focusTarget) { - } + } }; model = new TurnRestrictionEditorModel(layer, controler); - + Container c = getContentPane(); c.setLayout(new GridBagLayout()); @@ -44,20 +48,19 @@ gc.fill = GridBagConstraints.HORIZONTAL; gc.weightx = 1.0; - + TurnRestrictionComboBox cb = new TurnRestrictionComboBox( new TurnRestrictionComboBoxModel(model) ); - add(cb, gc); + add(cb, gc); } - + public TurnRestrictionComboBoxTest() { build(); - setSize(600,600); + setSize(600, 600); setDefaultCloseOperation(EXIT_ON_CLOSE); } - - public static void main(String args[]) { + + public static void main(String[] args) { new TurnRestrictionComboBoxTest().setVisible(true); } - } Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorTest.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorTest.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorTest.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -12,15 +13,15 @@ @Ignore("no test") public class TurnRestrictionEditorTest extends JFrame { - + public TurnRestrictionEditorTest() { - setSize(10,10); + setSize(10, 10); TurnRestrictionEditor editor = new TurnRestrictionEditor(this, new OsmDataLayer(new DataSet(), "test", null)); - editor.setSize(600,600); + editor.setSize(600, 600); editor.setVisible(true); - + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); } - - static public void main(String args[]) { + + public static void main(String[] args) { new TurnRestrictionEditorTest().setVisible(true); } Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorTest.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorTest.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditorTest.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -30,10 +31,10 @@ /** - * Simple test application to test functionality and layout of the + * Simple test application to test functionality and layout of the * {@see TurnRestrictionLegEditor} */ @Ignore("no test") public class TurnRestrictionLegEditorTest extends JFrame { - + private TurnRestrictionLegEditor editor; private TurnRestrictionEditorModel model; @@ -41,18 +42,21 @@ private DefaultListModel listModel; private DataSet dataSet; - + protected JPanel buildLegEditorPanel() { DataSet ds = new DataSet(); - OsmDataLayer layer =new OsmDataLayer(ds, "test",null); - // mock a controler + OsmDataLayer layer = new OsmDataLayer(ds, "test", null); + // mock a controler NavigationControler controler = new NavigationControler() { + @Override public void gotoAdvancedEditor() { } + @Override public void gotoBasicEditor() { } + @Override public void gotoBasicEditor(BasicEditorFokusTargets focusTarget) { - } + } }; JPanel pnl = new JPanel(new GridBagLayout()); @@ -60,7 +64,7 @@ gc.anchor = GridBagConstraints.NORTHWEST; gc.fill = GridBagConstraints.HORIZONTAL; - gc.weightx = 0.0; + gc.weightx = 0.0; pnl.add(new JLabel("From"), gc); - + gc.weightx = 1.0; gc.gridx = 1; @@ -69,19 +73,20 @@ model.populate(new Relation()); pnl.add(editor = new TurnRestrictionLegEditor(model, TurnRestrictionLegRole.FROM), gc); - + return pnl; } - + protected JPanel buildObjectListPanel() { JPanel pnl = new JPanel(new BorderLayout()); listModel = new DefaultListModel<>(); pnl.add(new JScrollPane(lstObjects = new JList<>(listModel)), BorderLayout.CENTER); - lstObjects.setCellRenderer(new OsmPrimitivRenderer()); - - PrimitiveIdListProvider provider = new PrimitiveIdListProvider() { + lstObjects.setCellRenderer(new OsmPrimitivRenderer()); + + PrimitiveIdListProvider provider = new PrimitiveIdListProvider() { + @Override public List getSelectedPrimitiveIds() { List ret = new ArrayList<>(); - int [] sel = lstObjects.getSelectedIndices(); - for (int i: sel){ + int[] sel = lstObjects.getSelectedIndices(); + for (int i: sel) { ret.add((lstObjects.getModel().getElementAt(i)).getPrimitiveId()); } @@ -89,22 +94,22 @@ } }; - + lstObjects.setTransferHandler(new PrimitiveIdListTransferHandler(provider)); lstObjects.setDragEnabled(true); return pnl; } - + protected void build() { Container c = getContentPane(); c.setLayout(new GridBagLayout()); - + GridBagConstraints gc = new GridBagConstraints(); gc.anchor = GridBagConstraints.NORTHWEST; - gc.fill = GridBagConstraints.HORIZONTAL; + gc.fill = GridBagConstraints.HORIZONTAL; gc.insets = new Insets(20, 0, 20, 0); - gc.weightx = 1.0; + gc.weightx = 1.0; gc.weighty = 0.0; add(buildLegEditorPanel(), gc); - + gc.gridy = 1; gc.weightx = 1.0; @@ -112,34 +117,34 @@ gc.fill = GridBagConstraints.BOTH; add(buildObjectListPanel(), gc); - setSize(600,600); + setSize(600, 600); } - + protected void initForTest1() { Way w = new Way(1); w.put("name", "way-1"); - + editor.getModel().setTurnRestrictionLeg(TurnRestrictionLegRole.FROM, w); } - + protected void initForTest2() { Way w = new Way(1); - w.put("name", "way-1"); + w.put("name", "way-1"); dataSet.addPrimitive(w); editor.getModel().setTurnRestrictionLeg(TurnRestrictionLegRole.FROM, w); - - Node n = new Node(new LatLon(1,1)); + + Node n = new Node(new LatLon(1, 1)); n.setOsmId(1, 1); n.put("name", "node.1"); dataSet.addPrimitive(n); listModel.addElement(n); - + w = new Way(); - w.setOsmId(2,1); + w.setOsmId(2, 1); w.put("name", "way.1"); dataSet.addPrimitive(w); listModel.addElement(w); - + Relation r = new Relation(); - r.setOsmId(3,1); + r.setOsmId(3, 1); r.put("name", "relation.1"); dataSet.addPrimitive(r); @@ -147,10 +152,10 @@ } - public TurnRestrictionLegEditorTest(){ + public TurnRestrictionLegEditorTest() { build(); initForTest2(); } - - static public void main(String args[]) { + + public static void main(String[] args) { new TurnRestrictionLegEditorTest().setVisible(true); } Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditorTest.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditorTest.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditorTest.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -13,5 +14,5 @@ /** * Simple test application to test the vehicle exception editor - * + * */ @Ignore("no test") @@ -20,5 +21,5 @@ OsmDataLayer layer; VehicleExceptionEditor editor; - + protected void build() { Container c = getContentPane(); @@ -26,36 +27,39 @@ layer = new OsmDataLayer(new DataSet(), "test", null); - model = new TurnRestrictionEditorModel(layer, new MockNavigationControler()); + model = new TurnRestrictionEditorModel(layer, new MockNavigationControler()); editor = new VehicleExceptionEditor(model); c.add(editor, BorderLayout.CENTER); - + model.getTagEditorModel().add(new TagModel("except", "non-standard-value")); } - - public VehicleExceptionEditorTest(){ + + public VehicleExceptionEditorTest() { build(); setDefaultCloseOperation(EXIT_ON_CLOSE); - setSize(500,500); + setSize(500, 500); } - - public static void main(String args[]){ + + public static void main(String[] args) { new VehicleExceptionEditorTest().setVisible(true); } - - static private class MockNavigationControler implements NavigationControler{ + private static class MockNavigationControler implements NavigationControler { + + @Override public void gotoAdvancedEditor() { // TODO Auto-generated method stub - + } + @Override public void gotoBasicEditor() { // TODO Auto-generated method stub - + } + @Override public void gotoBasicEditor(BasicEditorFokusTargets focusTarget) { // TODO Auto-generated method stub - + } } Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListTest.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListTest.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListTest.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.editor; @@ -24,61 +25,64 @@ @Ignore("no test") public class ViaListTest extends JFrame { - + private TurnRestrictionEditorModel model; - + protected void build() { DataSet ds = new DataSet(); - OsmDataLayer layer =new OsmDataLayer(ds, "test", null); - // mock a controler + OsmDataLayer layer = new OsmDataLayer(ds, "test", null); + // mock a controler NavigationControler controler = new NavigationControler() { + @Override public void gotoAdvancedEditor() { } + @Override public void gotoBasicEditor() { } + @Override public void gotoBasicEditor(BasicEditorFokusTargets focusTarget) { - } + } }; model = new TurnRestrictionEditorModel(layer, controler); Container c = getContentPane(); - + c.setLayout(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(); gc.anchor = GridBagConstraints.NORTHWEST; - gc.insets = new Insets(5,5,5,20); + gc.insets = new Insets(5, 5, 5, 20); gc.fill = GridBagConstraints.BOTH; gc.weightx = 0.5; gc.weighty = 1.0; - + DefaultListSelectionModel selectionModel = new DefaultListSelectionModel(); c.add(new ViaList(new ViaListModel(model, selectionModel), selectionModel), gc); - + gc.gridx = 1; c.add(new JList<>(), gc); - - setSize(600,600); + + setSize(600, 600); setDefaultCloseOperation(EXIT_ON_CLOSE); } - + protected void initTest1() { DataSet ds = new DataSet(); Relation r = new Relation(); Node n; - for (int i = 1; i<10; i++){ - n = new Node(new LatLon(i,i)); + for (int i = 1; i < 10; i++) { + n = new Node(new LatLon(i, i)); n.put("name", "node." + i); ds.addPrimitive(n); - r.addMember(new RelationMember("via",n)); - } + r.addMember(new RelationMember("via", n)); + } model.populate(r); } - + public ViaListTest() { - build(); + build(); initTest1(); } - - static public void main(String args[]) { + + public static void main(String[] args) { new ViaListTest().setVisible(true); } Index: applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesViewTest.java =================================================================== --- applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesViewTest.java (revision 32409) +++ applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesViewTest.java (revision 32519) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.turnrestrictions.qa; @@ -22,18 +23,21 @@ public class IssuesViewTest extends JFrame { private IssuesModel model; - + protected void build() { Container c = getContentPane(); c.setLayout(new GridBagLayout()); - // mock a controler + // mock a controler NavigationControler controler = new NavigationControler() { + @Override public void gotoAdvancedEditor() { } + @Override public void gotoBasicEditor() { } + @Override public void gotoBasicEditor(BasicEditorFokusTargets focusTarget) { - } + } }; OsmDataLayer layer = new OsmDataLayer(new DataSet(), "test", null); @@ -49,5 +53,5 @@ pane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); c.add(pane, gc); - + List issues = new ArrayList<>(); issues.add(new RequiredTagMissingError(model, "type", "restriction")); @@ -55,12 +59,12 @@ model.populate(issues); } - + public IssuesViewTest() { setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - setSize(400,600); + setSize(400, 600); build(); } - - public static void main(String args[]) { + + public static void main(String[] args) { new IssuesViewTest().setVisible(true); }