adapt to current josm, v0.7.7

fixes #56
matsim-org · May 13, 2017 · b0c992f · don-vip · May 13, 2017 · b0c992f
1 parent 81ad6c3
commit b0c992f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -74,8 +74,8 @@ jar {
     manifest {
         attributes(
                 "Plugin-Date": new Date().format("yyyy-MM-dd HH:mm"),
-                "Plugin-Version": "v0.7.6",
-                "Plugin-Mainversion": 10786,
+                "Plugin-Version": "v0.7.7",
+                "Plugin-Mainversion": 12039,
                 "10340_Plugin-Url": "v0.7.5;https://github.com/matsim-org/josm-matsim-plugin/releases/download/v0.7.5/matsim.jar",
                 "9278_Plugin-Url": "v0.5.9;https://github.com/matsim-org/josm-matsim-plugin/releases/download/v0.5.9/matsim.jar",
                 "Created-By": System.getProperty('java.version') + ' (' + System.getProperty('java.vendor') + ')',

diff --git a/src/main/java/org/matsim/contrib/josm/MATSimPlugin.java b/src/main/java/org/matsim/contrib/josm/MATSimPlugin.java
@@ -91,7 +91,7 @@ public MATSimPlugin(PluginInformation info) {
 				Main.toolbar.register(tp);
 			}
 		}
-		AutoCompletionManager.cachePresets(tps);
+//		AutoCompletionManager.cachePresets(tps);
 		HashMap<TaggingPresetMenu, JMenu> submenus = new HashMap<>();
 		for (final TaggingPreset p : tps) {
 			JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;

diff --git a/src/main/java/org/matsim/contrib/josm/actions/ConvertAction.java b/src/main/java/org/matsim/contrib/josm/actions/ConvertAction.java
@@ -67,7 +67,7 @@ protected void finish() {
 						// it is.
 						// (Perhaps I want to look at the particular are I am viewing right
 						// now.)
-						Main.main.addLayer(layer, (ProjectionBounds) null);
+						Main.getLayerManager().addLayer(layer);
 					}
 				}
 			};