Merge pull request #83 from cordje/master

Update Commons IO from 1.4 to 2.2
zeroturnaround · Oct 27, 2016 · 79bbae9 · 79bbae9
2 parents 6d4c99b + 7d3947f
commit 79bbae9
Show file tree

Hide file tree

Showing 9 changed files with 1,730 additions and 1,088 deletions.
diff --git a/NOTICE b/NOTICE
@@ -15,7 +15,7 @@ limitations under the License.
 This project includes:
 
 Apache Commons IO
-Copyright 2001-2008 The Apache Software Foundation
+Copyright 2002-2012 The Apache Software Foundation
 
 This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/src/main/java/org/zeroturnaround/zip/Zips.java b/src/main/java/org/zeroturnaround/zip/Zips.java
@@ -205,9 +205,9 @@ public Zips addFile(File file, boolean preserveRoot, FileFilter filter) {
         continue;
       }
       String entryPath = getRelativePath(file, entryFile);
-      if (File.separator.equals("\\")) {
+      if (File.separatorChar == IOUtils.DIR_SEPARATOR_WINDOWS) {
         // replace directory separators on windows as at least 7zip packs zip with entries having "/" like on linux
-        entryPath = entryPath.replace('\\', '/');
+        entryPath = entryPath.replace(IOUtils.DIR_SEPARATOR_WINDOWS, IOUtils.DIR_SEPARATOR_UNIX);
       }
       if (preserveRoot) {
         entryPath = file.getName() + entryPath;

diff --git a/src/main/java/org/zeroturnaround/zip/commons/FileExistsException.java b/src/main/java/org/zeroturnaround/zip/commons/FileExistsException.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.zeroturnaround.zip.commons;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Indicates that a file already exists.
+ * 
+ * @version $Id: FileExistsException.java 1304052 2012-03-22 20:55:29Z ggregory $
+ * @since 2.0
+ */
+public class FileExistsException extends IOException {
+
+    /**
+     * Defines the serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Default Constructor.
+     */
+    public FileExistsException() {
+        super();
+    }
+
+    /**
+     * Construct an instance with the specified message.
+     *
+     * @param message The error message
+     */
+    public FileExistsException(String message) {
+        super(message);
+    }
+
+    /**
+     * Construct an instance with the specified file.
+     *
+     * @param file The file that exists
+     */
+    public FileExistsException(File file) {
+        super("File " + file + " exists");
+    }
+}