Index: applications/editors/josm/plugins/opendata/build.xml
===================================================================
--- applications/editors/josm/plugins/opendata/build.xml	(revision 30528)
+++ applications/editors/josm/plugins/opendata/build.xml	(revision 30529)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="7291"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>
Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 30528)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java	(revision 30529)
@@ -3,5 +3,4 @@
 
 import java.awt.Image;
-import java.awt.Toolkit;
 import java.io.File;
 import java.net.URL;
@@ -58,5 +57,5 @@
 	private OdDialog dialog;
 	
-	public OdPlugin(PluginInformation info) { // NO_UCD
+	public OdPlugin(PluginInformation info) {
 		super(info);
 		if (instance == null) {
@@ -102,5 +101,4 @@
 	
 	private void buildMenu() {
-        int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
         for (Module module : ModuleHandler.moduleList) {
         	Map<DataSetCategory, JMenu> catMenus = new HashMap<DataSetCategory, JMenu>();
@@ -141,5 +139,6 @@
         				}
         				if (item != null) {
-        					MenuScroller.setScrollerFor(handlerMenu, (screenHeight / item.getPreferredSize().height)-3);
+        					MenuScroller.setScrollerFor(handlerMenu, 
+        					        MenuScroller.computeScrollCount(handlerMenu, item.getPreferredSize().height));
         					handlerItem = endMenu.add(handlerMenu);
         				}
@@ -151,11 +150,9 @@
         	}
         	if (moduleMenu != null) {
-        		//MenuScroller.setScrollerFor(moduleMenu, screenHeight / moduleMenu.getItem(0).getPreferredSize().height);
         		menu.add(moduleMenu);
         	}
         }
         menu.addSeparator();
-        /*JMenuItem itemIcon =*/ MainMenu.add(menu, new OpenPreferencesActions());
-        //MenuScroller.setScrollerFor(menu, screenHeight / itemIcon.getPreferredSize().height);
+        MainMenu.add(menu, new OpenPreferencesActions());
 	}
 	
@@ -212,14 +209,3 @@
         return dialog;
     }
-
-    /*
-    private static final void fixUcDetectorTest() {
-    	FilterFactoryImpl n1 = new FilterFactoryImpl();
-    	DatumAliases n2 = new DatumAliases();
-    	EPSGCRSAuthorityFactory n3 = new EPSGCRSAuthorityFactory();
-    	DefaultFunctionFactory n4 = new DefaultFunctionFactory();
-    	ShapefileDirectoryFactory n5 = new ShapefileDirectoryFactory();
-    	ReferencingObjectFactory n6 = new ReferencingObjectFactory();
-    	BufferedCoordinateOperationFactory n7 = new BufferedCoordinateOperationFactory();
-    }*/
 }