Author: mahrwald
Date: Wed Jul 13 09:31:38 2011
New Revision: 1145930
URL: http://svn.apache.org/viewvc?rev=1145930&view=rev
Log:
ARIES-708: Remove interface @Override, now it even compiles with a Java 5
compiler
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java
aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java?rev=1145930&r1=1145929&r2=1145930&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/CloseableDirectory.java
Wed Jul 13 09:31:38 2011
@@ -38,109 +38,91 @@ public class CloseableDirectory implemen
this.delegate = delegate;
}
- @Override
public String getName() {
checkNotClosed();
return delegate.getName();
}
- @Override
public boolean isDirectory() {
checkNotClosed();
return delegate.isDirectory();
}
- @Override
public boolean isFile() {
checkNotClosed();
return delegate.isFile();
}
- @Override
public long getLastModified() {
checkNotClosed();
return delegate.getLastModified();
}
- @Override
public IFile getFile(String name) {
checkNotClosed();
return delegate.getFile(name);
}
- @Override
public long getSize() {
checkNotClosed();
return delegate.getSize();
}
- @Override
public IDirectory convert() {
checkNotClosed();
return delegate.convert();
}
- @Override
public IDirectory convertNested() {
checkNotClosed();
return delegate.convertNested();
}
- @Override
public boolean isRoot() {
checkNotClosed();
return delegate.isRoot();
}
- @Override
public IDirectory getParent() {
checkNotClosed();
return delegate.getParent();
}
- @Override
public IDirectory getRoot() {
checkNotClosed();
return delegate.getRoot();
}
- @Override
public Iterator<IFile> iterator() {
checkNotClosed();
return delegate.iterator();
}
- @Override
public List<IFile> listFiles() {
checkNotClosed();
return delegate.listFiles();
}
- @Override
public List<IFile> listAllFiles() {
checkNotClosed();
return delegate.listAllFiles();
}
- @Override
public ICloseableDirectory toCloseable() {
checkNotClosed();
return delegate.toCloseable();
}
- @Override
public InputStream open() throws IOException,
UnsupportedOperationException {
checkNotClosed();
return delegate.open();
}
- @Override
public URL toURL() throws MalformedURLException {
checkNotClosed();
return delegate.toURL();
}
- @Override
public final void close() throws IOException {
if (closed.compareAndSet(false, true)) {
cleanup();
@@ -153,7 +135,6 @@ public class CloseableDirectory implemen
if (isClosed()) throw new
IllegalStateException("ICloseableDirectory is closed");
}
- @Override
public boolean isClosed() {
return closed.get();
}
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java?rev=1145930&r1=1145929&r2=1145930&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/DirectoryImpl.java
Wed Jul 13 09:31:38 2011
@@ -44,7 +44,6 @@ public class DirectoryImpl extends FileI
super(dir, rootFile);
}
- @Override
public IFile getFile(String name)
{
File desiredFile = new File(file, name);
@@ -61,14 +60,12 @@ public class DirectoryImpl extends FileI
return result;
}
- @Override
public boolean isRoot()
{
boolean result = (rootDirFile == file);
return result;
}
- @Override
public List<IFile> listFiles()
{
List<IFile> files = new ArrayList<IFile>();
@@ -85,7 +82,6 @@ public class DirectoryImpl extends FileI
return files;
}
- @Override
public List<IFile> listAllFiles()
{
List<IFile> files = new ArrayList<IFile>();
@@ -104,31 +100,26 @@ public class DirectoryImpl extends FileI
return files;
}
- @Override
public Iterator<IFile> iterator()
{
return listFiles().iterator();
}
- @Override
public IDirectory getParent()
{
return isRoot() ? null : super.getParent();
}
- @Override
public IDirectory convert()
{
return this;
}
- @Override
public InputStream open() throws IOException
{
throw new UnsupportedOperationException();
}
- @Override
public long getLastModified()
{
long result = super.getLastModified();
@@ -140,7 +131,6 @@ public class DirectoryImpl extends FileI
return result;
}
- @Override
public ICloseableDirectory toCloseable() {
return new CloseableDirectory(this);
}
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java?rev=1145930&r1=1145929&r2=1145930&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/FileImpl.java
Wed Jul 13 09:31:38 2011
@@ -57,68 +57,58 @@ public class FileImpl implements IFile
else name = file.getAbsolutePath().substring(rootDir.length() +
1).replace('\\', '/');
}
- @Override
public IDirectory convert()
{
return null;
}
- @Override
public long getLastModified()
{
long result = file.lastModified();
return result;
}
- @Override
public String getName()
{
return name;
}
- @Override
public IDirectory getParent()
{
IDirectory parent = new DirectoryImpl(file.getParentFile(), rootDirFile);
return parent;
}
- @Override
public long getSize()
{
long size = file.length();
return size;
}
- @Override
public boolean isDirectory()
{
boolean result = file.isDirectory();
return result;
}
- @Override
public boolean isFile()
{
boolean result = file.isFile();
return result;
}
- @Override
public InputStream open() throws IOException
{
InputStream is = new FileInputStream(file);
return is;
}
- @Override
public IDirectory getRoot()
{
IDirectory root = new DirectoryImpl(rootDirFile, rootDirFile);
return root;
}
- @Override
public URL toURL() throws MalformedURLException
{
URL result = file.toURI().toURL();
@@ -150,7 +140,6 @@ public class FileImpl implements IFile
return file.getAbsolutePath();
}
- @Override
public IDirectory convertNested() {
if (isDirectory()) return convert();
else return FileSystemImpl.getFSRoot(file, getParent());
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java?rev=1145930&r1=1145929&r2=1145930&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipDirectory.java
Wed Jul 13 09:31:38 2011
@@ -58,22 +58,18 @@ public class NestedZipDirectory extends
super(other, cache);
}
- @Override
public IDirectory convert() {
return this;
}
- @Override
public Iterator<IFile> iterator() {
return listFiles().iterator();
}
- @Override
public List<IFile> listFiles() {
return listFiles(false);
}
- @Override
public List<IFile> listAllFiles() {
return listFiles(true);
}
@@ -145,7 +141,6 @@ public class NestedZipDirectory extends
return result;
}
- @Override
public IFile getFile(String name) {
Map<String,ZipEntry> entries = new HashMap<String, ZipEntry>();
ZipEntry ze;
@@ -194,27 +189,22 @@ public class NestedZipDirectory extends
}
- @Override
public boolean isDirectory() {
return true;
}
- @Override
public InputStream open() throws IOException,
UnsupportedOperationException {
throw new UnsupportedOperationException();
}
- @Override
public boolean isFile() {
return false;
}
- @Override
public boolean isRoot() {
return false;
}
- @Override
public ICloseableDirectory toCloseable() {
try {
return new NestedCloseableDirectory(archive, this);
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java?rev=1145930&r1=1145929&r2=1145930&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/NestedZipFile.java
Wed Jul 13 09:31:38 2011
@@ -93,49 +93,40 @@ public class NestedZipFile implements IF
return nameInZip;
}
- @Override
public String getName() {
return name;
}
- @Override
public boolean isDirectory() {
return false;
}
- @Override
public boolean isFile() {
return true;
}
- @Override
public long getLastModified() {
return lastModified;
}
- @Override
public long getSize() {
return size;
}
- @Override
public IDirectory convert() {
return null;
}
- @Override
public IDirectory convertNested() {
if (isDirectory()) return convert();
else if (FileSystemImpl.isValidZip(this)) return new
NestedZipDirectory(this);
else return null;
}
- @Override
public IDirectory getParent() {
return parent;
}
- @Override
public InputStream open() throws IOException,
UnsupportedOperationException {
if (cache != null && !!!cache.isClosed()) {
ZipFile zip = cache.getZipFile();
@@ -160,12 +151,10 @@ public class NestedZipFile implements IF
}
}
- @Override
public IDirectory getRoot() {
return archive.getRoot();
}
- @Override
public URL toURL() throws MalformedURLException
{
if (nameInZip.length() == 0) return archive.toURL();
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java?rev=1145930&r1=1145929&r2=1145930&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipDirectory.java
Wed Jul 13 09:31:38 2011
@@ -81,7 +81,6 @@ public class ZipDirectory extends ZipFil
zipRoot = other.zipRoot;
}
- @Override
public IFile getFile(String name)
{
IFile result = null;
@@ -136,19 +135,16 @@ public class ZipDirectory extends ZipFil
return result;
}
- @Override
public boolean isRoot()
{
return getParent() == null;
}
- @Override
public List<IFile> listFiles()
{
return listFiles(false);
}
- @Override
public List<IFile> listAllFiles()
{
return listFiles(true);
@@ -194,37 +190,31 @@ public class ZipDirectory extends ZipFil
return result;
}
- @Override
public Iterator<IFile> iterator()
{
return listFiles().iterator();
}
- @Override
public IDirectory convert()
{
return this;
}
- @Override
public boolean isDirectory()
{
return true;
}
- @Override
public boolean isFile()
{
return false;
}
- @Override
public InputStream open()
{
throw new UnsupportedOperationException();
}
- @Override
public IDirectory getRoot()
{
return root;
@@ -263,7 +253,6 @@ public class ZipDirectory extends ZipFil
return entryFile;
}
- @Override
public ICloseableDirectory toCloseable() {
try {
return new ZipCloseableDirectory(zip, this);
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java?rev=1145930&r1=1145929&r2=1145930&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/filesystem/impl/ZipFileImpl.java
Wed Jul 13 09:31:38 2011
@@ -135,26 +135,22 @@ public class ZipFileImpl implements IFil
return zipPathToRoot;
}
- @Override
public IDirectory convert()
{
return null;
}
- @Override
public IDirectory convertNested() {
if (isDirectory()) return convert();
else if (FileSystemImpl.isValidZip(this)) return new
NestedZipDirectory(this);
else return null;
}
- @Override
public long getLastModified()
{
return lastModified;
}
- @Override
public String getName()
{
return name;
@@ -170,44 +166,37 @@ public class ZipFileImpl implements IFil
}
}
- @Override
public IDirectory getParent()
{
return parent;
}
- @Override
public long getSize()
{
return size;
}
- @Override
public boolean isDirectory()
{
return false;
}
- @Override
public boolean isFile()
{
return true;
}
- @Override
public InputStream open() throws IOException
{
InputStream is = new SpecialZipInputStream(entry);
return is;
}
- @Override
public IDirectory getRoot()
{
return parent.getRoot();
}
- @Override
public URL toURL() throws MalformedURLException
{
String entryURL = "jar:" + url + "!/" + entry.getName();
Modified:
aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java
URL:
http://svn.apache.org/viewvc/aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java?rev=1145930&r1=1145929&r2=1145930&view=diff
==============================================================================
---
aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java
(original)
+++
aries/trunk/util/src/main/java/org/apache/aries/util/internal/BundleToClassLoaderAdapter.java
Wed Jul 13 09:31:38 2011
@@ -45,7 +45,6 @@ public class BundleToClassLoaderAdapter
public URL getResource(final String name)
{
return AccessController.doPrivileged(new PrivilegedAction<URL>() {
- @Override
public URL run()
{
return b.getResource(name);
@@ -76,7 +75,6 @@ public class BundleToClassLoaderAdapter
Enumeration<URL> urls;
try {
urls = AccessController.doPrivileged(new
PrivilegedExceptionAction<Enumeration<URL>>() {
- @Override
@SuppressWarnings("unchecked")
public Enumeration<URL> run() throws IOException
{
@@ -116,8 +114,7 @@ public class BundleToClassLoaderAdapter
{
try {
Class<?> result = AccessController.doPrivileged(new
PrivilegedExceptionAction<Class<?>>() {
- @Override
- public Class<?> run() throws ClassNotFoundException
+ public Class<?> run() throws ClassNotFoundException
{
return b.loadClass(name);
}
@@ -136,7 +133,6 @@ public class BundleToClassLoaderAdapter
}
}
- @Override
public Bundle getBundle()
{
return b;
