Changeset 35622 in osm for applications/editors

Timestamp:

2020-10-26T09:32:12+01:00 (5 years ago)

Author:

simon04

Message:

Add PasteLevel0LAction

Location:

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0

Files:

• Comfort0Plugin.java (modified) (1 diff)
• EditLevel0LAction.java (modified) (2 diffs)
• PasteLevel0LAction.java (added)

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/Comfort0Plugin.java

@@ -23 +23 @@
         MainMenu.add(menu.editMenu, new EditLevel0LAction());
         MainMenu.addAfter(menu.editMenu, new CopyLevel0LAction(), false, menu.copy);
+        MainMenu.addAfter(menu.editMenu, new PasteLevel0LAction(), false, menu.paste);
 
     }

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/EditLevel0LAction.java

@@ -7 +7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
@@ -98 +99 @@
 
     private void readLevel0(Path path, final DataSet dataSet) throws IOException, ParseException {
-        final List<PrimitiveData> primitives;
         try (BufferedReader reader = Files.newBufferedReader(path, CHARSET)) {
-            primitives = new Level0LParser(reader).primitives();
+            final List<PrimitiveData> primitives = readLevel0(reader, dataSet);
+            Logging.info("Comfort0: Reading file {0} yielded {1} primitives", path, primitives.size());
         }
-        Logging.info("Comfort0: Reading file {0} yielded {1} primitives", path, primitives.size());
-
-        buildChangeCommands(dataSet, primitives);
     }
 
-    private void buildChangeCommands(DataSet dataSet, List<PrimitiveData> primitives) {
+    static List<PrimitiveData> readLevel0(Reader reader, final DataSet dataSet) throws ParseException {
+        final List<PrimitiveData> primitives = new Level0LParser(reader).primitives();
+        buildChangeCommands(dataSet, primitives);
+        return primitives;
+    }
+
+    static void buildChangeCommands(DataSet dataSet, List<PrimitiveData> primitives) {
         final List<Command> commands = new ArrayList<>();
         for (PrimitiveData fromLevel0L : primitives) {