Changeset 4153 in josm for trunk/src/org

Timestamp:

2011-06-20T16:37:21+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6213 - input stream mirror update failed on Windows

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/MirroredInputStream.java (modified) (1 diff)
• tools/PlatformHook.java (modified) (2 diffs)
• tools/PlatformHookOsx.java (modified) (2 diffs)
• tools/PlatformHookUnixoid.java (modified) (2 diffs)
• tools/PlatformHookWindows.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

@@ -234 +234 @@
             fos = null;
             file = new File(destDir, localPath);
-            if(destDirFile.renameTo(file)) {
+            if(Main.platform.rename(destDirFile, file)) {
                 Main.pref.putCollection(prefKey, Arrays.asList(new String[]
                 {Long.toString(System.currentTimeMillis()), file.toString()}));

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

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.io.File;
 import java.io.IOException;
 
@@ -102 +103 @@
 
     public String getDefaultStyle();
+
+    public boolean rename(File from, File to);
 }

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

@@ -3 +3 @@
 
 import java.awt.event.KeyEvent;
+import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
@@ -269 +270 @@
         return "javax.swing.plaf.metal.MetalLookAndFeel";
     }
+
+    @Override
+    public boolean rename(File from, File to)
+    {
+        return from.renameTo(to);
+    }
 }

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

@@ -3 +3 @@
 
 import java.awt.event.KeyEvent;
+import java.io.File;
 import java.io.IOException;
 
@@ -78 +79 @@
         return "javax.swing.plaf.metal.MetalLookAndFeel";
     }
+
+    @Override
+    public boolean rename(File from, File to)
+    {
+        return from.renameTo(to);
+    }
 }

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

@@ -5 +5 @@
 
 import java.awt.event.KeyEvent;
+import java.io.File;
 import java.io.IOException;
 
@@ -60 +61 @@
         return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
     }
+
+    @Override
+    public boolean rename(File from, File to)
+    {
+        if(to.exists())
+            to.delete();
+        return from.renameTo(to);
+    }
 }