Author: xavier
Date: Wed Nov 28 12:10:05 2007
New Revision: 599126
URL: http://svn.apache.org/viewvc?rev=599126&view=rev
Log:
fix style
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileResource.java
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java?rev=599126&r1=599125&r2=599126&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileRepository.java
Wed Nov 28 12:10:05 2007
@@ -29,18 +29,18 @@
import org.apache.ivy.util.FileUtil;
public class FileRepository extends AbstractRepository {
- private RepositoryCopyProgressListener _progress = new
RepositoryCopyProgressListener(this);
+ private RepositoryCopyProgressListener progress = new
RepositoryCopyProgressListener(this);
- private File _baseDir;
+ private File baseDir;
- private boolean _local = true;
+ private boolean local = true;
public FileRepository() {
- _baseDir = null;
+ baseDir = null;
}
public FileRepository(File basedir) {
- _baseDir = basedir;
+ this.baseDir = basedir;
}
public Resource getResource(String source) throws IOException {
@@ -59,8 +59,8 @@
private void copy(File src, File destination, boolean overwrite) throws
IOException {
try {
- _progress.setTotalLength(new Long(src.length()));
- if (!FileUtil.copy(src, destination, _progress, overwrite)) {
+ progress.setTotalLength(new Long(src.length()));
+ if (!FileUtil.copy(src, destination, progress, overwrite)) {
if (!overwrite) {
throw new IOException("file copy not done from " + src + "
to " + destination
+ ": destination probably already exists and
overwrite is false");
@@ -75,7 +75,7 @@
fireTransferError(ex);
throw ex;
} finally {
- _progress.setTotalLength(null);
+ progress.setTotalLength(null);
}
}
@@ -95,19 +95,19 @@
}
private File getFile(String source) {
- if (_baseDir != null) {
- return new File(_baseDir, source);
+ if (baseDir != null) {
+ return new File(baseDir, source);
} else {
return new File(source);
}
}
public boolean isLocal() {
- return _local;
+ return local;
}
public void setLocal(boolean local) {
- _local = local;
+ this.local = local;
}
}
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileResource.java
URL:
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileResource.java?rev=599126&r1=599125&r2=599126&view=diff
==============================================================================
---
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileResource.java
(original)
+++
incubator/ivy/core/trunk/src/java/org/apache/ivy/plugins/repository/file/FileResource.java
Wed Nov 28 12:10:05 2007
@@ -25,33 +25,33 @@
import org.apache.ivy.plugins.repository.Resource;
public class FileResource implements Resource {
- private File _file;
+ private File file;
- private FileRepository _repository;
+ private FileRepository repository;
public FileResource(FileRepository repository, File f) {
- _repository = repository;
- _file = f;
+ this.repository = repository;
+ this.file = f;
}
public String getName() {
- return _file.getPath();
+ return file.getPath();
}
public Resource clone(String cloneName) {
- return new FileResource(_repository, new File(cloneName));
+ return new FileResource(repository, new File(cloneName));
}
public long getLastModified() {
- return _file.lastModified();
+ return file.lastModified();
}
public long getContentLength() {
- return _file.length();
+ return file.length();
}
public boolean exists() {
- return _file.exists();
+ return file.exists();
}
public String toString() {
@@ -59,18 +59,18 @@
}
public File getFile() {
- return _file;
+ return file;
}
public FileRepository getRepository() {
- return _repository;
+ return repository;
}
public boolean isLocal() {
- return _repository.isLocal();
+ return repository.isLocal();
}
public InputStream openStream() throws IOException {
- return new FileInputStream(_file);
+ return new FileInputStream(file);
}
}