Changeset 4203 in josm

Timestamp:

Jul 6, 2011 5:10:23 PM (2 years ago)

Author:

stoecker

Message:

fix #6544 - fix NPE

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/FullscreenToggleAction.java (modified) (2 diffs)
• data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• gui/MainMenu.java (modified) (1 diff)
• tools/PlatformHook.java (modified) (1 diff)
• tools/PlatformHookOsx.java (modified) (1 diff)
• tools/PlatformHookUnixoid.java (modified) (2 diffs)
• tools/PlatformHookWindows.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java

@@ -45 +45 @@
         selected = Main.pref.getBoolean("draw.fullscreen", false);
         notifySelectedState();
-    }
-
-    public boolean canFullscreen() {
-        /* We only support fullscreen, see
-         * http://lists.openstreetmap.org/pipermail/josm-dev/2009-March/002659.html
-         * for why
-         */
-        return Main.platform instanceof PlatformHookUnixoid && gd.isFullScreenSupported();
     }
 
@@ -105 +97 @@
             frame.setBounds(new Rectangle(Toolkit.getDefaultToolkit().getScreenSize()));
         }
-        
+
         // we cannot use hw-exclusive fullscreen mode in MS-Win, as long
         // as josm throws out modal dialogs, see here:

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -42 +42 @@
                 Collections.<Collection<String>>emptySet())) {
             ImageryInfo i = new ImageryInfo(c);
-            /* FIXME: Remove the attribution copy stuff end of 2011 */
-            if(!i.hasAttribution()) {
-                String url = i.getUrl();
-                for(ImageryInfo d : defaultLayers) {
-                    if(url.equals(d.getUrl())) {
-                        i.copyAttribution(d);
-                        i.setBounds(d.getBounds());
-                        break;
+            String url = i.getUrl();
+            if(url != null) {
+                /* FIXME: Remove the attribution copy stuff end of 2011 */
+                if(!i.hasAttribution()) {
+                    for(ImageryInfo d : defaultLayers) {
+                        if(url.equals(d.getUrl())) {
+                            i.copyAttribution(d);
+                            i.setBounds(d.getBounds());
+                            break;
+                        }
                     }
                 }
+                add(i);
             }
-            add(i);
         }
         Collections.sort(layers);

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -306 +306 @@
             // -- fullscreen toggle action
             fullscreenToggleAction = new FullscreenToggleAction();
-            if (fullscreenToggleAction.canFullscreen()) {
+            if (Main.platform.canFullscreen()) {
                 final JCheckBoxMenuItem fullscreen = new JCheckBoxMenuItem(fullscreenToggleAction);
                 viewMenu.addSeparator();

trunk/src/org/openstreetmap/josm/tools/PlatformHook.java

@@ -104 +104 @@
     public String getDefaultStyle();
 
+    public boolean canFullscreen();
+
     public boolean rename(File from, File to);
 }

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -272 +272 @@
 
     @Override
+    public boolean canFullscreen()
+    {
+        return false;
+    }
+
+    @Override
     public boolean rename(File from, File to)
     {

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.awt.GraphicsEnvironment;
 import java.awt.event.KeyEvent;
 import java.io.File;
@@ -81 +82 @@
 
     @Override
+    public boolean canFullscreen()
+    {
+        return GraphicsEnvironment.getLocalGraphicsEnvironment()
+        .getDefaultScreenDevice().isFullScreenSupported();
+    }
+
+    @Override
     public boolean rename(File from, File to)
     {

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -63 +63 @@
 
     @Override
+    public boolean canFullscreen()
+    {
+        return false;
+    }
+
+    @Override
     public boolean rename(File from, File to)
     {