diff --git a/src/main/com/ibm/icu/text/CharsetDetector.java b/src/main/com/ibm/icu/text/CharsetDetector.java
index 5cd1ce1fe..913a72435 100644
--- a/src/main/com/ibm/icu/text/CharsetDetector.java
+++ b/src/main/com/ibm/icu/text/CharsetDetector.java
@@ -1,4 +1,4 @@
-/**
+/*
 *******************************************************************************
 * Copyright (C) 2005-2013, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
diff --git a/src/main/com/ibm/icu/text/CharsetMatch.java b/src/main/com/ibm/icu/text/CharsetMatch.java
index 898403ad3..f0ac573ab 100644
--- a/src/main/com/ibm/icu/text/CharsetMatch.java
+++ b/src/main/com/ibm/icu/text/CharsetMatch.java
@@ -1,4 +1,4 @@
-/**
+/*
 *******************************************************************************
 * Copyright (C) 2005-2012, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
diff --git a/src/main/com/ibm/icu/text/CharsetRecog_UTF8.java b/src/main/com/ibm/icu/text/CharsetRecog_UTF8.java
index 735b667cc..fdd40e364 100644
--- a/src/main/com/ibm/icu/text/CharsetRecog_UTF8.java
+++ b/src/main/com/ibm/icu/text/CharsetRecog_UTF8.java
@@ -1,4 +1,4 @@
-/**
+/*
 *******************************************************************************
 * Copyright (C) 2005 - 2012, International Business Machines Corporation and  *
 * others. All Rights Reserved.                                                *
diff --git a/src/main/com/ibm/icu/text/CharsetRecognizer.java b/src/main/com/ibm/icu/text/CharsetRecognizer.java
index b3ae33ab1..9319bd5c8 100644
--- a/src/main/com/ibm/icu/text/CharsetRecognizer.java
+++ b/src/main/com/ibm/icu/text/CharsetRecognizer.java
@@ -1,4 +1,4 @@
-/**
+/*
 *******************************************************************************
 * Copyright (C) 2005-2012, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
diff --git a/src/main/com/mucommander/bookmark/BookmarkParser.java b/src/main/com/mucommander/bookmark/BookmarkParser.java
index 32a41b282..14d60dc2a 100644
--- a/src/main/com/mucommander/bookmark/BookmarkParser.java
+++ b/src/main/com/mucommander/bookmark/BookmarkParser.java
@@ -167,7 +167,7 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
         }
     }
 
-    private static final Logger getLogger() {
+    private static Logger getLogger() {
         if (logger == null) {
             logger = LoggerFactory.getLogger(BookmarkParser.class);
         }
diff --git a/src/main/com/mucommander/commons/conf/Configuration.java b/src/main/com/mucommander/commons/conf/Configuration.java
index 611606d2d..fe4d2978c 100644
--- a/src/main/com/mucommander/commons/conf/Configuration.java
+++ b/src/main/com/mucommander/commons/conf/Configuration.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.conf;
 
 import java.io.*;
diff --git a/src/main/com/mucommander/commons/file/AbstractArchiveEntryFile.java b/src/main/com/mucommander/commons/file/AbstractArchiveEntryFile.java
index e90697284..a7593da00 100644
--- a/src/main/com/mucommander/commons/file/AbstractArchiveEntryFile.java
+++ b/src/main/com/mucommander/commons/file/AbstractArchiveEntryFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -58,7 +58,7 @@
 public abstract class AbstractArchiveEntryFile extends AbstractFile {
 
     /** The archive file that contains this entry */
-    protected AbstractArchiveFile archiveFile;
+    AbstractArchiveFile archiveFile;
 
     /** This entry file's parent, can be the archive file itself if this entry is located at the top level */
     protected AbstractFile parent;
@@ -95,7 +95,7 @@ public ArchiveEntry getEntry() {
      *
      * @return the AbstractArchiveFile that contains the entry represented by this file
      */
-    public AbstractArchiveFile getArchiveFile() {
+    AbstractArchiveFile getArchiveFile() {
         return archiveFile;
     }
 
@@ -107,14 +107,15 @@ public AbstractArchiveFile getArchiveFile() {
      *
      * @return the relative path of this entry, with respect to the archive file.
      */
-    public String getRelativeEntryPath() {
+    private String getRelativeEntryPath() {
         String path = entry.getPath();
 
         // Replace all occurrences of the entry's separator by the archive file's separator, only if the separator is
         // not "/" (i.e. the entry path separator).
         String separator = getSeparator();
-        if(!separator.equals("/"))
+        if (!separator.equals("/")) {
             path = path.replace("/", separator);
+        }
 
         return path;
     }
@@ -146,17 +147,17 @@ public boolean isArchive() {
     }
 
     @Override
-    public AbstractFile[] ls() throws IOException, UnsupportedFileOperationException {
+    public AbstractFile[] ls() throws IOException {
         return archiveFile.ls(this, null, null);
     }
 
     @Override
-    public AbstractFile[] ls(FilenameFilter filter) throws IOException, UnsupportedFileOperationException {
+    public AbstractFile[] ls(FilenameFilter filter) throws IOException {
         return archiveFile.ls(this, filter, null);
     }
 	
     @Override
-    public AbstractFile[] ls(FileFilter filter) throws IOException, UnsupportedFileOperationException {
+    public AbstractFile[] ls(FileFilter filter) throws IOException {
         return archiveFile.ls(this, null, filter);
     }
 
@@ -187,7 +188,7 @@ public FilePermissions getPermissions() {
     }
 
     @Override
-    public void changePermission(int access, int permission, boolean enabled) throws IOException, UnsupportedFileOperationException {
+    public void changePermission(int access, int permission, boolean enabled) throws IOException {
         changePermissions(ByteUtils.setBit(getPermissions().getIntValue(), (permission << (access*3)), enabled));
     }
 
@@ -235,7 +236,7 @@ public boolean isSystem() {
      * {@link FileOperation#GET_FREE_SPACE} operations.
      */
     @Override
-    public long getFreeSpace() throws IOException, UnsupportedFileOperationException {
+    public long getFreeSpace() throws IOException {
         return archiveFile.getFreeSpace();
     }
 
@@ -247,7 +248,7 @@ public long getFreeSpace() throws IOException, UnsupportedFileOperationException
      * {@link FileOperation#GET_TOTAL_SPACE} operations.
      */
     @Override
-    public long getTotalSpace() throws IOException, UnsupportedFileOperationException {
+    public long getTotalSpace() throws IOException {
         return archiveFile.getTotalSpace();
     }
 
@@ -259,7 +260,7 @@ public long getTotalSpace() throws IOException, UnsupportedFileOperationExceptio
      * {@link FileOperation#READ_FILE} operations.
      */
     @Override
-    public InputStream getInputStream() throws IOException, UnsupportedFileOperationException {
+    public InputStream getInputStream() throws IOException {
         return archiveFile.getEntryInputStream(entry, null);
     }
 
diff --git a/src/main/com/mucommander/commons/file/AbstractArchiveFile.java b/src/main/com/mucommander/commons/file/AbstractArchiveFile.java
index 419b4da9d..48e80b6f7 100644
--- a/src/main/com/mucommander/commons/file/AbstractArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/AbstractArchiveFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/AbstractFile.java b/src/main/com/mucommander/commons/file/AbstractFile.java
index a8eb91a23..3986b30bc 100644
--- a/src/main/com/mucommander/commons/file/AbstractFile.java
+++ b/src/main/com/mucommander/commons/file/AbstractFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/AbstractFileClassLoader.java b/src/main/com/mucommander/commons/file/AbstractFileClassLoader.java
index afd3e7071..05dbbad84 100644
--- a/src/main/com/mucommander/commons/file/AbstractFileClassLoader.java
+++ b/src/main/com/mucommander/commons/file/AbstractFileClassLoader.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/AbstractROArchiveFile.java b/src/main/com/mucommander/commons/file/AbstractROArchiveFile.java
index 9d08a7c69..fc72f511c 100644
--- a/src/main/com/mucommander/commons/file/AbstractROArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/AbstractROArchiveFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/AbstractRWArchiveFile.java b/src/main/com/mucommander/commons/file/AbstractRWArchiveFile.java
index 2df34c423..a7d3cbbec 100644
--- a/src/main/com/mucommander/commons/file/AbstractRWArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/AbstractRWArchiveFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/ArchiveEntry.java b/src/main/com/mucommander/commons/file/ArchiveEntry.java
index ecd9a695f..9879335e9 100644
--- a/src/main/com/mucommander/commons/file/ArchiveEntry.java
+++ b/src/main/com/mucommander/commons/file/ArchiveEntry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -37,7 +37,7 @@ public class ArchiveEntry extends SimpleFileAttributes {
     private static final String SEPARATOR_STRING = String.valueOf(SEPARATOR_CHAR);
 
     /** Encapsulated entry object */
-    protected Object entryObject;
+    private Object entryObject;
 
     /** Caches the computed hashcode */
     private int hashCode;
@@ -84,7 +84,7 @@ public int getDepth() {
      * @param entryPath the path for which to calculate the depth
      * @return the depth of the given entry path
      */
-    public static int getDepth(String entryPath) {
+    static int getDepth(String entryPath) {
         return PathUtils.getDepth(entryPath, SEPARATOR_STRING);
     }
 
@@ -168,10 +168,8 @@ public void setPath(String path) {
      * @see PathUtils#pathEquals(String, String, String)
      */
     public boolean equals(Object o) {
-        if(!(o instanceof ArchiveEntry))
-            return false;
+        return o instanceof ArchiveEntry && PathUtils.pathEquals(getPath(), ((ArchiveEntry) o).getPath(), SEPARATOR_STRING);
 
-        return PathUtils.pathEquals(getPath(), ((ArchiveEntry)o).getPath(), SEPARATOR_STRING);
     }
 
     /**
diff --git a/src/main/com/mucommander/commons/file/ArchiveEntryIterator.java b/src/main/com/mucommander/commons/file/ArchiveEntryIterator.java
index ff60c89f2..14ebbab42 100644
--- a/src/main/com/mucommander/commons/file/ArchiveEntryIterator.java
+++ b/src/main/com/mucommander/commons/file/ArchiveEntryIterator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/ArchiveEntryTree.java b/src/main/com/mucommander/commons/file/ArchiveEntryTree.java
index 4775da673..b9d57847f 100644
--- a/src/main/com/mucommander/commons/file/ArchiveEntryTree.java
+++ b/src/main/com/mucommander/commons/file/ArchiveEntryTree.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -32,13 +32,13 @@
  *
  * @author Maxence Bernard
  */
-public class ArchiveEntryTree extends DefaultMutableTreeNode {
+class ArchiveEntryTree extends DefaultMutableTreeNode {
     private static Logger logger = LoggerFactory.getLogger(ArchiveEntryTree.class);
 
     /**
      * Creates a new empty tree.
      */
-    public ArchiveEntryTree() {
+    ArchiveEntryTree() {
     }
 
     /**
@@ -46,7 +46,7 @@ public ArchiveEntryTree() {
      *
      * @param entry the entry to add to the tree
      */
-    public void addArchiveEntry(ArchiveEntry entry) {
+    void addArchiveEntry(ArchiveEntry entry) {
         String entryPath = entry.getPath();
         int entryDepth = entry.getDepth();
         int slashPos = 0;
@@ -75,7 +75,7 @@ public void addArchiveEntry(ArchiveEntry entry) {
             }
 
             if (matchFound) {
-                if(d==entryDepth) {
+                if (d == entryDepth) {
                     getLogger().trace("Replacing entry for node "+childNode);
                     // Replace existing entry
                     childNode.setUserObject(entry);
@@ -85,12 +85,11 @@ public void addArchiveEntry(ArchiveEntry entry) {
                 }
             }
             else {
-                if(d==entryDepth) {
+                if (d == entryDepth) {
                     // create a leaf node for the entry
                     entry.setExists(true);      // the entry has to exist
                     node.add(new DefaultMutableTreeNode(entry, true));
-                }
-                else {
+                } else {
                     getLogger().trace("Creating node for "+subPath);
                     childNode = new DefaultMutableTreeNode(new ArchiveEntry(subPath, true, entry.getLastModifiedDate(), 0, true), true);
                     node.add(childNode);
@@ -112,7 +111,7 @@ public void addArchiveEntry(ArchiveEntry entry) {
      * @param entryPath the path to the entry to look up in this tree
      * @return the node that corresponds to the specified entry path
      */
-    public DefaultMutableTreeNode findEntryNode(String entryPath) {
+    DefaultMutableTreeNode findEntryNode(String entryPath) {
         int entryDepth = ArchiveEntry.getDepth(entryPath);
         int slashPos = 0;
         DefaultMutableTreeNode currentNode = this;
@@ -121,19 +120,20 @@ public DefaultMutableTreeNode findEntryNode(String entryPath) {
 
             int nbChildren = currentNode.getChildCount();
             DefaultMutableTreeNode matchNode = null;
-            for(int c=0; c<nbChildren; c++) {
+            for (int c=0; c<nbChildren; c++) {
                 DefaultMutableTreeNode childNode = (DefaultMutableTreeNode)currentNode.getChildAt(c);
 
                 // Path comparison is 'trailing slash insensitive'
-                if(PathUtils.pathEquals(((ArchiveEntry)childNode.getUserObject()).getPath(), subPath, "/")) {
+                if (PathUtils.pathEquals(((ArchiveEntry)childNode.getUserObject()).getPath(), subPath, "/")) {
                     // Found the node, let's return it
                     matchNode = childNode;
                     break;
                 }
             }
 
-            if(matchNode==null)
+            if (matchNode == null) {
                 return null;    // No node maching the provided path, return null
+            }
 
             currentNode = matchNode;
         }
diff --git a/src/main/com/mucommander/commons/file/ArchiveFormatProvider.java b/src/main/com/mucommander/commons/file/ArchiveFormatProvider.java
index 3f0d06313..ca2b201e0 100644
--- a/src/main/com/mucommander/commons/file/ArchiveFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/ArchiveFormatProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/AuthException.java b/src/main/com/mucommander/commons/file/AuthException.java
index 161b18b95..babb5efa7 100644
--- a/src/main/com/mucommander/commons/file/AuthException.java
+++ b/src/main/com/mucommander/commons/file/AuthException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/AuthenticationType.java b/src/main/com/mucommander/commons/file/AuthenticationType.java
index bc729a88f..28145f25c 100644
--- a/src/main/com/mucommander/commons/file/AuthenticationType.java
+++ b/src/main/com/mucommander/commons/file/AuthenticationType.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/Authenticator.java b/src/main/com/mucommander/commons/file/Authenticator.java
index f9c35f74a..b0ef26e5a 100644
--- a/src/main/com/mucommander/commons/file/Authenticator.java
+++ b/src/main/com/mucommander/commons/file/Authenticator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/Credentials.java b/src/main/com/mucommander/commons/file/Credentials.java
index 96b87e6d6..ee0346f45 100644
--- a/src/main/com/mucommander/commons/file/Credentials.java
+++ b/src/main/com/mucommander/commons/file/Credentials.java
@@ -1,23 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/DefaultPathCanonizer.java b/src/main/com/mucommander/commons/file/DefaultPathCanonizer.java
index 81aa9cb7e..68bf47668 100644
--- a/src/main/com/mucommander/commons/file/DefaultPathCanonizer.java
+++ b/src/main/com/mucommander/commons/file/DefaultPathCanonizer.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import java.util.Vector;
diff --git a/src/main/com/mucommander/commons/file/DefaultSchemeHandler.java b/src/main/com/mucommander/commons/file/DefaultSchemeHandler.java
index 873bffee2..2849bd4af 100644
--- a/src/main/com/mucommander/commons/file/DefaultSchemeHandler.java
+++ b/src/main/com/mucommander/commons/file/DefaultSchemeHandler.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/DummyFile.java b/src/main/com/mucommander/commons/file/DummyFile.java
index 3d8c002dc..0762f68c0 100644
--- a/src/main/com/mucommander/commons/file/DummyFile.java
+++ b/src/main/com/mucommander/commons/file/DummyFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import com.mucommander.commons.io.RandomAccessInputStream;
diff --git a/src/main/com/mucommander/commons/file/FileAttributes.java b/src/main/com/mucommander/commons/file/FileAttributes.java
index ca1d0bd5a..59ceee8a1 100644
--- a/src/main/com/mucommander/commons/file/FileAttributes.java
+++ b/src/main/com/mucommander/commons/file/FileAttributes.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/FileOperation.java b/src/main/com/mucommander/commons/file/FileOperation.java
index 62b7f9887..bbefd625c 100644
--- a/src/main/com/mucommander/commons/file/FileOperation.java
+++ b/src/main/com/mucommander/commons/file/FileOperation.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import org.slf4j.Logger;
diff --git a/src/main/com/mucommander/commons/file/FilePermissions.java b/src/main/com/mucommander/commons/file/FilePermissions.java
index 83b85adfc..45b5ad34b 100644
--- a/src/main/com/mucommander/commons/file/FilePermissions.java
+++ b/src/main/com/mucommander/commons/file/FilePermissions.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/FileProtocols.java b/src/main/com/mucommander/commons/file/FileProtocols.java
index 1ead15ba3..d9060aa34 100644
--- a/src/main/com/mucommander/commons/file/FileProtocols.java
+++ b/src/main/com/mucommander/commons/file/FileProtocols.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/FileURL.java b/src/main/com/mucommander/commons/file/FileURL.java
index b7ffcab83..619be7208 100644
--- a/src/main/com/mucommander/commons/file/FileURL.java
+++ b/src/main/com/mucommander/commons/file/FileURL.java
@@ -1,23 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
 package com.mucommander.commons.file;
 
 import com.mucommander.commons.file.compat.CompatURLStreamHandler;
diff --git a/src/main/com/mucommander/commons/file/GroupedPermissionBits.java b/src/main/com/mucommander/commons/file/GroupedPermissionBits.java
index 0307bf5fe..69303b4ea 100644
--- a/src/main/com/mucommander/commons/file/GroupedPermissionBits.java
+++ b/src/main/com/mucommander/commons/file/GroupedPermissionBits.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/IndividualPermissionBits.java b/src/main/com/mucommander/commons/file/IndividualPermissionBits.java
index 9d1a09a4e..1d057de96 100644
--- a/src/main/com/mucommander/commons/file/IndividualPermissionBits.java
+++ b/src/main/com/mucommander/commons/file/IndividualPermissionBits.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/MacOsSystemFolder.java b/src/main/com/mucommander/commons/file/MacOsSystemFolder.java
index c57c75dda..dc58dc40c 100644
--- a/src/main/com/mucommander/commons/file/MacOsSystemFolder.java
+++ b/src/main/com/mucommander/commons/file/MacOsSystemFolder.java
@@ -1,20 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 package com.mucommander.commons.file;
 
 
diff --git a/src/main/com/mucommander/commons/file/MimeTypes.java b/src/main/com/mucommander/commons/file/MimeTypes.java
index f211f35ec..586f9525f 100644
--- a/src/main/com/mucommander/commons/file/MimeTypes.java
+++ b/src/main/com/mucommander/commons/file/MimeTypes.java
@@ -1,23 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
 package com.mucommander.commons.file;
 
 import com.mucommander.commons.file.util.ResourceLoader;
diff --git a/src/main/com/mucommander/commons/file/MutableFileAttributes.java b/src/main/com/mucommander/commons/file/MutableFileAttributes.java
index 74ec26459..2b42179fd 100644
--- a/src/main/com/mucommander/commons/file/MutableFileAttributes.java
+++ b/src/main/com/mucommander/commons/file/MutableFileAttributes.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/PathCanonizer.java b/src/main/com/mucommander/commons/file/PathCanonizer.java
index baf42bf69..edca4c236 100644
--- a/src/main/com/mucommander/commons/file/PathCanonizer.java
+++ b/src/main/com/mucommander/commons/file/PathCanonizer.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/PermissionAccesses.java b/src/main/com/mucommander/commons/file/PermissionAccesses.java
index 88588197e..5595090e6 100644
--- a/src/main/com/mucommander/commons/file/PermissionAccesses.java
+++ b/src/main/com/mucommander/commons/file/PermissionAccesses.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/PermissionBits.java b/src/main/com/mucommander/commons/file/PermissionBits.java
index 0b7ec63a4..b5d70aa53 100644
--- a/src/main/com/mucommander/commons/file/PermissionBits.java
+++ b/src/main/com/mucommander/commons/file/PermissionBits.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/PermissionTypes.java b/src/main/com/mucommander/commons/file/PermissionTypes.java
index 4e006b27a..b8294792b 100644
--- a/src/main/com/mucommander/commons/file/PermissionTypes.java
+++ b/src/main/com/mucommander/commons/file/PermissionTypes.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/ProtocolFile.java b/src/main/com/mucommander/commons/file/ProtocolFile.java
index eeaadff9c..8044ac259 100644
--- a/src/main/com/mucommander/commons/file/ProtocolFile.java
+++ b/src/main/com/mucommander/commons/file/ProtocolFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/ProtocolProvider.java b/src/main/com/mucommander/commons/file/ProtocolProvider.java
index baf6d377e..155966d9c 100644
--- a/src/main/com/mucommander/commons/file/ProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/ProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/ROArchiveEntryFile.java b/src/main/com/mucommander/commons/file/ROArchiveEntryFile.java
index 31e079a36..5149d5d30 100644
--- a/src/main/com/mucommander/commons/file/ROArchiveEntryFile.java
+++ b/src/main/com/mucommander/commons/file/ROArchiveEntryFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import java.io.OutputStream;
diff --git a/src/main/com/mucommander/commons/file/RWArchiveEntryFile.java b/src/main/com/mucommander/commons/file/RWArchiveEntryFile.java
index daac34ca3..f51819b02 100644
--- a/src/main/com/mucommander/commons/file/RWArchiveEntryFile.java
+++ b/src/main/com/mucommander/commons/file/RWArchiveEntryFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import com.mucommander.commons.io.ByteCounter;
diff --git a/src/main/com/mucommander/commons/file/SchemeHandler.java b/src/main/com/mucommander/commons/file/SchemeHandler.java
index 42a3a0529..56ca812cd 100644
--- a/src/main/com/mucommander/commons/file/SchemeHandler.java
+++ b/src/main/com/mucommander/commons/file/SchemeHandler.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/SchemeParser.java b/src/main/com/mucommander/commons/file/SchemeParser.java
index 112ae984d..d452cc2a1 100644
--- a/src/main/com/mucommander/commons/file/SchemeParser.java
+++ b/src/main/com/mucommander/commons/file/SchemeParser.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import java.net.MalformedURLException;
diff --git a/src/main/com/mucommander/commons/file/SimpleFileAttributes.java b/src/main/com/mucommander/commons/file/SimpleFileAttributes.java
index f30e7da65..4f05c6018 100644
--- a/src/main/com/mucommander/commons/file/SimpleFileAttributes.java
+++ b/src/main/com/mucommander/commons/file/SimpleFileAttributes.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/SimpleFilePermissions.java b/src/main/com/mucommander/commons/file/SimpleFilePermissions.java
index 55ccfa89d..07b765a9f 100644
--- a/src/main/com/mucommander/commons/file/SimpleFilePermissions.java
+++ b/src/main/com/mucommander/commons/file/SimpleFilePermissions.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/SingleArchiveEntryIterator.java b/src/main/com/mucommander/commons/file/SingleArchiveEntryIterator.java
index 7732af285..5981f143a 100644
--- a/src/main/com/mucommander/commons/file/SingleArchiveEntryIterator.java
+++ b/src/main/com/mucommander/commons/file/SingleArchiveEntryIterator.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/SyncedFileAttributes.java b/src/main/com/mucommander/commons/file/SyncedFileAttributes.java
index ec008ab51..028534ea8 100644
--- a/src/main/com/mucommander/commons/file/SyncedFileAttributes.java
+++ b/src/main/com/mucommander/commons/file/SyncedFileAttributes.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/UnsupportedFileOperation.java b/src/main/com/mucommander/commons/file/UnsupportedFileOperation.java
index e887891d8..26e854bfb 100644
--- a/src/main/com/mucommander/commons/file/UnsupportedFileOperation.java
+++ b/src/main/com/mucommander/commons/file/UnsupportedFileOperation.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import java.lang.annotation.*;
diff --git a/src/main/com/mucommander/commons/file/UnsupportedFileOperationException.java b/src/main/com/mucommander/commons/file/UnsupportedFileOperationException.java
index a77ccf157..b3ddeec83 100644
--- a/src/main/com/mucommander/commons/file/UnsupportedFileOperationException.java
+++ b/src/main/com/mucommander/commons/file/UnsupportedFileOperationException.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/WrapperArchiveEntryIterator.java b/src/main/com/mucommander/commons/file/WrapperArchiveEntryIterator.java
index 23bb5c367..51b23d1df 100644
--- a/src/main/com/mucommander/commons/file/WrapperArchiveEntryIterator.java
+++ b/src/main/com/mucommander/commons/file/WrapperArchiveEntryIterator.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/archiver/Archiver.java b/src/main/com/mucommander/commons/file/archiver/Archiver.java
index 40550dcdf..2ccadf2a1 100644
--- a/src/main/com/mucommander/commons/file/archiver/Archiver.java
+++ b/src/main/com/mucommander/commons/file/archiver/Archiver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -55,7 +55,7 @@ public abstract class Archiver {
     /** Zip archive format (many entries format) */
     public final static int ZIP_FORMAT = 0;
     /** Gzip archive format (single entry format) */
-    public final static int GZ_FORMAT = 1;
+    private final static int GZ_FORMAT = 1;
     /** Bzip2 archive format (single entry format) */
     public final static int BZ2_FORMAT = 2;
     /** Tar archive format without any compression (many entries format) */
@@ -138,7 +138,7 @@ public abstract class Archiver {
     /** Archive format's name of this Archiver */
     protected String formatName;
     /** Support output stream for archiving files */
-    protected boolean supporStream;
+    boolean supportStream;
 	
     /**
      * Creates a new Archiver.
@@ -147,7 +147,7 @@ public abstract class Archiver {
      */
     Archiver(OutputStream out) {
         this.out = out;
-        this.supporStream = true;
+        this.supportStream = true;
     }
 
     /**
@@ -204,7 +204,7 @@ public boolean supportsComment() {
      * @return true if the archiver supports writing with streams
      */
     public boolean supportsStream() {
-        return supporStream;
+        return supportStream;
     }
 
     /**
@@ -233,7 +233,7 @@ public void setComment(String comment) {
 	  *
 	  * @return normalized path
      */
-    protected String normalizePath(String entryPath, boolean isDirectory) {
+    String normalizePath(String entryPath, boolean isDirectory) {
         // Replace any \ character by /
         entryPath = entryPath.replace('\\', '/');
 		
@@ -303,7 +303,7 @@ public static Archiver getArchiver(AbstractFile file, int format) throws IOExcep
      * null if the specified format is not valid.
      * @throws IOException if an error occurred while intializing the archiver
      */
-    public static Archiver getArchiver(OutputStream out, int format) throws IOException {
+    private static Archiver getArchiver(OutputStream out, int format) throws IOException {
         Archiver archiver;
 
         switch(format) {
@@ -345,7 +345,7 @@ public static Archiver getArchiver(OutputStream out, int format) throws IOExcept
      * @return a Bzip2 OutputStream
      * @throws IOException if an error occurred while initializing the Bzip2 OutputStream
      */
-    protected static OutputStream createBzip2OutputStream(OutputStream out) throws IOException {
+    private static OutputStream createBzip2OutputStream(OutputStream out) throws IOException {
         // Writes the 2 magic bytes 'BZ', as required by CBZip2OutputStream. A quote from CBZip2OutputStream's Javadoc:
         // "Attention: The caller is responsible to write the two BZip2 magic bytes "BZ" to the specified stream
         // prior to calling this constructor."
diff --git a/src/main/com/mucommander/commons/file/archiver/ISOArchiver.java b/src/main/com/mucommander/commons/file/archiver/ISOArchiver.java
index 1e36d8910..aabfd8f8c 100644
--- a/src/main/com/mucommander/commons/file/archiver/ISOArchiver.java
+++ b/src/main/com/mucommander/commons/file/archiver/ISOArchiver.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.archiver;
 
 import com.github.stephenc.javaisotools.eltorito.impl.ElToritoConfig;
@@ -58,7 +40,7 @@ public class ISOArchiver extends Archiver{
 
     public ISOArchiver(AbstractFile file) throws FileNotFoundException {
         super(null);
-        supporStream = false;
+        supportStream = false;
         
         config = new ISO9660Config();
         try {
diff --git a/src/main/com/mucommander/commons/file/archiver/SingleFileArchiver.java b/src/main/com/mucommander/commons/file/archiver/SingleFileArchiver.java
index f0f2099f4..60f95b1e7 100644
--- a/src/main/com/mucommander/commons/file/archiver/SingleFileArchiver.java
+++ b/src/main/com/mucommander/commons/file/archiver/SingleFileArchiver.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.archiver;
 
 import com.mucommander.commons.file.FileAttributes;
diff --git a/src/main/com/mucommander/commons/file/archiver/TarArchiver.java b/src/main/com/mucommander/commons/file/archiver/TarArchiver.java
index f429eb4e1..9aa568320 100644
--- a/src/main/com/mucommander/commons/file/archiver/TarArchiver.java
+++ b/src/main/com/mucommander/commons/file/archiver/TarArchiver.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.archiver;
 
 import com.mucommander.commons.file.FileAttributes;
diff --git a/src/main/com/mucommander/commons/file/archiver/ZipArchiver.java b/src/main/com/mucommander/commons/file/archiver/ZipArchiver.java
index 3a427dffb..e3be6ef5c 100644
--- a/src/main/com/mucommander/commons/file/archiver/ZipArchiver.java
+++ b/src/main/com/mucommander/commons/file/archiver/ZipArchiver.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.archiver;
 
 import com.mucommander.commons.file.FileAttributes;
diff --git a/src/main/com/mucommander/commons/file/compat/CompatURLConnection.java b/src/main/com/mucommander/commons/file/compat/CompatURLConnection.java
index 6dc58ed3b..6154a2870 100644
--- a/src/main/com/mucommander/commons/file/compat/CompatURLConnection.java
+++ b/src/main/com/mucommander/commons/file/compat/CompatURLConnection.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.compat;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/compat/CompatURLStreamHandler.java b/src/main/com/mucommander/commons/file/compat/CompatURLStreamHandler.java
index e417c2155..69cf828ff 100644
--- a/src/main/com/mucommander/commons/file/compat/CompatURLStreamHandler.java
+++ b/src/main/com/mucommander/commons/file/compat/CompatURLStreamHandler.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.compat;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/connection/ConnectionHandler.java b/src/main/com/mucommander/commons/file/connection/ConnectionHandler.java
index 5a81b4f0b..04ac0e597 100644
--- a/src/main/com/mucommander/commons/file/connection/ConnectionHandler.java
+++ b/src/main/com/mucommander/commons/file/connection/ConnectionHandler.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.connection;
 
 import com.mucommander.commons.file.AuthException;
diff --git a/src/main/com/mucommander/commons/file/connection/ConnectionHandlerFactory.java b/src/main/com/mucommander/commons/file/connection/ConnectionHandlerFactory.java
index fcb00290b..29caef1a1 100644
--- a/src/main/com/mucommander/commons/file/connection/ConnectionHandlerFactory.java
+++ b/src/main/com/mucommander/commons/file/connection/ConnectionHandlerFactory.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.connection;
 
 import com.mucommander.commons.file.FileURL;
diff --git a/src/main/com/mucommander/commons/file/connection/ConnectionPool.java b/src/main/com/mucommander/commons/file/connection/ConnectionPool.java
index c7caf46f0..047d7c3e7 100644
--- a/src/main/com/mucommander/commons/file/connection/ConnectionPool.java
+++ b/src/main/com/mucommander/commons/file/connection/ConnectionPool.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.connection;
 
 import java.io.InterruptedIOException;
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractContainsFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractContainsFilter.java
index 0a3303acc..a8673db4b 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractContainsFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractContainsFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractCriterionFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractCriterionFilter.java
index b258ba6b1..f482877c7 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractCriterionFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractCriterionFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractEndsWithFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractEndsWithFilter.java
index d767aae2d..4458e117d 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractEndsWithFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractEndsWithFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractEqualsFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractEqualsFilter.java
index c5a6ec5c2..bc598fcc7 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractEqualsFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractEqualsFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractExtensionFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractExtensionFilter.java
index 866654d48..4a10c1b80 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractExtensionFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractExtensionFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractFileFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractFileFilter.java
index e6f005086..808241ca3 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractFileFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractFileFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractFilenameFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractFilenameFilter.java
index 854a01c4e..f2f08179a 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractFilenameFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractFilenameFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractPathFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractPathFilter.java
index 6edb83c12..bf4b5280b 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractPathFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractPathFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractRegexpFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractRegexpFilter.java
index 3035296fc..176b78d8f 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractRegexpFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractRegexpFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractStartsWithFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractStartsWithFilter.java
index 1dd49e109..dc8af8187 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractStartsWithFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractStartsWithFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AbstractStringCriterionFilter.java b/src/main/com/mucommander/commons/file/filter/AbstractStringCriterionFilter.java
index 78131cc36..b55494801 100644
--- a/src/main/com/mucommander/commons/file/filter/AbstractStringCriterionFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AbstractStringCriterionFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AndFileFilter.java b/src/main/com/mucommander/commons/file/filter/AndFileFilter.java
index 04082f9f2..10fd0572a 100644
--- a/src/main/com/mucommander/commons/file/filter/AndFileFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AndFileFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/AttributeFileFilter.java b/src/main/com/mucommander/commons/file/filter/AttributeFileFilter.java
index ccfad63ae..b3f4155be 100644
--- a/src/main/com/mucommander/commons/file/filter/AttributeFileFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/AttributeFileFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/filter/ChainedFileFilter.java b/src/main/com/mucommander/commons/file/filter/ChainedFileFilter.java
index 4df799735..7c9a8b78d 100644
--- a/src/main/com/mucommander/commons/file/filter/ChainedFileFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/ChainedFileFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import java.util.ArrayList;
diff --git a/src/main/com/mucommander/commons/file/filter/ContainsFilenameFilter.java b/src/main/com/mucommander/commons/file/filter/ContainsFilenameFilter.java
index 7e6fecae2..5ecfc74e6 100644
--- a/src/main/com/mucommander/commons/file/filter/ContainsFilenameFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/ContainsFilenameFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/ContainsPathFilter.java b/src/main/com/mucommander/commons/file/filter/ContainsPathFilter.java
index b2da1c130..9c09189fb 100644
--- a/src/main/com/mucommander/commons/file/filter/ContainsPathFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/ContainsPathFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/CriterionFilter.java b/src/main/com/mucommander/commons/file/filter/CriterionFilter.java
index 80159efd1..ff0615adc 100644
--- a/src/main/com/mucommander/commons/file/filter/CriterionFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/CriterionFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/CriterionValueGenerator.java b/src/main/com/mucommander/commons/file/filter/CriterionValueGenerator.java
index 467914dc5..b75267a48 100644
--- a/src/main/com/mucommander/commons/file/filter/CriterionValueGenerator.java
+++ b/src/main/com/mucommander/commons/file/filter/CriterionValueGenerator.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/EndsWithFilenameFilter.java b/src/main/com/mucommander/commons/file/filter/EndsWithFilenameFilter.java
index 92e10158c..19a0a0310 100644
--- a/src/main/com/mucommander/commons/file/filter/EndsWithFilenameFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/EndsWithFilenameFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/EndsWithPathFilter.java b/src/main/com/mucommander/commons/file/filter/EndsWithPathFilter.java
index a9695fd2c..27bfda09d 100644
--- a/src/main/com/mucommander/commons/file/filter/EndsWithPathFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/EndsWithPathFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/EqualsFilenameFilter.java b/src/main/com/mucommander/commons/file/filter/EqualsFilenameFilter.java
index dde896143..e20c118f5 100644
--- a/src/main/com/mucommander/commons/file/filter/EqualsFilenameFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/EqualsFilenameFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/EqualsPathFilter.java b/src/main/com/mucommander/commons/file/filter/EqualsPathFilter.java
index bb16b9864..69735186a 100644
--- a/src/main/com/mucommander/commons/file/filter/EqualsPathFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/EqualsPathFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/ExtensionFilenameFilter.java b/src/main/com/mucommander/commons/file/filter/ExtensionFilenameFilter.java
index 9af440aac..ef2d64e9f 100644
--- a/src/main/com/mucommander/commons/file/filter/ExtensionFilenameFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/ExtensionFilenameFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/ExtensionPathFilter.java b/src/main/com/mucommander/commons/file/filter/ExtensionPathFilter.java
index f2f2e55de..9673f3ab9 100644
--- a/src/main/com/mucommander/commons/file/filter/ExtensionPathFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/ExtensionPathFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -46,7 +46,7 @@ public ExtensionPathFilter(String extension) {
      * @param caseSensitive if true, this PathFilter will be case-sensitive
      * @param inverted if true, this filter will operate in inverted mode.
      */
-    public ExtensionPathFilter(String extension, boolean caseSensitive, boolean inverted) {
+    private ExtensionPathFilter(String extension, boolean caseSensitive, boolean inverted) {
         this(new String[]{extension}, caseSensitive, inverted);
     }
 
diff --git a/src/main/com/mucommander/commons/file/filter/FileFilter.java b/src/main/com/mucommander/commons/file/filter/FileFilter.java
index 0efc15950..f465fdfe0 100644
--- a/src/main/com/mucommander/commons/file/filter/FileFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/FileFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/FileOperationFilter.java b/src/main/com/mucommander/commons/file/filter/FileOperationFilter.java
index c8328d153..c6b04611c 100644
--- a/src/main/com/mucommander/commons/file/filter/FileOperationFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/FileOperationFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/FilenameFilter.java b/src/main/com/mucommander/commons/file/filter/FilenameFilter.java
index 380af4815..0575f69f7 100644
--- a/src/main/com/mucommander/commons/file/filter/FilenameFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/FilenameFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/FilenameGenerator.java b/src/main/com/mucommander/commons/file/filter/FilenameGenerator.java
index 9c43380c8..a1edcb4f1 100644
--- a/src/main/com/mucommander/commons/file/filter/FilenameGenerator.java
+++ b/src/main/com/mucommander/commons/file/filter/FilenameGenerator.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/OrFileFilter.java b/src/main/com/mucommander/commons/file/filter/OrFileFilter.java
index 85c05f3ec..d7996963f 100644
--- a/src/main/com/mucommander/commons/file/filter/OrFileFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/OrFileFilter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/PassThroughFileFilter.java b/src/main/com/mucommander/commons/file/filter/PassThroughFileFilter.java
index 4e9a1ef9f..96403c812 100644
--- a/src/main/com/mucommander/commons/file/filter/PassThroughFileFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/PassThroughFileFilter.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/PathFilter.java b/src/main/com/mucommander/commons/file/filter/PathFilter.java
index 91b171ebd..e12f71389 100644
--- a/src/main/com/mucommander/commons/file/filter/PathFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/PathFilter.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/PathGenerator.java b/src/main/com/mucommander/commons/file/filter/PathGenerator.java
index 48caab1c5..d452d97a1 100644
--- a/src/main/com/mucommander/commons/file/filter/PathGenerator.java
+++ b/src/main/com/mucommander/commons/file/filter/PathGenerator.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.filter;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/filter/RegexpFilenameFilter.java b/src/main/com/mucommander/commons/file/filter/RegexpFilenameFilter.java
index 006369e57..467353ab3 100644
--- a/src/main/com/mucommander/commons/file/filter/RegexpFilenameFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/RegexpFilenameFilter.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.filter;
 
 import java.util.regex.PatternSyntaxException;
diff --git a/src/main/com/mucommander/commons/file/filter/RegexpPathFilter.java b/src/main/com/mucommander/commons/file/filter/RegexpPathFilter.java
index 49b9bbdbe..6fb1dbda2 100644
--- a/src/main/com/mucommander/commons/file/filter/RegexpPathFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/RegexpPathFilter.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.filter;
 
 import java.util.regex.PatternSyntaxException;
diff --git a/src/main/com/mucommander/commons/file/filter/StartsWithFilenameFilter.java b/src/main/com/mucommander/commons/file/filter/StartsWithFilenameFilter.java
index 2cf8980a2..cc1248d56 100644
--- a/src/main/com/mucommander/commons/file/filter/StartsWithFilenameFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/StartsWithFilenameFilter.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/StartsWithPathFilter.java b/src/main/com/mucommander/commons/file/filter/StartsWithPathFilter.java
index ec27c6133..35a170249 100644
--- a/src/main/com/mucommander/commons/file/filter/StartsWithPathFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/StartsWithPathFilter.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/filter/StringCriterionFilter.java b/src/main/com/mucommander/commons/file/filter/StringCriterionFilter.java
index c436ae35c..1a3fb001d 100644
--- a/src/main/com/mucommander/commons/file/filter/StringCriterionFilter.java
+++ b/src/main/com/mucommander/commons/file/filter/StringCriterionFilter.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.filter;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/icon/CacheableFileIconProvider.java b/src/main/com/mucommander/commons/file/icon/CacheableFileIconProvider.java
index 22f3e2b65..6382f04fe 100644
--- a/src/main/com/mucommander/commons/file/icon/CacheableFileIconProvider.java
+++ b/src/main/com/mucommander/commons/file/icon/CacheableFileIconProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.icon;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/icon/CachedFileIconProvider.java b/src/main/com/mucommander/commons/file/icon/CachedFileIconProvider.java
index 866888a40..7eed9469e 100644
--- a/src/main/com/mucommander/commons/file/icon/CachedFileIconProvider.java
+++ b/src/main/com/mucommander/commons/file/icon/CachedFileIconProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.icon;
 
 import com.mucommander.bookmark.Bookmark;
diff --git a/src/main/com/mucommander/commons/file/icon/FileIconProvider.java b/src/main/com/mucommander/commons/file/icon/FileIconProvider.java
index 054c44e75..c38a019de 100644
--- a/src/main/com/mucommander/commons/file/icon/FileIconProvider.java
+++ b/src/main/com/mucommander/commons/file/icon/FileIconProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.icon;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/icon/LocalFileIconProvider.java b/src/main/com/mucommander/commons/file/icon/LocalFileIconProvider.java
index 19b1f67a6..6327fed58 100644
--- a/src/main/com/mucommander/commons/file/icon/LocalFileIconProvider.java
+++ b/src/main/com/mucommander/commons/file/icon/LocalFileIconProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.icon;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/icon/impl/SwingFileIconProvider.java b/src/main/com/mucommander/commons/file/icon/impl/SwingFileIconProvider.java
index 6f1dc2101..c30b792f8 100644
--- a/src/main/com/mucommander/commons/file/icon/impl/SwingFileIconProvider.java
+++ b/src/main/com/mucommander/commons/file/icon/impl/SwingFileIconProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.icon.impl;
 
 import com.mucommander.commons.file.icon.CachedFileIconProvider;
diff --git a/src/main/com/mucommander/commons/file/impl/CachedFile.java b/src/main/com/mucommander/commons/file/impl/CachedFile.java
index cdb4eb5aa..8b807efd6 100644
--- a/src/main/com/mucommander/commons/file/impl/CachedFile.java
+++ b/src/main/com/mucommander/commons/file/impl/CachedFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/DebugFile.java b/src/main/com/mucommander/commons/file/impl/DebugFile.java
index a6c5bff00..9247929a1 100644
--- a/src/main/com/mucommander/commons/file/impl/DebugFile.java
+++ b/src/main/com/mucommander/commons/file/impl/DebugFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/ProxyFile.java b/src/main/com/mucommander/commons/file/impl/ProxyFile.java
index 359e3cbf2..97f1c6d0a 100644
--- a/src/main/com/mucommander/commons/file/impl/ProxyFile.java
+++ b/src/main/com/mucommander/commons/file/impl/ProxyFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/ar/ArArchiveEntryIterator.java b/src/main/com/mucommander/commons/file/impl/ar/ArArchiveEntryIterator.java
index 4c0ed1bd3..8d53f44ad 100644
--- a/src/main/com/mucommander/commons/file/impl/ar/ArArchiveEntryIterator.java
+++ b/src/main/com/mucommander/commons/file/impl/ar/ArArchiveEntryIterator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/impl/ar/ArArchiveFile.java b/src/main/com/mucommander/commons/file/impl/ar/ArArchiveFile.java
index 611b2c340..14c803b82 100644
--- a/src/main/com/mucommander/commons/file/impl/ar/ArArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/ar/ArArchiveFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/impl/ar/ArFormatProvider.java b/src/main/com/mucommander/commons/file/impl/ar/ArFormatProvider.java
index e60a09446..4765813c9 100644
--- a/src/main/com/mucommander/commons/file/impl/ar/ArFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/ar/ArFormatProvider.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/impl/bzip2/Bzip2ArchiveFile.java b/src/main/com/mucommander/commons/file/impl/bzip2/Bzip2ArchiveFile.java
index e861b4094..58d2e87f4 100644
--- a/src/main/com/mucommander/commons/file/impl/bzip2/Bzip2ArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/bzip2/Bzip2ArchiveFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.bzip2;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/bzip2/Bzip2FormatProvider.java b/src/main/com/mucommander/commons/file/impl/bzip2/Bzip2FormatProvider.java
index 8d48e429a..b26981b7e 100644
--- a/src/main/com/mucommander/commons/file/impl/bzip2/Bzip2FormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/bzip2/Bzip2FormatProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.bzip2;
 
 import com.mucommander.commons.file.AbstractArchiveFile;
diff --git a/src/main/com/mucommander/commons/file/impl/ftp/FTPFile.java b/src/main/com/mucommander/commons/file/impl/ftp/FTPFile.java
index 795fc9e72..09a83d17b 100644
--- a/src/main/com/mucommander/commons/file/impl/ftp/FTPFile.java
+++ b/src/main/com/mucommander/commons/file/impl/ftp/FTPFile.java
@@ -1,23 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
 package com.mucommander.commons.file.impl.ftp;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/ftp/FTPProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/ftp/FTPProtocolProvider.java
index 9eff01868..60b75ff74 100644
--- a/src/main/com/mucommander/commons/file/impl/ftp/FTPProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/ftp/FTPProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.ftp;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/gzip/GzipArchiveFile.java b/src/main/com/mucommander/commons/file/impl/gzip/GzipArchiveFile.java
index 3725c85ba..6af33e7ad 100644
--- a/src/main/com/mucommander/commons/file/impl/gzip/GzipArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/gzip/GzipArchiveFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.gzip;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/gzip/GzipFormatProvider.java b/src/main/com/mucommander/commons/file/impl/gzip/GzipFormatProvider.java
index 14961b0d4..afc846155 100644
--- a/src/main/com/mucommander/commons/file/impl/gzip/GzipFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/gzip/GzipFormatProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.gzip;
 
 import com.mucommander.commons.file.AbstractArchiveFile;
diff --git a/src/main/com/mucommander/commons/file/impl/hadoop/HDFSFile.java b/src/main/com/mucommander/commons/file/impl/hadoop/HDFSFile.java
index a0ad599c0..7cd371969 100644
--- a/src/main/com/mucommander/commons/file/impl/hadoop/HDFSFile.java
+++ b/src/main/com/mucommander/commons/file/impl/hadoop/HDFSFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.hadoop;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/hadoop/HDFSProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/hadoop/HDFSProtocolProvider.java
index 3bf52d3ad..ed6e5ffe8 100644
--- a/src/main/com/mucommander/commons/file/impl/hadoop/HDFSProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/hadoop/HDFSProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.hadoop;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/hadoop/HadoopFile.java b/src/main/com/mucommander/commons/file/impl/hadoop/HadoopFile.java
index f5ea4ffb8..c85ba1f8a 100644
--- a/src/main/com/mucommander/commons/file/impl/hadoop/HadoopFile.java
+++ b/src/main/com/mucommander/commons/file/impl/hadoop/HadoopFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.hadoop;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/hadoop/S3File.java b/src/main/com/mucommander/commons/file/impl/hadoop/S3File.java
index b2a1570f5..aaa2eb969 100644
--- a/src/main/com/mucommander/commons/file/impl/hadoop/S3File.java
+++ b/src/main/com/mucommander/commons/file/impl/hadoop/S3File.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.hadoop;
 
 import com.mucommander.commons.file.AuthException;
diff --git a/src/main/com/mucommander/commons/file/impl/hadoop/S3ProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/hadoop/S3ProtocolProvider.java
index a5cc734ec..57fd79bf1 100644
--- a/src/main/com/mucommander/commons/file/impl/hadoop/S3ProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/hadoop/S3ProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.hadoop;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/http/HTTPFile.java b/src/main/com/mucommander/commons/file/impl/http/HTTPFile.java
index f718ad232..f9baa8639 100644
--- a/src/main/com/mucommander/commons/file/impl/http/HTTPFile.java
+++ b/src/main/com/mucommander/commons/file/impl/http/HTTPFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.http;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/http/HTTPProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/http/HTTPProtocolProvider.java
index 553909eb6..3b9a56697 100644
--- a/src/main/com/mucommander/commons/file/impl/http/HTTPProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/http/HTTPProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.http;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/iso/IsoArchiveEntry.java b/src/main/com/mucommander/commons/file/impl/iso/IsoArchiveEntry.java
index ce890f01f..a825d67ce 100644
--- a/src/main/com/mucommander/commons/file/impl/iso/IsoArchiveEntry.java
+++ b/src/main/com/mucommander/commons/file/impl/iso/IsoArchiveEntry.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.iso;
 
 import com.mucommander.commons.file.ArchiveEntry;
diff --git a/src/main/com/mucommander/commons/file/impl/iso/IsoArchiveFile.java b/src/main/com/mucommander/commons/file/impl/iso/IsoArchiveFile.java
index 3add15e66..234c5a5c0 100644
--- a/src/main/com/mucommander/commons/file/impl/iso/IsoArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/iso/IsoArchiveFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.iso;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/iso/IsoEntryInputStream.java b/src/main/com/mucommander/commons/file/impl/iso/IsoEntryInputStream.java
index aa4ea5598..98d0ff280 100644
--- a/src/main/com/mucommander/commons/file/impl/iso/IsoEntryInputStream.java
+++ b/src/main/com/mucommander/commons/file/impl/iso/IsoEntryInputStream.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.iso;
 
 import com.mucommander.commons.io.RandomAccessInputStream;
diff --git a/src/main/com/mucommander/commons/file/impl/iso/IsoEntryIterator.java b/src/main/com/mucommander/commons/file/impl/iso/IsoEntryIterator.java
index 59fad8992..b493c6c34 100644
--- a/src/main/com/mucommander/commons/file/impl/iso/IsoEntryIterator.java
+++ b/src/main/com/mucommander/commons/file/impl/iso/IsoEntryIterator.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.iso;
 
 import com.mucommander.commons.file.ArchiveEntry;
diff --git a/src/main/com/mucommander/commons/file/impl/iso/IsoFormatProvider.java b/src/main/com/mucommander/commons/file/impl/iso/IsoFormatProvider.java
index bd5a5d7d2..3e25afcde 100644
--- a/src/main/com/mucommander/commons/file/impl/iso/IsoFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/iso/IsoFormatProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.iso;
 
 import com.mucommander.commons.file.AbstractArchiveFile;
diff --git a/src/main/com/mucommander/commons/file/impl/iso/IsoParser.java b/src/main/com/mucommander/commons/file/impl/iso/IsoParser.java
index 542b47660..6fe7a635c 100644
--- a/src/main/com/mucommander/commons/file/impl/iso/IsoParser.java
+++ b/src/main/com/mucommander/commons/file/impl/iso/IsoParser.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.iso;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/iso/IsoUtil.java b/src/main/com/mucommander/commons/file/impl/iso/IsoUtil.java
index 1147e30fc..4177ca1ce 100644
--- a/src/main/com/mucommander/commons/file/impl/iso/IsoUtil.java
+++ b/src/main/com/mucommander/commons/file/impl/iso/IsoUtil.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.iso;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/iso/NrgParser.java b/src/main/com/mucommander/commons/file/impl/iso/NrgParser.java
index 64fbbdca9..446d6565a 100644
--- a/src/main/com/mucommander/commons/file/impl/iso/NrgParser.java
+++ b/src/main/com/mucommander/commons/file/impl/iso/NrgParser.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.iso;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/local/LocalProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/local/LocalProtocolProvider.java
index 9a1b588aa..548d3a3fe 100644
--- a/src/main/com/mucommander/commons/file/impl/local/LocalProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/local/LocalProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.local;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/local/SpecialWindowsLocation.java b/src/main/com/mucommander/commons/file/impl/local/SpecialWindowsLocation.java
index 4e5c1a93e..86fcab8c0 100644
--- a/src/main/com/mucommander/commons/file/impl/local/SpecialWindowsLocation.java
+++ b/src/main/com/mucommander/commons/file/impl/local/SpecialWindowsLocation.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.local;
 
 import com.mucommander.commons.file.DummyFile;
diff --git a/src/main/com/mucommander/commons/file/impl/lst/LstArchiveEntry.java b/src/main/com/mucommander/commons/file/impl/lst/LstArchiveEntry.java
index d9168b184..75cc811c6 100644
--- a/src/main/com/mucommander/commons/file/impl/lst/LstArchiveEntry.java
+++ b/src/main/com/mucommander/commons/file/impl/lst/LstArchiveEntry.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.lst;
 
 import com.mucommander.commons.file.ArchiveEntry;
@@ -33,7 +15,7 @@ public class LstArchiveEntry extends ArchiveEntry {
      * by this entry */
     protected String baseFolder;
 
-    public LstArchiveEntry(String path, boolean directory, long date, long size, String baseFolder) {
+    LstArchiveEntry(String path, boolean directory, long date, long size, String baseFolder) {
         super(path, directory, date, size, true);
 
         this.baseFolder = baseFolder;
diff --git a/src/main/com/mucommander/commons/file/impl/lst/LstArchiveEntryIterator.java b/src/main/com/mucommander/commons/file/impl/lst/LstArchiveEntryIterator.java
index f18cc0fd6..e6369f604 100644
--- a/src/main/com/mucommander/commons/file/impl/lst/LstArchiveEntryIterator.java
+++ b/src/main/com/mucommander/commons/file/impl/lst/LstArchiveEntryIterator.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.lst;
 
 import com.mucommander.commons.file.ArchiveEntry;
diff --git a/src/main/com/mucommander/commons/file/impl/lst/LstArchiveFile.java b/src/main/com/mucommander/commons/file/impl/lst/LstArchiveFile.java
index 29a93d754..2c9357195 100644
--- a/src/main/com/mucommander/commons/file/impl/lst/LstArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/lst/LstArchiveFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -51,7 +51,7 @@
  */
 public class LstArchiveFile extends AbstractROArchiveFile {
     
-    public LstArchiveFile(AbstractFile file) {
+    LstArchiveFile(AbstractFile file) {
         super(file);
     }
 
@@ -61,12 +61,12 @@ public LstArchiveFile(AbstractFile file) {
     ////////////////////////////////////////
 
     @Override
-    public ArchiveEntryIterator getEntryIterator() throws IOException, UnsupportedFileOperationException {
+    public ArchiveEntryIterator getEntryIterator() throws IOException {
         return new LstArchiveEntryIterator(getInputStream());
     }
 
     @Override
-    public InputStream getEntryInputStream(ArchiveEntry entry, ArchiveEntryIterator entryIterator) throws IOException, UnsupportedFileOperationException {
+    public InputStream getEntryInputStream(ArchiveEntry entry, ArchiveEntryIterator entryIterator) throws IOException {
         // Will throw an IOException if the file designated by the entry doesn't exist 
         return FileFactory.getFile(((LstArchiveEntry)entry).getBaseFolder()+entry.getPath(), true).getInputStream();
     }
diff --git a/src/main/com/mucommander/commons/file/impl/lst/LstFormatProvider.java b/src/main/com/mucommander/commons/file/impl/lst/LstFormatProvider.java
index ae45a10cd..b2dd7ad76 100644
--- a/src/main/com/mucommander/commons/file/impl/lst/LstFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/lst/LstFormatProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.lst;
 
 import com.mucommander.commons.file.AbstractArchiveFile;
diff --git a/src/main/com/mucommander/commons/file/impl/nfs/NFSFile.java b/src/main/com/mucommander/commons/file/impl/nfs/NFSFile.java
index e6ec2d4fe..b54a88d88 100644
--- a/src/main/com/mucommander/commons/file/impl/nfs/NFSFile.java
+++ b/src/main/com/mucommander/commons/file/impl/nfs/NFSFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.nfs;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/nfs/NFSProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/nfs/NFSProtocolProvider.java
index 75fcc223e..aed87c954 100644
--- a/src/main/com/mucommander/commons/file/impl/nfs/NFSProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/nfs/NFSProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.nfs;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/rar/RarArchiveFile.java b/src/main/com/mucommander/commons/file/impl/rar/RarArchiveFile.java
index eae233edf..48a17a624 100644
--- a/src/main/com/mucommander/commons/file/impl/rar/RarArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/rar/RarArchiveFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.rar;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/impl/rar/RarFile.java b/src/main/com/mucommander/commons/file/impl/rar/RarFile.java
index 19707e29f..c715fb45f 100644
--- a/src/main/com/mucommander/commons/file/impl/rar/RarFile.java
+++ b/src/main/com/mucommander/commons/file/impl/rar/RarFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -38,7 +38,7 @@ public class RarFile {
     private Archive archive;
     private AbstractFile file;
 
-    public RarFile(AbstractFile file) throws IOException, UnsupportedFileOperationException, RarException {
+    RarFile(AbstractFile file) throws IOException, RarException {
         this.file = file;
         try (InputStream fileIn = file.getInputStream()) {
             archive = new Archive(new File(file.getPath()));
diff --git a/src/main/com/mucommander/commons/file/impl/rar/RarFormatProvider.java b/src/main/com/mucommander/commons/file/impl/rar/RarFormatProvider.java
index 78dbbb0a4..e91ec3be7 100644
--- a/src/main/com/mucommander/commons/file/impl/rar/RarFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/rar/RarFormatProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.rar;
 
 import com.mucommander.commons.file.AbstractArchiveFile;
diff --git a/src/main/com/mucommander/commons/file/impl/s3/S3Bucket.java b/src/main/com/mucommander/commons/file/impl/s3/S3Bucket.java
index 166d2ae2a..1ee45d899 100644
--- a/src/main/com/mucommander/commons/file/impl/s3/S3Bucket.java
+++ b/src/main/com/mucommander/commons/file/impl/s3/S3Bucket.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.s3;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/s3/S3File.java b/src/main/com/mucommander/commons/file/impl/s3/S3File.java
index 4295070f0..4828728eb 100644
--- a/src/main/com/mucommander/commons/file/impl/s3/S3File.java
+++ b/src/main/com/mucommander/commons/file/impl/s3/S3File.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.s3;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/s3/S3Object.java b/src/main/com/mucommander/commons/file/impl/s3/S3Object.java
index ab4b795ed..269cb0bd8 100644
--- a/src/main/com/mucommander/commons/file/impl/s3/S3Object.java
+++ b/src/main/com/mucommander/commons/file/impl/s3/S3Object.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.s3;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/s3/S3ProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/s3/S3ProtocolProvider.java
index 8187e8eac..267f9a9fa 100644
--- a/src/main/com/mucommander/commons/file/impl/s3/S3ProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/s3/S3ProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.s3;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/s3/S3Root.java b/src/main/com/mucommander/commons/file/impl/s3/S3Root.java
index dafb4e38d..e74615a8d 100644
--- a/src/main/com/mucommander/commons/file/impl/s3/S3Root.java
+++ b/src/main/com/mucommander/commons/file/impl/s3/S3Root.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.s3;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/sevenzip/MuRandomAccessFile.java b/src/main/com/mucommander/commons/file/impl/sevenzip/MuRandomAccessFile.java
index 3c13c6768..2793ef4c9 100644
--- a/src/main/com/mucommander/commons/file/impl/sevenzip/MuRandomAccessFile.java
+++ b/src/main/com/mucommander/commons/file/impl/sevenzip/MuRandomAccessFile.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.sevenzip;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/impl/sevenzip/OldSevenZipArchiveFile.java b/src/main/com/mucommander/commons/file/impl/sevenzip/OldSevenZipArchiveFile.java
index a56b83599..7d3dbed83 100644
--- a/src/main/com/mucommander/commons/file/impl/sevenzip/OldSevenZipArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/sevenzip/OldSevenZipArchiveFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -30,7 +30,6 @@
 import com.mucommander.commons.file.AbstractROArchiveFile;
 import com.mucommander.commons.file.ArchiveEntry;
 import com.mucommander.commons.file.ArchiveEntryIterator;
-import com.mucommander.commons.file.UnsupportedFileOperationException;
 import com.mucommander.commons.file.WrapperArchiveEntryIterator;
 import com.mucommander.commons.file.impl.sevenzip.provider.SevenZip.Archive.IInArchive;
 import com.mucommander.commons.file.impl.sevenzip.provider.SevenZip.Archive.SevenZipEntry;
@@ -80,7 +79,7 @@ private ArchiveEntry createArchiveEntry(SevenZipEntry entry) {
     //////////////////////////////////////////
 
     @Override
-    public InputStream getEntryInputStream(final ArchiveEntry entry, ArchiveEntryIterator entryIterator) throws IOException, UnsupportedFileOperationException {
+    public InputStream getEntryInputStream(final ArchiveEntry entry, ArchiveEntryIterator entryIterator) throws IOException {
 		final IInArchive sevenZipFile = openSevenZipFile();
 		
 /*		ByteArrayOutputStream os = new ByteArrayOutputStream(1024);
diff --git a/src/main/com/mucommander/commons/file/impl/sevenzip/SevenZipFormatProvider.java b/src/main/com/mucommander/commons/file/impl/sevenzip/SevenZipFormatProvider.java
index 5e46856d2..2c53b571f 100644
--- a/src/main/com/mucommander/commons/file/impl/sevenzip/SevenZipFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/sevenzip/SevenZipFormatProvider.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.sevenzip;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandler.java b/src/main/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandler.java
index 814e224ac..ad7ede358 100644
--- a/src/main/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandler.java
+++ b/src/main/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandler.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.sftp;
 
 import com.mucommander.commons.file.AuthException;
@@ -108,9 +89,6 @@ public void startConnection() throws IOException {
                 return true;
             };
 
-            /**
-             * Set our preferred public key type
-             */
             con.getContext().setHostKeyVerification(hkv);
             con.getContext().setPreferredPublicKey(Ssh2Context.PUBLIC_KEY_SSHDSS);
 
diff --git a/src/main/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandlerFactory.java b/src/main/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandlerFactory.java
index 6dc1e1dd6..d719b010e 100644
--- a/src/main/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandlerFactory.java
+++ b/src/main/com/mucommander/commons/file/impl/sftp/SFTPConnectionHandlerFactory.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.sftp;
 
 import com.mucommander.commons.file.FileURL;
diff --git a/src/main/com/mucommander/commons/file/impl/sftp/SFTPProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/sftp/SFTPProtocolProvider.java
index c28835dff..77645fe71 100644
--- a/src/main/com/mucommander/commons/file/impl/sftp/SFTPProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/sftp/SFTPProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.sftp;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/smb/SMBFile.java b/src/main/com/mucommander/commons/file/impl/smb/SMBFile.java
index 06a0f70aa..b7a1f4fe4 100644
--- a/src/main/com/mucommander/commons/file/impl/smb/SMBFile.java
+++ b/src/main/com/mucommander/commons/file/impl/smb/SMBFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.smb;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/smb/SMBProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/smb/SMBProtocolProvider.java
index a54921058..c4410c2c1 100644
--- a/src/main/com/mucommander/commons/file/impl/smb/SMBProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/smb/SMBProtocolProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.smb;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/tar/TarArchiveFile.java b/src/main/com/mucommander/commons/file/impl/tar/TarArchiveFile.java
index cc9f7f67a..7c963e34b 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/TarArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/TarArchiveFile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/main/com/mucommander/commons/file/impl/tar/TarEntryIterator.java b/src/main/com/mucommander/commons/file/impl/tar/TarEntryIterator.java
index 37a8ab335..29a68ee17 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/TarEntryIterator.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/TarEntryIterator.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.tar;
 
 import com.mucommander.commons.file.ArchiveEntry;
diff --git a/src/main/com/mucommander/commons/file/impl/tar/TarFormatProvider.java b/src/main/com/mucommander/commons/file/impl/tar/TarFormatProvider.java
index 77627357b..5e6a081f9 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/TarFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/TarFormatProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.tar;
 
 import com.mucommander.commons.file.AbstractArchiveFile;
diff --git a/src/main/com/mucommander/commons/file/impl/tar/provider/TarBuffer.java b/src/main/com/mucommander/commons/file/impl/tar/provider/TarBuffer.java
index cd40d9a22..f3d8f7e5f 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/provider/TarBuffer.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/provider/TarBuffer.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.tar.provider;
 
 import com.mucommander.commons.io.BufferPool;
diff --git a/src/main/com/mucommander/commons/file/impl/tar/provider/TarConstants.java b/src/main/com/mucommander/commons/file/impl/tar/provider/TarConstants.java
index 99be823a6..7e999cdf4 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/provider/TarConstants.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/provider/TarConstants.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.tar.provider;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/impl/tar/provider/TarEntry.java b/src/main/com/mucommander/commons/file/impl/tar/provider/TarEntry.java
index c34b6b282..a6bfe0531 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/provider/TarEntry.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/provider/TarEntry.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.tar.provider;
 
 import java.util.Date;
diff --git a/src/main/com/mucommander/commons/file/impl/tar/provider/TarInputStream.java b/src/main/com/mucommander/commons/file/impl/tar/provider/TarInputStream.java
index b7e3b60c9..bafe8df8a 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/provider/TarInputStream.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/provider/TarInputStream.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.tar.provider;
 
 import com.mucommander.commons.io.BufferPool;
diff --git a/src/main/com/mucommander/commons/file/impl/tar/provider/TarOutputStream.java b/src/main/com/mucommander/commons/file/impl/tar/provider/TarOutputStream.java
index e305b3797..76ddfb55a 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/provider/TarOutputStream.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/provider/TarOutputStream.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.tar.provider;
 
 import com.mucommander.commons.io.BufferPool;
diff --git a/src/main/com/mucommander/commons/file/impl/tar/provider/TarUtils.java b/src/main/com/mucommander/commons/file/impl/tar/provider/TarUtils.java
index 3442b9a7c..e69b04b91 100644
--- a/src/main/com/mucommander/commons/file/impl/tar/provider/TarUtils.java
+++ b/src/main/com/mucommander/commons/file/impl/tar/provider/TarUtils.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.tar.provider;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/impl/vsphere/ManagedObjectReferenceWrapper.java b/src/main/com/mucommander/commons/file/impl/vsphere/ManagedObjectReferenceWrapper.java
index df24711ba..6c99a8989 100644
--- a/src/main/com/mucommander/commons/file/impl/vsphere/ManagedObjectReferenceWrapper.java
+++ b/src/main/com/mucommander/commons/file/impl/vsphere/ManagedObjectReferenceWrapper.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.vsphere;
 
 import com.vmware.vim25.ManagedObjectReference;
diff --git a/src/main/com/mucommander/commons/file/impl/vsphere/VSphereClient.java b/src/main/com/mucommander/commons/file/impl/vsphere/VSphereClient.java
index 2fdb035e5..f3f9c8995 100644
--- a/src/main/com/mucommander/commons/file/impl/vsphere/VSphereClient.java
+++ b/src/main/com/mucommander/commons/file/impl/vsphere/VSphereClient.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.vsphere;
 
 import java.io.Closeable;
diff --git a/src/main/com/mucommander/commons/file/impl/vsphere/VSphereFile.java b/src/main/com/mucommander/commons/file/impl/vsphere/VSphereFile.java
index 5da8c5c6e..b6cd476cd 100644
--- a/src/main/com/mucommander/commons/file/impl/vsphere/VSphereFile.java
+++ b/src/main/com/mucommander/commons/file/impl/vsphere/VSphereFile.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.vsphere;
 
 import java.io.File;
diff --git a/src/main/com/mucommander/commons/file/impl/vsphere/VSphereProtocolProvider.java b/src/main/com/mucommander/commons/file/impl/vsphere/VSphereProtocolProvider.java
index f03acebb8..73218c41d 100644
--- a/src/main/com/mucommander/commons/file/impl/vsphere/VSphereProtocolProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/vsphere/VSphereProtocolProvider.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.vsphere;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/impl/vsphere/VsphereConnHandler.java b/src/main/com/mucommander/commons/file/impl/vsphere/VsphereConnHandler.java
index a6c9acb86..cee51993a 100644
--- a/src/main/com/mucommander/commons/file/impl/vsphere/VsphereConnHandler.java
+++ b/src/main/com/mucommander/commons/file/impl/vsphere/VsphereConnHandler.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.vsphere;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/impl/zip/JavaUtilZipEntryIterator.java b/src/main/com/mucommander/commons/file/impl/zip/JavaUtilZipEntryIterator.java
index 87d538388..50b760da9 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/JavaUtilZipEntryIterator.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/JavaUtilZipEntryIterator.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip;
 
 import com.mucommander.commons.file.ArchiveEntry;
diff --git a/src/main/com/mucommander/commons/file/impl/zip/ZipArchiveFile.java b/src/main/com/mucommander/commons/file/impl/zip/ZipArchiveFile.java
index c4e654ce4..eb206fe07 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/ZipArchiveFile.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/ZipArchiveFile.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip;
 
 import com.mucommander.commons.file.*;
diff --git a/src/main/com/mucommander/commons/file/impl/zip/ZipFormatProvider.java b/src/main/com/mucommander/commons/file/impl/zip/ZipFormatProvider.java
index 613676bb1..d5b5ddb96 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/ZipFormatProvider.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/ZipFormatProvider.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip;
 
 import com.mucommander.commons.file.AbstractArchiveFile;
diff --git a/src/main/com/mucommander/commons/file/impl/zip/provider/DeflatedOutputStream.java b/src/main/com/mucommander/commons/file/impl/zip/provider/DeflatedOutputStream.java
index 5ed0cc14f..30011a9f5 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/provider/DeflatedOutputStream.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/provider/DeflatedOutputStream.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip.provider;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/impl/zip/provider/StoredOutputStream.java b/src/main/com/mucommander/commons/file/impl/zip/provider/StoredOutputStream.java
index 220c9a749..e2fac8304 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/provider/StoredOutputStream.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/provider/StoredOutputStream.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip.provider;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/impl/zip/provider/ZipBuffer.java b/src/main/com/mucommander/commons/file/impl/zip/provider/ZipBuffer.java
index 52d3aec5d..a8038266b 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/provider/ZipBuffer.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/provider/ZipBuffer.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip.provider;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/impl/zip/provider/ZipConstants.java b/src/main/com/mucommander/commons/file/impl/zip/provider/ZipConstants.java
index dc6b95039..deafa38f9 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/provider/ZipConstants.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/provider/ZipConstants.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip.provider;
 
 import java.util.zip.Deflater;
diff --git a/src/main/com/mucommander/commons/file/impl/zip/provider/ZipEntryInfo.java b/src/main/com/mucommander/commons/file/impl/zip/provider/ZipEntryInfo.java
index 570f19794..19863470f 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/provider/ZipEntryInfo.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/provider/ZipEntryInfo.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip.provider;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/impl/zip/provider/ZipEntryOutputStream.java b/src/main/com/mucommander/commons/file/impl/zip/provider/ZipEntryOutputStream.java
index 4c810a1a2..1951aeae8 100644
--- a/src/main/com/mucommander/commons/file/impl/zip/provider/ZipEntryOutputStream.java
+++ b/src/main/com/mucommander/commons/file/impl/zip/provider/ZipEntryOutputStream.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.impl.zip.provider;
 
 import java.io.IOException;
diff --git a/src/main/com/mucommander/commons/file/util/C.java b/src/main/com/mucommander/commons/file/util/C.java
index f28d52369..512d9794f 100644
--- a/src/main/com/mucommander/commons/file/util/C.java
+++ b/src/main/com/mucommander/commons/file/util/C.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.sun.jna.Native;
diff --git a/src/main/com/mucommander/commons/file/util/CLibrary.java b/src/main/com/mucommander/commons/file/util/CLibrary.java
index 84f1f023c..84258ee4d 100644
--- a/src/main/com/mucommander/commons/file/util/CLibrary.java
+++ b/src/main/com/mucommander/commons/file/util/CLibrary.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.sun.jna.Library;
diff --git a/src/main/com/mucommander/commons/file/util/Chmod.java b/src/main/com/mucommander/commons/file/util/Chmod.java
index 14c807aa5..d77fdbf20 100644
--- a/src/main/com/mucommander/commons/file/util/Chmod.java
+++ b/src/main/com/mucommander/commons/file/util/Chmod.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/util/FileChangeListener.java b/src/main/com/mucommander/commons/file/util/FileChangeListener.java
index 586ed3ce8..92bdde80a 100644
--- a/src/main/com/mucommander/commons/file/util/FileChangeListener.java
+++ b/src/main/com/mucommander/commons/file/util/FileChangeListener.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/util/FileComparator.java b/src/main/com/mucommander/commons/file/util/FileComparator.java
index cf671ebd3..34f0e7ca4 100644
--- a/src/main/com/mucommander/commons/file/util/FileComparator.java
+++ b/src/main/com/mucommander/commons/file/util/FileComparator.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/util/FileMonitor.java b/src/main/com/mucommander/commons/file/util/FileMonitor.java
index b288c4d2e..1e8472cdb 100644
--- a/src/main/com/mucommander/commons/file/util/FileMonitor.java
+++ b/src/main/com/mucommander/commons/file/util/FileMonitor.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/util/FileMonitorConstants.java b/src/main/com/mucommander/commons/file/util/FileMonitorConstants.java
index 420bdcbd5..1dd066f16 100644
--- a/src/main/com/mucommander/commons/file/util/FileMonitorConstants.java
+++ b/src/main/com/mucommander/commons/file/util/FileMonitorConstants.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 /**
diff --git a/src/main/com/mucommander/commons/file/util/FilePool.java b/src/main/com/mucommander/commons/file/util/FilePool.java
index f73ce160f..bbffd9678 100644
--- a/src/main/com/mucommander/commons/file/util/FilePool.java
+++ b/src/main/com/mucommander/commons/file/util/FilePool.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/util/FileSet.java b/src/main/com/mucommander/commons/file/util/FileSet.java
index 2b3ce959e..84fda7616 100644
--- a/src/main/com/mucommander/commons/file/util/FileSet.java
+++ b/src/main/com/mucommander/commons/file/util/FileSet.java
@@ -1,23 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/main/com/mucommander/commons/file/util/Kernel32.java b/src/main/com/mucommander/commons/file/util/Kernel32.java
index c3a78de80..f7cf981be 100644
--- a/src/main/com/mucommander/commons/file/util/Kernel32.java
+++ b/src/main/com/mucommander/commons/file/util/Kernel32.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.runtime.OsFamily;
diff --git a/src/main/com/mucommander/commons/file/util/Kernel32API.java b/src/main/com/mucommander/commons/file/util/Kernel32API.java
index 1aeda3476..5833262fe 100644
--- a/src/main/com/mucommander/commons/file/util/Kernel32API.java
+++ b/src/main/com/mucommander/commons/file/util/Kernel32API.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.sun.jna.Structure;
diff --git a/src/main/com/mucommander/commons/file/util/PathTokenizer.java b/src/main/com/mucommander/commons/file/util/PathTokenizer.java
index 4673ff54e..c47877e99 100644
--- a/src/main/com/mucommander/commons/file/util/PathTokenizer.java
+++ b/src/main/com/mucommander/commons/file/util/PathTokenizer.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import java.util.Enumeration;
diff --git a/src/main/com/mucommander/commons/file/util/ResourceLoader.java b/src/main/com/mucommander/commons/file/util/ResourceLoader.java
index 63d021c96..d1d0ccacd 100644
--- a/src/main/com/mucommander/commons/file/util/ResourceLoader.java
+++ b/src/main/com/mucommander/commons/file/util/ResourceLoader.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractArchiveFile;
diff --git a/src/main/com/mucommander/commons/file/util/Shell32.java b/src/main/com/mucommander/commons/file/util/Shell32.java
index 4e60bb55c..9f267d641 100644
--- a/src/main/com/mucommander/commons/file/util/Shell32.java
+++ b/src/main/com/mucommander/commons/file/util/Shell32.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.runtime.OsFamily;
diff --git a/src/main/com/mucommander/commons/file/util/Shell32API.java b/src/main/com/mucommander/commons/file/util/Shell32API.java
index ce7bfd344..b8f3215ed 100644
--- a/src/main/com/mucommander/commons/file/util/Shell32API.java
+++ b/src/main/com/mucommander/commons/file/util/Shell32API.java
@@ -1,22 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.runtime.JavaVersion;
diff --git a/src/main/com/mucommander/commons/io/BinaryDetector.java b/src/main/com/mucommander/commons/io/BinaryDetector.java
index 24eaf17bd..324581786 100644
--- a/src/main/com/mucommander/commons/io/BinaryDetector.java
+++ b/src/main/com/mucommander/commons/io/BinaryDetector.java
@@ -42,7 +42,7 @@ public class BinaryDetector {
 
     /** Provides an indication as to the number of bytes that should fed to the detector for it to have enough
      * confidence. */
-    public final static int RECOMMENDED_BYTE_SIZE = 1024*16;
+    private final static int RECOMMENDED_BYTE_SIZE = 1024*16;
 
 
     /**
@@ -65,7 +65,7 @@ public static boolean guessBinary(byte b[]) {
      * @param len specifies where to stop reading the array
      * @return true if BinaryDetector thinks that the specified data is binary
      */
-    public static boolean guessBinary(byte b[], int off, int len) {
+    private static boolean guessBinary(byte b[], int off, int len) {
         // binary .torrent files etc. doesn't contains any 0x0A, 0x0D or 0x00 bytes
         int x0Acnt = 0;
         int x0Dcnt = 0;
diff --git a/src/main/com/mucommander/commons/runtime/JavaVersion.java b/src/main/com/mucommander/commons/runtime/JavaVersion.java
index 967997439..5f7242609 100644
--- a/src/main/com/mucommander/commons/runtime/JavaVersion.java
+++ b/src/main/com/mucommander/commons/runtime/JavaVersion.java
@@ -62,11 +62,6 @@ public enum JavaVersion implements ComparableRuntimeProperty {
     /** The String representation of this RuntimeProperty, set at creation time */
     protected final String stringRepresentation;
 
-    /**
-     * Determines the current value by parsing the corresponding system property. This method is called automatically
-     * by this class the first time the current value is accessed. However, this method has been made public to allow
-     * to force the initialization if it needs to happen at a predictable time.
-     */
     static {
     	currentValue = parseSystemProperty(getRawSystemProperty());
     	currentArchitecture = System.getProperty("os.arch");
diff --git a/src/main/com/mucommander/commons/runtime/OsVersion.java b/src/main/com/mucommander/commons/runtime/OsVersion.java
index b6ab8a20d..c116a4fed 100644
--- a/src/main/com/mucommander/commons/runtime/OsVersion.java
+++ b/src/main/com/mucommander/commons/runtime/OsVersion.java
@@ -124,11 +124,6 @@ public enum OsVersion implements ComparableRuntimeProperty {
     /** Holds the OsVersion of the current runtime environment  */
     private static OsVersion currentValue;
 
-    /**
-     * Determines the current value by parsing the corresponding system property. This method is called automatically
-     * by this class the first time the current value is accessed. However, this method has been made public to allow
-     * to force the initialization if it needs to happen at a predictable time.
-     */
     static {
     	currentValue = parseSystemProperty(getRawSystemProperty(), OsFamily.getRawSystemProperty(), OsFamily.getCurrent());
     	LOGGER.info("Current OS version: {}", currentValue);
diff --git a/src/main/com/mucommander/core/LocationChanger.java b/src/main/com/mucommander/core/LocationChanger.java
index e763adb8f..8735de8cb 100644
--- a/src/main/com/mucommander/core/LocationChanger.java
+++ b/src/main/com/mucommander/core/LocationChanger.java
@@ -972,10 +972,7 @@ public String toString() {
 	}
 	
 	/* TODO branch         
-	*//**
-	 * Reads all files in the current directory and all its subdirectories.
-	 * @param parent
-	 *//*
+	*//*
 	private void readBranch(AbstractFile parent) {
 		AbstractFile[] children;
 		try {
diff --git a/src/main/com/mucommander/core/NullableFile.java b/src/main/com/mucommander/core/NullableFile.java
index dc50967fb..ef675048a 100644
--- a/src/main/com/mucommander/core/NullableFile.java
+++ b/src/main/com/mucommander/core/NullableFile.java
@@ -32,13 +32,12 @@ public boolean canGetOwner() {
 	}
 
 	@Override
-	public void setLastModifiedDate(long arg0) throws IOException, UnsupportedFileOperationException {
+	public void setLastModifiedDate(long arg0) throws IOException {
 		throw new UnsupportedFileOperationException(FileOperation.CHANGE_DATE);
 	}
 
 	@Override
-	public void changePermission(int arg0, int arg1, boolean arg2)
-			throws IOException, UnsupportedFileOperationException {
+	public void changePermission(int arg0, int arg1, boolean arg2) throws IOException {
 		throw new UnsupportedFileOperationException(FileOperation.CHANGE_PERMISSION);
 	}
 
@@ -73,7 +72,7 @@ public long getLastModifiedDate() {
 	}
 
 	@Override
-	public long getFreeSpace() throws IOException, UnsupportedFileOperationException {
+	public long getFreeSpace() throws IOException {
 		throw new UnsupportedFileOperationException(FileOperation.GET_FREE_SPACE);
 	}
 
@@ -83,12 +82,12 @@ public String getGroup() {
 	}
 
 	@Override
-	public InputStream getInputStream() throws IOException, UnsupportedFileOperationException {
+	public InputStream getInputStream() throws IOException {
 		throw new UnsupportedFileOperationException(FileOperation.WRITE_FILE);
 	}
 
 	@Override
-	public OutputStream getOutputStream() throws IOException, UnsupportedFileOperationException {
+	public OutputStream getOutputStream() throws IOException {
 		throw new UnsupportedFileOperationException(FileOperation.READ_FILE);
 	}
 
@@ -114,7 +113,7 @@ public RandomAccessInputStream getRandomAccessInputStream()
 	}
 
 	@Override
-	public RandomAccessOutputStream getRandomAccessOutputStream() throws IOException, UnsupportedFileOperationException {
+	public RandomAccessOutputStream getRandomAccessOutputStream() throws IOException {
 		throw new UnsupportedFileOperationException(FileOperation.RANDOM_READ_FILE);
 	}
 
@@ -124,8 +123,7 @@ public long getSize() {
 	}
 
 	@Override
-	public long getTotalSpace() throws IOException,
-			UnsupportedFileOperationException {
+	public long getTotalSpace() throws IOException {
 		throw new UnsupportedFileOperationException(FileOperation.GET_TOTAL_SPACE);
 	}
 
diff --git a/src/main/com/mucommander/desktop/gnome/GnomeTrash.java b/src/main/com/mucommander/desktop/gnome/GnomeTrash.java
index 799f93d68..e2f8a18b1 100644
--- a/src/main/com/mucommander/desktop/gnome/GnomeTrash.java
+++ b/src/main/com/mucommander/desktop/gnome/GnomeTrash.java
@@ -71,10 +71,6 @@ public class GnomeTrash extends QueuedTrash {
 	private static final AbstractFile TRASH_VOLUME;
 	/** Formats dates in trash info files. */
 	private static final SimpleDateFormat INFO_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-    /**
-	 * Resolves the user Trash folder and its "info" and "files" subfolders once and for all. The
-	 * trash folder is created if it doesn't already exist.
-     */
     static {
         TRASH_FOLDER = getTrashFolder();
 		if (TRASH_FOLDER != null) {
diff --git a/src/main/com/mucommander/desktop/xfce/XfceTrash.java b/src/main/com/mucommander/desktop/xfce/XfceTrash.java
index ca4e71577..4529b6175 100644
--- a/src/main/com/mucommander/desktop/xfce/XfceTrash.java
+++ b/src/main/com/mucommander/desktop/xfce/XfceTrash.java
@@ -77,10 +77,6 @@ public class XfceTrash extends QueuedTrash {
 	/** Formats dates in trash info files */
 	private final static SimpleDateFormat INFO_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 
-	/**
-	 * Resolves the user Trash folder and its "info" and "files" subfolders once and for all.
-	 * The trash folder is created if it doesn't already exist.
-	 */
 	static {
 		TRASH_FOLDER = getTrashFolder();
 		if(TRASH_FOLDER!=null) {
diff --git a/src/main/com/mucommander/shell/Shell.java b/src/main/com/mucommander/shell/Shell.java
index 369b7a6b8..157d1727c 100644
--- a/src/main/com/mucommander/shell/Shell.java
+++ b/src/main/com/mucommander/shell/Shell.java
@@ -58,9 +58,6 @@ public class Shell implements ConfigurationListener {
 
     // - Initialization ------------------------------------------------------
     // -----------------------------------------------------------------------
-    /**
-     * Initializes the shell.
-     */
     static {
     	MuConfigurations.addPreferencesListener(confListener = new Shell());
 
diff --git a/src/main/com/mucommander/shell/ShellHistoryManager.java b/src/main/com/mucommander/shell/ShellHistoryManager.java
index 2ea7ec399..3acf9254c 100644
--- a/src/main/com/mucommander/shell/ShellHistoryManager.java
+++ b/src/main/com/mucommander/shell/ShellHistoryManager.java
@@ -77,9 +77,6 @@ public class ShellHistoryManager {
      */
     private ShellHistoryManager() {}
 
-    /**
-     * Initialises history.
-     */
     static {
         history   = new String[MuConfigurations.getPreferences().getVariable(MuPreference.SHELL_HISTORY_SIZE, MuPreferences.DEFAULT_SHELL_HISTORY_SIZE)];
         listeners = new WeakHashMap<>();
diff --git a/src/main/com/mucommander/ui/action/ActionKeymap.java b/src/main/com/mucommander/ui/action/ActionKeymap.java
index 37b5d3158..e020aaaee 100644
--- a/src/main/com/mucommander/ui/action/ActionKeymap.java
+++ b/src/main/com/mucommander/ui/action/ActionKeymap.java
@@ -40,9 +40,9 @@ public class ActionKeymap {
     /** Maps Keystroke instances onto action id */
     private static AcceleratorMap acceleratorMap = new AcceleratorMap();
 
-    /******************
+    /*=================
      * Public Methods *
-     ******************/
+     =================*/
     
     /**
      * Register all action shortcuts to the given MainFrame's file tables.
@@ -228,9 +228,9 @@ public static Iterator<String> getCustomizedActions() {
     }
     
     
-    /*******************
+    /*==================
      * Private Methods *
-     *******************/
+     ==================*/
 
     /**
      * Register MuAction instance to MainFrame instance.
diff --git a/src/main/com/mucommander/ui/action/ActionManager.java b/src/main/com/mucommander/ui/action/ActionManager.java
index 9f2f75f16..8cc3df1bd 100644
--- a/src/main/com/mucommander/ui/action/ActionManager.java
+++ b/src/main/com/mucommander/ui/action/ActionManager.java
@@ -50,7 +50,7 @@
 public class ActionManager {
 	//private static final Logger LOGGER = LoggerFactory.getLogger(ActionManager.class);
 	
-    /** MuAction id -> factory map */
+    /* MuAction id -> factory map */
     //static final Map<String, ActionFactory> actionFactories = new HashMap<>();
     
     /** MainFrame -> MuAction map */
@@ -259,7 +259,7 @@ public static void registerCommandsActions() {
      * 
      * @param actionDescriptor - ActionDescriptor instance of the action.
      */
-    public static void registerAction(ActionDescriptor actionDescriptor) {
+    private static void registerAction(ActionDescriptor actionDescriptor) {
     	//actionFactories.put(actionDescriptor.getId(), actionDescriptor);	// TODO
     	ActionProperties.addActionDescriptor(actionDescriptor);
     }
@@ -309,7 +309,7 @@ public static boolean isActionExist(String actionId) {
      * @param command the command that is invoked by the returned action
      * @param mainFrame the MainFrame instance the action belongs to
      * @return a MuAction instance matching the given action ID and MainFrame, <code>null</code> if the
-     * @see {@link #getActionInstance(String, MainFrame)}
+     * @see #getActionInstance(String, MainFrame)
      * action could not be found or could not be instantiated.
      */
     public static MuAction getActionInstance(Command command, MainFrame mainFrame) {
@@ -324,7 +324,7 @@ public static MuAction getActionInstance(Command command, MainFrame mainFrame) {
      * @param actionId ID of the action to instantiate
      * @param mainFrame the MainFrame instance the action belongs to
      * @return a MuAction instance matching the given action ID and MainFrame, <code>null</code> if the
-     * @see {@link #getActionInstance(ActionParameters, MainFrame)}
+     * @see #getActionInstance(ActionParameters, MainFrame)
      * action could not be found or could not be instantiated.
      */
     public static MuAction getActionInstance(String actionId, MainFrame mainFrame) {
@@ -438,7 +438,7 @@ else if(!properties.isEmpty()) {
      * @param muActionId the MuAction id to compare instances against
      * @return  a ArrayList of all MuAction instances matching the specified action id
      */
-    public static List<MuAction> getActionInstances(String muActionId) {
+    static List<MuAction> getActionInstances(String muActionId) {
         List<MuAction> actionInstances = new ArrayList<>();
 
         // Iterate on all MainFrame instances
@@ -500,7 +500,7 @@ private static class ActionAndIdPair {
     	private MuAction action;
     	private String id;
     	
-    	public ActionAndIdPair(MuAction action, String id) {
+    	ActionAndIdPair(MuAction action, String id) {
     		this.action = action;
     		this.id = id;
     	}
diff --git a/src/main/com/mucommander/ui/action/impl/RevealInDesktopAction.java b/src/main/com/mucommander/ui/action/impl/RevealInDesktopAction.java
index e85b92dd3..53a164609 100644
--- a/src/main/com/mucommander/ui/action/impl/RevealInDesktopAction.java
+++ b/src/main/com/mucommander/ui/action/impl/RevealInDesktopAction.java
@@ -98,7 +98,7 @@ public String getLabel() {
         @Override
         public ImageIcon getIcon() {
 		    if (OsFamily.getCurrent() == OsFamily.MAC_OS_X) {
-                return super.getStandardIcon("Finder");
+                return getStandardIcon("Finder");
             }
             return super.getIcon();
         }
diff --git a/src/main/com/mucommander/ui/autocomplete/EditableComboboxCompletion.java b/src/main/com/mucommander/ui/autocomplete/EditableComboboxCompletion.java
index 017551e4e..84d7c827c 100644
--- a/src/main/com/mucommander/ui/autocomplete/EditableComboboxCompletion.java
+++ b/src/main/com/mucommander/ui/autocomplete/EditableComboboxCompletion.java
@@ -84,36 +84,38 @@ public void keyPressed(KeyEvent keyEvent) {
                 case KeyEvent.VK_ENTER:
                 	if (isItemSelectedAtPopupList()) {
                 		hideAutocompletionPopup();
-                		acceptListItem((String)list.getSelectedValue());
+                		acceptListItem(list.getSelectedValue());
                 		keyEvent.consume();
                 	}
                 	else {
 						// Stop the active showing-thread to prevent suggestions-popup 
                     	// opening after the operation was initiated.
-                    	if(showingThread!=null)
-                            showingThread.done();
+                    	if (showingThread != null) {
+							showingThread.done();
+						}
 					
                 		autocompletedtextComp.OnEnterPressed(keyEvent);
 					}
                 	break;
                 case KeyEvent.VK_ESCAPE:
                 	if (isPopupListShowing()) {
-                		if (autocompletedtextComp.isEnabled())
-                			hideAutocompletionPopup();
+                		if (autocompletedtextComp.isEnabled()) {
+							hideAutocompletionPopup();
+						}
                 		keyEvent.consume();
                 	}
                 	else
                 		autocompletedtextComp.OnEscPressed(keyEvent);
                 	break;
                 case KeyEvent.VK_UP:
-                	if(autocompletedtextComp.isEnabled() && popup.isVisible()) {
+                	if (autocompletedtextComp.isEnabled() && popup.isVisible()) {
                 		selectPreviousPossibleValue();
                 		keyEvent.consume();
                 	}
                 	break;
                 case KeyEvent.VK_DOWN:
-                	if(autocompletedtextComp.isEnabled()){ 
-                        if(popup.isVisible()) {
+                	if (autocompletedtextComp.isEnabled()){
+                        if (popup.isVisible()) {
                             selectNextPossibleValue();
                             keyEvent.consume();
                         }
diff --git a/src/main/com/mucommander/ui/chooser/ColorChooser.java b/src/main/com/mucommander/ui/chooser/ColorChooser.java
index 9aa34d4b0..003cf5dca 100644
--- a/src/main/com/mucommander/ui/chooser/ColorChooser.java
+++ b/src/main/com/mucommander/ui/chooser/ColorChooser.java
@@ -67,9 +67,6 @@ public class ColorChooser extends YBoxPanel implements ChangeListener {
 
     // - Localisation -----------------------------------------------------------
     // --------------------------------------------------------------------------
-    /**
-     * Overrides the default, incomplete Swing translations.
-     */
     static {
         String buffer;
 
diff --git a/src/main/com/mucommander/ui/dialog/file/EmailFilesDialog.java b/src/main/com/mucommander/ui/dialog/file/EmailFilesDialog.java
index aae85e9e5..2a224021d 100644
--- a/src/main/com/mucommander/ui/dialog/file/EmailFilesDialog.java
+++ b/src/main/com/mucommander/ui/dialog/file/EmailFilesDialog.java
@@ -44,7 +44,6 @@
 import com.mucommander.ui.action.ActionProperties;
 import com.mucommander.ui.action.impl.EmailAction;
 import com.mucommander.ui.dialog.DialogToolkit;
-import com.mucommander.ui.dialog.pref.general.GeneralPreferencesDialog;
 import com.mucommander.ui.layout.XAlignedComponentPanel;
 import com.mucommander.ui.layout.YBoxPanel;
 import com.mucommander.ui.main.MainFrame;
diff --git a/src/main/com/mucommander/ui/dialog/pref/theme/ColorButton.java b/src/main/com/mucommander/ui/dialog/pref/theme/ColorButton.java
index a2c626db3..de451e6c5 100644
--- a/src/main/com/mucommander/ui/dialog/pref/theme/ColorButton.java
+++ b/src/main/com/mucommander/ui/dialog/pref/theme/ColorButton.java
@@ -68,11 +68,11 @@ public ColorButton(PreferencesDialog parent, ThemeData themeData, int colorId) {
         this(parent, themeData, colorId, null, null);
     }
 
-    public ColorButton(PreferencesDialog parent, ThemeData themeData, int colorId, String previewColorPropertyName) {
+    ColorButton(PreferencesDialog parent, ThemeData themeData, int colorId, String previewColorPropertyName) {
         this(parent, themeData, colorId, previewColorPropertyName, null);
     }
 
-    public ColorButton(PreferencesDialog parent, ThemeData themeData, int colorId, String previewColorPropertyName, JComponent previewComponent) {
+    ColorButton(PreferencesDialog parent, ThemeData themeData, int colorId, String previewColorPropertyName, JComponent previewComponent) {
         FlowLayout flowLayout = new FlowLayout();
         flowLayout.setHgap(0);
         flowLayout.setVgap(0);
@@ -161,7 +161,7 @@ private ColorChooser createColorChooser() {
         if(previewComponent!=null && previewColorPropertyName!=null && (previewComponent instanceof PreviewLabel)) {
             try {
                 return new ColorChooser(currentColor, (PreviewLabel)((PreviewLabel)previewComponent).clone(), previewColorPropertyName);
-            } catch(CloneNotSupportedException e) {}
+            } catch(CloneNotSupportedException ignored) {}
         }
         return new ColorChooser(currentColor, new PreviewLabel(), PreviewLabel.BACKGROUND_COLOR_PROPERTY_NAME);
     }
diff --git a/src/main/com/mucommander/ui/dialog/server/VSpherePanel.java b/src/main/com/mucommander/ui/dialog/server/VSpherePanel.java
index 44668dcb0..fe92af258 100644
--- a/src/main/com/mucommander/ui/dialog/server/VSpherePanel.java
+++ b/src/main/com/mucommander/ui/dialog/server/VSpherePanel.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.ui.dialog.server;
 
 import java.net.MalformedURLException;
diff --git a/src/main/com/mucommander/ui/layout/AsyncPanel.java b/src/main/com/mucommander/ui/layout/AsyncPanel.java
index ce83e595f..9511a88f9 100644
--- a/src/main/com/mucommander/ui/layout/AsyncPanel.java
+++ b/src/main/com/mucommander/ui/layout/AsyncPanel.java
@@ -88,7 +88,7 @@ protected void done() {
     /**
      * Creates a new <code>AsyncPanel</code> with the default wait component.
      */
-    public AsyncPanel() {
+    protected AsyncPanel() {
         this(getDefaultWaitComponent());
     }
 
@@ -98,7 +98,7 @@ public AsyncPanel() {
      *
      * @param waitComponent the component to display while the target component is being loaded
      */
-    public AsyncPanel(JComponent waitComponent) {
+    protected AsyncPanel(JComponent waitComponent) {
         super(new BorderLayout());
 
         this.waitComponent = waitComponent;
@@ -134,7 +134,7 @@ protected void cancel() {
         }
     }
 
-    /**
+    /*
      * Loads the target component by calling {@link #getTargetComponent()} and replace the wait component by it.
      */
 /*
diff --git a/src/main/com/mucommander/ui/main/ConfigurableFolderFilter.java b/src/main/com/mucommander/ui/main/ConfigurableFolderFilter.java
index 8ce4eacfd..712fb05d1 100644
--- a/src/main/com/mucommander/ui/main/ConfigurableFolderFilter.java
+++ b/src/main/com/mucommander/ui/main/ConfigurableFolderFilter.java
@@ -65,7 +65,6 @@ private void configureFilters() {
         if (!pref.getVariable(SHOW_DS_STORE_FILES, MuPreferences.DEFAULT_SHOW_DS_STORE_FILES))
             addFileFilter(dsFileFilter);
 
-        /** Filters out Mac OS X system folders, null when 'show system folders' option is enabled */
         if (!pref.getVariable(SHOW_SYSTEM_FOLDERS, MuPreferences.DEFAULT_SHOW_SYSTEM_FOLDERS))
             addFileFilter(systemFileFilter);
     }
diff --git a/src/main/com/mucommander/ui/main/table/FileTable.java b/src/main/com/mucommander/ui/main/table/FileTable.java
index 99ff7152c..f8eb7fea1 100644
--- a/src/main/com/mucommander/ui/main/table/FileTable.java
+++ b/src/main/com/mucommander/ui/main/table/FileTable.java
@@ -1911,10 +1911,7 @@ private void rename() {
         }
 
 
-        /**
-         * Restores default row height.
-         */
-/*
+        /*
         public void restore() {
             // Filename editor's row resize disabled because of Java bug #4398268 which prevents new rows from being visible after setRowHeight(row, height) has been called.
             // Add to that the fact that DefaultCellEditor's stopCellEditing() and cancelCellEditing() are not always called, for instance when table header is clicked.
diff --git a/src/main/com/mucommander/ui/tabs/HideableTabbedPane.java b/src/main/com/mucommander/ui/tabs/HideableTabbedPane.java
index 0ccf2fb37..7cd71d299 100644
--- a/src/main/com/mucommander/ui/tabs/HideableTabbedPane.java
+++ b/src/main/com/mucommander/ui/tabs/HideableTabbedPane.java
@@ -157,10 +157,6 @@ protected TabsCollection<T> getTabs() {
 		return tabsCollection;
 	}
 
-	/***********************
-	 * Tabs Actions Support
-	 ***********************/
-
 	/* Actions which are not depended on the display type (single/multiple tabs) */
 
 	/**
@@ -263,11 +259,7 @@ private void setTabsViewer(TabsViewerFactory<T> tabsViewerFactory) {
 		tabsViewer.requestFocus();
 	}
 
-	/********************
-	 * Protected Methods
-	 ********************/
-
-	/**
+    /**
 	 * Returns the tab at the given index
 	 * An exception will be thrown if no tab exists in the given index
 	 * 
diff --git a/src/main/com/mucommander/ui/tabs/TabsCollection.java b/src/main/com/mucommander/ui/tabs/TabsCollection.java
index 2ecbcff25..91c4c3767 100644
--- a/src/main/com/mucommander/ui/tabs/TabsCollection.java
+++ b/src/main/com/mucommander/ui/tabs/TabsCollection.java
@@ -139,12 +139,8 @@ public int count() {
 	public int indexOf(T tab) {
 		return collection.indexOf(tab);
 	}
-	
-	/********************
-	 * Listeners support
-	 ********************/
-	
-	/**
+
+    /**
 	 * Add a given listener to the listeners to be notified about tabs-changes
 	 * 
 	 * @param listener - object that implements TabsChangeListener interface
diff --git a/src/main/com/mucommander/xml/XmlAttributes.java b/src/main/com/mucommander/xml/XmlAttributes.java
index f1e1a05b5..294345a42 100644
--- a/src/main/com/mucommander/xml/XmlAttributes.java
+++ b/src/main/com/mucommander/xml/XmlAttributes.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2012 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.xml;
 
 import java.util.*;
diff --git a/src/main/com/mucommander/xml/XmlWriter.java b/src/main/com/mucommander/xml/XmlWriter.java
index 8dedc5121..b142edc9d 100644
--- a/src/main/com/mucommander/xml/XmlWriter.java
+++ b/src/main/com/mucommander/xml/XmlWriter.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2012 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.xml;
 
 import java.io.*;
diff --git a/src/test/com/mucommander/commons/conf/BufferedConfigurationExplorerTest.java b/src/test/com/mucommander/commons/conf/BufferedConfigurationExplorerTest.java
index c6ec46efc..c8597382e 100644
--- a/src/test/com/mucommander/commons/conf/BufferedConfigurationExplorerTest.java
+++ b/src/test/com/mucommander/commons/conf/BufferedConfigurationExplorerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
diff --git a/src/test/com/mucommander/commons/conf/ConfigurationEventTest.java b/src/test/com/mucommander/commons/conf/ConfigurationEventTest.java
index 09da611af..b91037663 100644
--- a/src/test/com/mucommander/commons/conf/ConfigurationEventTest.java
+++ b/src/test/com/mucommander/commons/conf/ConfigurationEventTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.conf;
 
 import org.testng.annotations.BeforeMethod;
diff --git a/src/test/com/mucommander/commons/conf/ConfigurationExplorerTest.java b/src/test/com/mucommander/commons/conf/ConfigurationExplorerTest.java
index bacbb7908..0ef84fa32 100644
--- a/src/test/com/mucommander/commons/conf/ConfigurationExplorerTest.java
+++ b/src/test/com/mucommander/commons/conf/ConfigurationExplorerTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.conf;
 
 import org.testng.annotations.BeforeMethod;
diff --git a/src/test/com/mucommander/commons/conf/ConfigurationSectionTest.java b/src/test/com/mucommander/commons/conf/ConfigurationSectionTest.java
index 1eb906a6b..762dbe175 100644
--- a/src/test/com/mucommander/commons/conf/ConfigurationSectionTest.java
+++ b/src/test/com/mucommander/commons/conf/ConfigurationSectionTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.conf;
 
 import org.testng.annotations.DataProvider;
diff --git a/src/test/com/mucommander/commons/conf/FileConfigurationSourceTest.java b/src/test/com/mucommander/commons/conf/FileConfigurationSourceTest.java
index 6974aea41..47e9e9b81 100644
--- a/src/test/com/mucommander/commons/conf/FileConfigurationSourceTest.java
+++ b/src/test/com/mucommander/commons/conf/FileConfigurationSourceTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.conf;
 
 import org.testng.annotations.BeforeMethod;
diff --git a/src/test/com/mucommander/commons/file/AbstractFileTest.java b/src/test/com/mucommander/commons/file/AbstractFileTest.java
index dc17b7d04..d1b47e328 100644
--- a/src/test/com/mucommander/commons/file/AbstractFileTest.java
+++ b/src/test/com/mucommander/commons/file/AbstractFileTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * This file is part of muCommander, http://www.mucommander.com
  * Copyright (C) 2002-2010 Maxence Bernard
  *
@@ -205,7 +205,7 @@ protected String createFile(AbstractFile file, long length) throws IOException,
      *
      * @param timeMs number of milliseconds to sleep
      */
-    protected void sleep(long timeMs) {
+    private void sleep(long timeMs) {
         try {
             Thread.sleep(timeMs);
         } catch (InterruptedException e) {
diff --git a/src/test/com/mucommander/commons/file/DefaultFileURLTest.java b/src/test/com/mucommander/commons/file/DefaultFileURLTest.java
index 6499b3807..89fbd33b6 100644
--- a/src/test/com/mucommander/commons/file/DefaultFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/DefaultFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file;
 
 /**
diff --git a/src/test/com/mucommander/commons/file/DefaultPathCanonizerTest.java b/src/test/com/mucommander/commons/file/DefaultPathCanonizerTest.java
index 7b8bb3131..fcbd34da1 100644
--- a/src/test/com/mucommander/commons/file/DefaultPathCanonizerTest.java
+++ b/src/test/com/mucommander/commons/file/DefaultPathCanonizerTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file;
 
 import org.testng.annotations.Test;
diff --git a/src/test/com/mucommander/commons/file/FileFactoryTest.java b/src/test/com/mucommander/commons/file/FileFactoryTest.java
index dae4ecb94..142818e4c 100644
--- a/src/test/com/mucommander/commons/file/FileFactoryTest.java
+++ b/src/test/com/mucommander/commons/file/FileFactoryTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file;
 
 import org.testng.annotations.Test;
diff --git a/src/test/com/mucommander/commons/file/FileTestTransformer.java b/src/test/com/mucommander/commons/file/FileTestTransformer.java
index 93520e90a..5e3421eb8 100644
--- a/src/test/com/mucommander/commons/file/FileTestTransformer.java
+++ b/src/test/com/mucommander/commons/file/FileTestTransformer.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file;
 
 import org.testng.IMethodInstance;
diff --git a/src/test/com/mucommander/commons/file/FileURLTestCase.java b/src/test/com/mucommander/commons/file/FileURLTestCase.java
index 603b0e7d9..2f17c5e8e 100644
--- a/src/test/com/mucommander/commons/file/FileURLTestCase.java
+++ b/src/test/com/mucommander/commons/file/FileURLTestCase.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file;
 
 import org.testng.Assert;
diff --git a/src/test/com/mucommander/commons/file/SimpleFileAttributesTest.java b/src/test/com/mucommander/commons/file/SimpleFileAttributesTest.java
index 829dbbe47..a2a2107ea 100644
--- a/src/test/com/mucommander/commons/file/SimpleFileAttributesTest.java
+++ b/src/test/com/mucommander/commons/file/SimpleFileAttributesTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file;
 
 import com.mucommander.commons.file.impl.local.LocalFileTest;
diff --git a/src/test/com/mucommander/commons/file/filter/ExtensionFilenameFilterTest.java b/src/test/com/mucommander/commons/file/filter/ExtensionFilenameFilterTest.java
index 0f055fda3..b69f0a408 100644
--- a/src/test/com/mucommander/commons/file/filter/ExtensionFilenameFilterTest.java
+++ b/src/test/com/mucommander/commons/file/filter/ExtensionFilenameFilterTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.filter;
 
 import org.testng.annotations.Test;
diff --git a/src/test/com/mucommander/commons/file/impl/ProxyFileTest.java b/src/test/com/mucommander/commons/file/impl/ProxyFileTest.java
index 9b2def886..bc79c54d7 100644
--- a/src/test/com/mucommander/commons/file/impl/ProxyFileTest.java
+++ b/src/test/com/mucommander/commons/file/impl/ProxyFileTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/impl/TestFile.java b/src/test/com/mucommander/commons/file/impl/TestFile.java
index 465841d03..698d4077f 100644
--- a/src/test/com/mucommander/commons/file/impl/TestFile.java
+++ b/src/test/com/mucommander/commons/file/impl/TestFile.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/impl/ftp/FTPFileTest.java b/src/test/com/mucommander/commons/file/impl/ftp/FTPFileTest.java
index 1823e454a..b6540d02b 100644
--- a/src/test/com/mucommander/commons/file/impl/ftp/FTPFileTest.java
+++ b/src/test/com/mucommander/commons/file/impl/ftp/FTPFileTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.ftp;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/impl/ftp/FTPFileURLTest.java b/src/test/com/mucommander/commons/file/impl/ftp/FTPFileURLTest.java
index 92c5d50e5..e2d467d96 100644
--- a/src/test/com/mucommander/commons/file/impl/ftp/FTPFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/ftp/FTPFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.ftp;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/hadoop/HDFSFileTest.java b/src/test/com/mucommander/commons/file/impl/hadoop/HDFSFileTest.java
index fad6c486e..06fc5e1d5 100644
--- a/src/test/com/mucommander/commons/file/impl/hadoop/HDFSFileTest.java
+++ b/src/test/com/mucommander/commons/file/impl/hadoop/HDFSFileTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.hadoop;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/impl/hadoop/HDFSFileURLTest.java b/src/test/com/mucommander/commons/file/impl/hadoop/HDFSFileURLTest.java
index 1ecf29702..c40d0c80d 100644
--- a/src/test/com/mucommander/commons/file/impl/hadoop/HDFSFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/hadoop/HDFSFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.hadoop;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/http/HTTPFileURLTest.java b/src/test/com/mucommander/commons/file/impl/http/HTTPFileURLTest.java
index ad37ad643..ff3e57ec4 100644
--- a/src/test/com/mucommander/commons/file/impl/http/HTTPFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/http/HTTPFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.http;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/http/HTTPSFileURLTest.java b/src/test/com/mucommander/commons/file/impl/http/HTTPSFileURLTest.java
index 9fca953d1..b551bd945 100644
--- a/src/test/com/mucommander/commons/file/impl/http/HTTPSFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/http/HTTPSFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.http;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/local/LocalFileTest.java b/src/test/com/mucommander/commons/file/impl/local/LocalFileTest.java
index 23a1af045..f766bd6f2 100644
--- a/src/test/com/mucommander/commons/file/impl/local/LocalFileTest.java
+++ b/src/test/com/mucommander/commons/file/impl/local/LocalFileTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.local;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/impl/local/LocalFileURLTest.java b/src/test/com/mucommander/commons/file/impl/local/LocalFileURLTest.java
index 57c0307d1..80f093c2e 100644
--- a/src/test/com/mucommander/commons/file/impl/local/LocalFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/local/LocalFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.local;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/nfs/NFSFileURLTest.java b/src/test/com/mucommander/commons/file/impl/nfs/NFSFileURLTest.java
index 3903473ca..fd5633a86 100644
--- a/src/test/com/mucommander/commons/file/impl/nfs/NFSFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/nfs/NFSFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.nfs;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/s3/S3FileTest.java b/src/test/com/mucommander/commons/file/impl/s3/S3FileTest.java
index 64e7de256..700560a7d 100644
--- a/src/test/com/mucommander/commons/file/impl/s3/S3FileTest.java
+++ b/src/test/com/mucommander/commons/file/impl/s3/S3FileTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.s3;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/impl/s3/S3FileURLTest.java b/src/test/com/mucommander/commons/file/impl/s3/S3FileURLTest.java
index cbdecf5b0..1ae9b94cb 100644
--- a/src/test/com/mucommander/commons/file/impl/s3/S3FileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/s3/S3FileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.s3;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/sftp/SFTPFileTest.java b/src/test/com/mucommander/commons/file/impl/sftp/SFTPFileTest.java
index 0afd6950a..31f8d849c 100644
--- a/src/test/com/mucommander/commons/file/impl/sftp/SFTPFileTest.java
+++ b/src/test/com/mucommander/commons/file/impl/sftp/SFTPFileTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.sftp;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/impl/sftp/SFTPFileURLTest.java b/src/test/com/mucommander/commons/file/impl/sftp/SFTPFileURLTest.java
index 6a7b84170..db45d4dc5 100644
--- a/src/test/com/mucommander/commons/file/impl/sftp/SFTPFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/sftp/SFTPFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.sftp;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/smb/SMBFileTest.java b/src/test/com/mucommander/commons/file/impl/smb/SMBFileTest.java
index a606cfe90..387d48a2a 100644
--- a/src/test/com/mucommander/commons/file/impl/smb/SMBFileTest.java
+++ b/src/test/com/mucommander/commons/file/impl/smb/SMBFileTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.smb;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/impl/smb/SMBFileURLTest.java b/src/test/com/mucommander/commons/file/impl/smb/SMBFileURLTest.java
index 7fd20b7a2..be61bebfe 100644
--- a/src/test/com/mucommander/commons/file/impl/smb/SMBFileURLTest.java
+++ b/src/test/com/mucommander/commons/file/impl/smb/SMBFileURLTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.smb;
 
 import com.mucommander.commons.file.AuthenticationType;
diff --git a/src/test/com/mucommander/commons/file/impl/zip/ZipArchiveFileTest.java b/src/test/com/mucommander/commons/file/impl/zip/ZipArchiveFileTest.java
index 82e1648c9..2c3298f81 100644
--- a/src/test/com/mucommander/commons/file/impl/zip/ZipArchiveFileTest.java
+++ b/src/test/com/mucommander/commons/file/impl/zip/ZipArchiveFileTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.impl.zip;
 
 import com.mucommander.commons.file.*;
diff --git a/src/test/com/mucommander/commons/file/util/FileComparatorTest.java b/src/test/com/mucommander/commons/file/util/FileComparatorTest.java
index 141fcdc21..bd10d106a 100644
--- a/src/test/com/mucommander/commons/file/util/FileComparatorTest.java
+++ b/src/test/com/mucommander/commons/file/util/FileComparatorTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/util/FileMonitorTest.java b/src/test/com/mucommander/commons/file/util/FileMonitorTest.java
index d9a515d80..6b012c7b1 100644
--- a/src/test/com/mucommander/commons/file/util/FileMonitorTest.java
+++ b/src/test/com/mucommander/commons/file/util/FileMonitorTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/util/PathTokenizerTest.java b/src/test/com/mucommander/commons/file/util/PathTokenizerTest.java
index 13741c5cd..e139e3b4f 100644
--- a/src/test/com/mucommander/commons/file/util/PathTokenizerTest.java
+++ b/src/test/com/mucommander/commons/file/util/PathTokenizerTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.util;
 
 import org.testng.annotations.Test;
diff --git a/src/test/com/mucommander/commons/file/util/PathUtilsTest.java b/src/test/com/mucommander/commons/file/util/PathUtilsTest.java
index 04281c49f..b0fcc439d 100644
--- a/src/test/com/mucommander/commons/file/util/PathUtilsTest.java
+++ b/src/test/com/mucommander/commons/file/util/PathUtilsTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/commons/file/util/ResourceLoaderTest.java b/src/test/com/mucommander/commons/file/util/ResourceLoaderTest.java
index 11b4663e3..b385dadd8 100644
--- a/src/test/com/mucommander/commons/file/util/ResourceLoaderTest.java
+++ b/src/test/com/mucommander/commons/file/util/ResourceLoaderTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.commons.file.util;
 
 import com.mucommander.commons.file.AbstractFile;
diff --git a/src/test/com/mucommander/xml/XmlAttributesTest.java b/src/test/com/mucommander/xml/XmlAttributesTest.java
index 76df4dfa7..23863649d 100644
--- a/src/test/com/mucommander/xml/XmlAttributesTest.java
+++ b/src/test/com/mucommander/xml/XmlAttributesTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.xml;
 
 import org.testng.annotations.BeforeMethod;
diff --git a/src/test/com/mucommander/xml/XmlWriterTest.java b/src/test/com/mucommander/xml/XmlWriterTest.java
index fbb82ee70..fe447a776 100644
--- a/src/test/com/mucommander/xml/XmlWriterTest.java
+++ b/src/test/com/mucommander/xml/XmlWriterTest.java
@@ -1,21 +1,3 @@
-/**
- * This file is part of muCommander, http://www.mucommander.com
- * Copyright (C) 2002-2010 Maxence Bernard
- *
- * muCommander is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * muCommander is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.mucommander.xml;
 
 import org.testng.annotations.Test;