Changeset 30529 in osm for applications/editors/josm

Timestamp:

2014-07-13T21:57:10+02:00 (10 years ago)

Author:

donvip

Message:

[josm_opendata] update to JOSM 7291

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (modified) (6 diffs)

applications/editors/josm/plugins/opendata/build.xml

@@ -1 +1 @@
 <?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"/>

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -3 +3 @@
 
 import java.awt.Image;
-import java.awt.Toolkit;
 import java.io.File;
 import java.net.URL;
@@ -58 +57 @@
         private OdDialog dialog;
         
-        public OdPlugin(PluginInformation info) { // NO_UCD
+        public OdPlugin(PluginInformation info) {
                 super(info);
                 if (instance == null) {
@@ -102 +101 @@
         
         private void buildMenu() {
-        int screenHeight = Toolkit.getDefaultToolkit().getScreenSize().height;
         for (Module module : ModuleHandler.moduleList) {
                 Map<DataSetCategory, JMenu> catMenus = new HashMap<DataSetCategory, JMenu>();
@@ -141 +139 @@
                                         }
                                         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 +150 @@
                 }
                 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 +209 @@
         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();
-    }*/
 }