You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2014/07/04 15:15:11 UTC
[7/8] oops - make it compile under Java5 again
http://git-wip-us.apache.org/repos/asf/ant/blob/789422e1/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
index 8366db2..04f72d2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.java
@@ -25,6 +25,7 @@ import org.apache.tools.ant.util.FileUtils;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
import com.jcraft.jsch.SftpATTRS;
import com.jcraft.jsch.SftpException;
import com.jcraft.jsch.SftpProgressMonitor;
@@ -37,7 +38,7 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
private static final int HUNDRED_KILOBYTES = 102400;
private String remoteFile;
- private File localFile;
+ private final File localFile;
private boolean isRecursive = false;
private boolean verbose = false;
@@ -50,11 +51,11 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
* @param recursive if true use recursion
* @since Ant 1.7
*/
- public ScpFromMessageBySftp(boolean verbose,
- Session session,
- String aRemoteFile,
- File aLocalFile,
- boolean recursive) {
+ public ScpFromMessageBySftp(final boolean verbose,
+ final Session session,
+ final String aRemoteFile,
+ final File aLocalFile,
+ final boolean recursive) {
this(verbose, session, aRemoteFile, aLocalFile, recursive, false);
}
@@ -65,10 +66,10 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
* @param aLocalFile the local file
* @param recursive if true use recursion
*/
- public ScpFromMessageBySftp(Session session,
- String aRemoteFile,
- File aLocalFile,
- boolean recursive) {
+ public ScpFromMessageBySftp(final Session session,
+ final String aRemoteFile,
+ final File aLocalFile,
+ final boolean recursive) {
this(false, session, aRemoteFile, aLocalFile, recursive);
}
@@ -83,12 +84,12 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
* modification times
* @since Ant 1.8.0
*/
- public ScpFromMessageBySftp(boolean verbose,
- Session session,
- String aRemoteFile,
- File aLocalFile,
- boolean recursive,
- boolean preserveLastModified) {
+ public ScpFromMessageBySftp(final boolean verbose,
+ final Session session,
+ final String aRemoteFile,
+ final File aLocalFile,
+ final boolean recursive,
+ final boolean preserveLastModified) {
super(verbose, session, aRemoteFile, aLocalFile, recursive,
preserveLastModified);
this.verbose = verbose;
@@ -103,20 +104,20 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
* @throws JSchException on errors detected by scp
*/
public void execute() throws IOException, JSchException {
- ChannelSftp channel = openSftpChannel();
+ final ChannelSftp channel = openSftpChannel();
try {
channel.connect();
try {
- SftpATTRS attrs = channel.stat(remoteFile);
+ final SftpATTRS attrs = channel.stat(remoteFile);
if (attrs.isDir() && !remoteFile.endsWith("/")) {
remoteFile = remoteFile + "/";
}
- } catch (SftpException ee) {
+ } catch (final SftpException ee) {
// Ignored
}
getDir(channel, remoteFile, localFile);
- } catch (SftpException e) {
- JSchException schException = new JSchException("Could not get '"+ remoteFile
+ } catch (final SftpException e) {
+ final JSchException schException = new JSchException("Could not get '"+ remoteFile
+"' to '"+localFile+"' - "
+e.toString());
schException.initCause(e);
@@ -129,9 +130,9 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
log("done\n");
}
- private void getDir(ChannelSftp channel,
- String remoteFile,
- File localFile) throws IOException, SftpException {
+ private void getDir(final ChannelSftp channel,
+ final String remoteFile,
+ final File localFile) throws IOException, SftpException {
String pwd = remoteFile;
if (remoteFile.lastIndexOf('/') != -1) {
if (remoteFile.length() > 1) {
@@ -142,11 +143,11 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
if (!localFile.exists()) {
localFile.mkdirs();
}
- java.util.Vector files = channel.ls(remoteFile);
+ final java.util.Vector files = channel.ls(remoteFile);
final int size = files.size();
for (int i = 0; i < size; i++) {
- ChannelSftp.LsEntry le = (ChannelSftp.LsEntry) files.elementAt(i);
- String name = le.getFilename();
+ final ChannelSftp.LsEntry le = (ChannelSftp.LsEntry) files.elementAt(i);
+ final String name = le.getFilename();
if (le.getAttrs().isDir()) {
if (name.equals(".") || name.equals("..")) {
continue;
@@ -161,13 +162,13 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
channel.cd("..");
}
- private void getFile(ChannelSftp channel,
- ChannelSftp.LsEntry le,
+ private void getFile(final ChannelSftp channel,
+ final ChannelSftp.LsEntry le,
File localFile) throws IOException, SftpException {
- String remoteFile = le.getFilename();
+ final String remoteFile = le.getFilename();
if (!localFile.exists()) {
- String path = localFile.getAbsolutePath();
- int i = path.lastIndexOf(File.pathSeparator);
+ final String path = localFile.getAbsolutePath();
+ final int i = path.lastIndexOf(File.pathSeparator);
if (i != -1) {
if (path.length() > File.pathSeparator.length()) {
new File(path.substring(0, i)).mkdirs();
@@ -179,11 +180,11 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
localFile = new File(localFile, remoteFile);
}
- long startTime = System.currentTimeMillis();
- long totalLength = le.getAttrs().getSize();
+ final long startTime = System.currentTimeMillis();
+ final long totalLength = le.getAttrs().getSize();
SftpProgressMonitor monitor = null;
- boolean trackProgress = getVerbose() && totalLength > HUNDRED_KILOBYTES;
+ final boolean trackProgress = getVerbose() && totalLength > HUNDRED_KILOBYTES;
if (trackProgress) {
monitor = getProgressMonitor();
}
@@ -191,7 +192,7 @@ public class ScpFromMessageBySftp extends ScpFromMessage {
log("Receiving: " + remoteFile + " : " + le.getAttrs().getSize());
channel.get(remoteFile, localFile.getAbsolutePath(), monitor);
} finally {
- long endTime = System.currentTimeMillis();
+ final long endTime = System.currentTimeMillis();
logStats(startTime, endTime, (int) totalLength);
}
if (getPreserveLastModified()) {
http://git-wip-us.apache.org/repos/asf/ant/blob/789422e1/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
index 0ff6bc8..c1b6b8c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
@@ -26,7 +26,9 @@ import java.io.OutputStream;
import java.util.Iterator;
import java.util.List;
+import com.jcraft.jsch.Channel;
import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
/**
* Utility class to carry out an upload scp transfer.
@@ -44,7 +46,7 @@ public class ScpToMessage extends AbstractSshMessage {
* Constructor for ScpToMessage
* @param session the ssh session to use
*/
- public ScpToMessage(Session session) {
+ public ScpToMessage(final Session session) {
super(session);
}
@@ -54,7 +56,7 @@ public class ScpToMessage extends AbstractSshMessage {
* @param session the ssh session to use
* @since Ant 1.7
*/
- public ScpToMessage(boolean verbose, Session session) {
+ public ScpToMessage(final boolean verbose, final Session session) {
super(verbose, session);
}
@@ -66,10 +68,10 @@ public class ScpToMessage extends AbstractSshMessage {
* @param aRemotePath the remote path
* @since Ant 1.6.2
*/
- public ScpToMessage(boolean verbose,
- Session session,
- File aLocalFile,
- String aRemotePath) {
+ public ScpToMessage(final boolean verbose,
+ final Session session,
+ final File aLocalFile,
+ final String aRemotePath) {
this(verbose, session, aRemotePath);
this.localFile = aLocalFile;
@@ -83,10 +85,10 @@ public class ScpToMessage extends AbstractSshMessage {
* @param aRemotePath the remote path
* @since Ant 1.6.2
*/
- public ScpToMessage(boolean verbose,
- Session session,
- List aDirectoryList,
- String aRemotePath) {
+ public ScpToMessage(final boolean verbose,
+ final Session session,
+ final List aDirectoryList,
+ final String aRemotePath) {
this(verbose, session, aRemotePath);
this.directoryList = aDirectoryList;
@@ -99,9 +101,9 @@ public class ScpToMessage extends AbstractSshMessage {
* @param aRemotePath the remote path
* @since Ant 1.6.2
*/
- private ScpToMessage(boolean verbose,
- Session session,
- String aRemotePath) {
+ private ScpToMessage(final boolean verbose,
+ final Session session,
+ final String aRemotePath) {
super(verbose, session);
this.remotePath = aRemotePath;
}
@@ -112,9 +114,9 @@ public class ScpToMessage extends AbstractSshMessage {
* @param aLocalFile the local file
* @param aRemotePath the remote path
*/
- public ScpToMessage(Session session,
- File aLocalFile,
- String aRemotePath) {
+ public ScpToMessage(final Session session,
+ final File aLocalFile,
+ final String aRemotePath) {
this(false, session, aLocalFile, aRemotePath);
}
@@ -124,9 +126,9 @@ public class ScpToMessage extends AbstractSshMessage {
* @param aDirectoryList a list of directories
* @param aRemotePath the remote path
*/
- public ScpToMessage(Session session,
- List aDirectoryList,
- String aRemotePath) {
+ public ScpToMessage(final Session session,
+ final List aDirectoryList,
+ final String aRemotePath) {
this(false, session, aDirectoryList, aRemotePath);
}
@@ -146,12 +148,12 @@ public class ScpToMessage extends AbstractSshMessage {
}
private void doSingleTransfer() throws IOException, JSchException {
- String cmd = "scp -t " + remotePath;
- Channel channel = openExecChannel(cmd);
+ final String cmd = "scp -t " + remotePath;
+ final Channel channel = openExecChannel(cmd);
try {
- OutputStream out = channel.getOutputStream();
- InputStream in = channel.getInputStream();
+ final OutputStream out = channel.getOutputStream();
+ final InputStream in = channel.getInputStream();
channel.connect();
@@ -165,16 +167,16 @@ public class ScpToMessage extends AbstractSshMessage {
}
private void doMultipleTransfer() throws IOException, JSchException {
- Channel channel = openExecChannel("scp -r -d -t " + remotePath);
+ final Channel channel = openExecChannel("scp -r -d -t " + remotePath);
try {
- OutputStream out = channel.getOutputStream();
- InputStream in = channel.getInputStream();
+ final OutputStream out = channel.getOutputStream();
+ final InputStream in = channel.getInputStream();
channel.connect();
waitForAck(in);
- for (Iterator i = directoryList.iterator(); i.hasNext();) {
- Directory current = (Directory) i.next();
+ for (final Iterator i = directoryList.iterator(); i.hasNext();) {
+ final Directory current = (Directory) i.next();
sendDirectory(current, in, out);
}
} finally {
@@ -184,21 +186,21 @@ public class ScpToMessage extends AbstractSshMessage {
}
}
- private void sendDirectory(Directory current,
- InputStream in,
- OutputStream out) throws IOException {
- for (Iterator fileIt = current.filesIterator(); fileIt.hasNext();) {
+ private void sendDirectory(final Directory current,
+ final InputStream in,
+ final OutputStream out) throws IOException {
+ for (final Iterator fileIt = current.filesIterator(); fileIt.hasNext();) {
sendFileToRemote((File) fileIt.next(), in, out);
}
- for (Iterator dirIt = current.directoryIterator(); dirIt.hasNext();) {
- Directory dir = (Directory) dirIt.next();
+ for (final Iterator dirIt = current.directoryIterator(); dirIt.hasNext();) {
+ final Directory dir = (Directory) dirIt.next();
sendDirectoryToRemote(dir, in, out);
}
}
- private void sendDirectoryToRemote(Directory directory,
- InputStream in,
- OutputStream out) throws IOException {
+ private void sendDirectoryToRemote(final Directory directory,
+ final InputStream in,
+ final OutputStream out) throws IOException {
String command = "D0755 0 ";
command += directory.getDirectory().getName();
command += "\n";
@@ -213,11 +215,11 @@ public class ScpToMessage extends AbstractSshMessage {
waitForAck(in);
}
- private void sendFileToRemote(File localFile,
- InputStream in,
- OutputStream out) throws IOException {
+ private void sendFileToRemote(final File localFile,
+ final InputStream in,
+ final OutputStream out) throws IOException {
// send "C0644 filesize filename", where filename should not include '/'
- long filesize = localFile.length();
+ final long filesize = localFile.length();
String command = "C0644 " + filesize + " ";
command += localFile.getName();
command += "\n";
@@ -228,16 +230,16 @@ public class ScpToMessage extends AbstractSshMessage {
waitForAck(in);
// send a content of lfile
- FileInputStream fis = new FileInputStream(localFile);
- byte[] buf = new byte[BUFFER_SIZE];
- long startTime = System.currentTimeMillis();
+ final FileInputStream fis = new FileInputStream(localFile);
+ final byte[] buf = new byte[BUFFER_SIZE];
+ final long startTime = System.currentTimeMillis();
long totalLength = 0;
// only track progress for files larger than 100kb in verbose mode
- boolean trackProgress = getVerbose() && filesize > HUNDRED_KILOBYTES;
+ final boolean trackProgress = getVerbose() && filesize > HUNDRED_KILOBYTES;
// since filesize keeps on decreasing we have to store the
// initial filesize
- long initFilesize = filesize;
+ final long initFilesize = filesize;
int percentTransmitted = 0;
try {
@@ -245,7 +247,7 @@ public class ScpToMessage extends AbstractSshMessage {
log("Sending: " + localFile.getName() + " : " + localFile.length());
}
while (true) {
- int len = fis.read(buf, 0, buf.length);
+ final int len = fis.read(buf, 0, buf.length);
if (len <= 0) {
break;
}
@@ -263,7 +265,7 @@ public class ScpToMessage extends AbstractSshMessage {
waitForAck(in);
} finally {
if (this.getVerbose()) {
- long endTime = System.currentTimeMillis();
+ final long endTime = System.currentTimeMillis();
logStats(startTime, endTime, totalLength);
}
fis.close();
http://git-wip-us.apache.org/repos/asf/ant/blob/789422e1/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
index e78c276..a3a35fa 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.java
@@ -25,6 +25,7 @@ import java.util.List;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.JSchException;
+import com.jcraft.jsch.Session;
import com.jcraft.jsch.SftpException;
import com.jcraft.jsch.SftpProgressMonitor;
@@ -36,7 +37,7 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
private static final int HUNDRED_KILOBYTES = 102400;
private File localFile;
- private String remotePath;
+ private final String remotePath;
private List directoryList;
/**
@@ -47,10 +48,10 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
* @param aRemotePath the remote path
* @since Ant 1.7
*/
- public ScpToMessageBySftp(boolean verbose,
- Session session,
- File aLocalFile,
- String aRemotePath) {
+ public ScpToMessageBySftp(final boolean verbose,
+ final Session session,
+ final File aLocalFile,
+ final String aRemotePath) {
this(verbose, session, aRemotePath);
this.localFile = aLocalFile;
@@ -64,10 +65,10 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
* @param aRemotePath the remote path
* @since Ant 1.7
*/
- public ScpToMessageBySftp(boolean verbose,
- Session session,
- List aDirectoryList,
- String aRemotePath) {
+ public ScpToMessageBySftp(final boolean verbose,
+ final Session session,
+ final List aDirectoryList,
+ final String aRemotePath) {
this(verbose, session, aRemotePath);
this.directoryList = aDirectoryList;
@@ -80,9 +81,9 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
* @param aRemotePath the remote path
* @since Ant 1.6.2
*/
- private ScpToMessageBySftp(boolean verbose,
- Session session,
- String aRemotePath) {
+ private ScpToMessageBySftp(final boolean verbose,
+ final Session session,
+ final String aRemotePath) {
super(verbose, session);
this.remotePath = aRemotePath;
}
@@ -93,9 +94,9 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
* @param aLocalFile the local file
* @param aRemotePath the remote path
*/
- public ScpToMessageBySftp(Session session,
- File aLocalFile,
- String aRemotePath) {
+ public ScpToMessageBySftp(final Session session,
+ final File aLocalFile,
+ final String aRemotePath) {
this(false, session, aLocalFile, aRemotePath);
}
@@ -105,9 +106,9 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
* @param aDirectoryList a list of directories
* @param aRemotePath the remote path
*/
- public ScpToMessageBySftp(Session session,
- List aDirectoryList,
- String aRemotePath) {
+ public ScpToMessageBySftp(final Session session,
+ final List aDirectoryList,
+ final String aRemotePath) {
this(false, session, aDirectoryList, aRemotePath);
}
@@ -127,13 +128,13 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
}
private void doSingleTransfer() throws IOException, JSchException {
- ChannelSftp channel = openSftpChannel();
+ final ChannelSftp channel = openSftpChannel();
try {
channel.connect();
try {
sendFileToRemote(channel, localFile, remotePath);
- } catch (SftpException e) {
- JSchException schException = new JSchException("Could not send '" + localFile
+ } catch (final SftpException e) {
+ final JSchException schException = new JSchException("Could not send '" + localFile
+ "' to '" + remotePath + "' - "
+ e.toString());
schException.initCause(e);
@@ -147,14 +148,14 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
}
private void doMultipleTransfer() throws IOException, JSchException {
- ChannelSftp channel = openSftpChannel();
+ final ChannelSftp channel = openSftpChannel();
try {
channel.connect();
try {
try {
channel.stat(remotePath);
- } catch (SftpException e) {
+ } catch (final SftpException e) {
if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
// dir does not exist.
channel.mkdir(remotePath);
@@ -164,20 +165,20 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
}
}
channel.cd(remotePath);
- } catch (SftpException e) {
+ } catch (final SftpException e) {
throw new JSchException("Could not CD to '" + remotePath
+ "' - " + e.toString(), e);
}
Directory current = null;
try {
- for (Iterator i = directoryList.iterator(); i.hasNext();) {
+ for (final Iterator i = directoryList.iterator(); i.hasNext();) {
current = (Directory) i.next();
if (getVerbose()) {
log("Sending directory " + current);
}
sendDirectory(channel, current);
}
- } catch (SftpException e) {
+ } catch (final SftpException e) {
String msg = "Error sending directory";
if (current != null && current.getDirectory() != null) {
msg += " '" + current.getDirectory().getName() + "'";
@@ -191,25 +192,25 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
}
}
- private void sendDirectory(ChannelSftp channel,
- Directory current)
+ private void sendDirectory(final ChannelSftp channel,
+ final Directory current)
throws IOException, SftpException {
- for (Iterator fileIt = current.filesIterator(); fileIt.hasNext();) {
+ for (final Iterator fileIt = current.filesIterator(); fileIt.hasNext();) {
sendFileToRemote(channel, (File) fileIt.next(), null);
}
- for (Iterator dirIt = current.directoryIterator(); dirIt.hasNext();) {
- Directory dir = (Directory) dirIt.next();
+ for (final Iterator dirIt = current.directoryIterator(); dirIt.hasNext();) {
+ final Directory dir = (Directory) dirIt.next();
sendDirectoryToRemote(channel, dir);
}
}
- private void sendDirectoryToRemote(ChannelSftp channel,
- Directory directory)
+ private void sendDirectoryToRemote(final ChannelSftp channel,
+ final Directory directory)
throws IOException, SftpException {
- String dir = directory.getDirectory().getName();
+ final String dir = directory.getDirectory().getName();
try {
channel.stat(dir);
- } catch (SftpException e) {
+ } catch (final SftpException e) {
// dir does not exist.
if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
channel.mkdir(dir);
@@ -220,21 +221,21 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
channel.cd("..");
}
- private void sendFileToRemote(ChannelSftp channel,
- File localFile,
+ private void sendFileToRemote(final ChannelSftp channel,
+ final File localFile,
String remotePath)
throws IOException, SftpException {
- long filesize = localFile.length();
+ final long filesize = localFile.length();
if (remotePath == null) {
remotePath = localFile.getName();
}
- long startTime = System.currentTimeMillis();
- long totalLength = filesize;
+ final long startTime = System.currentTimeMillis();
+ final long totalLength = filesize;
// only track progress for files larger than 100kb in verbose mode
- boolean trackProgress = getVerbose() && filesize > HUNDRED_KILOBYTES;
+ final boolean trackProgress = getVerbose() && filesize > HUNDRED_KILOBYTES;
SftpProgressMonitor monitor = null;
if (trackProgress) {
@@ -248,7 +249,7 @@ public class ScpToMessageBySftp extends ScpToMessage/*AbstractSshMessage*/ {
channel.put(localFile.getAbsolutePath(), remotePath, monitor);
} finally {
if (this.getVerbose()) {
- long endTime = System.currentTimeMillis();
+ final long endTime = System.currentTimeMillis();
logStats(startTime, endTime, (int) totalLength);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/789422e1/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java
index af1f5bf..cbf3f3f 100644
--- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java
+++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalog.java
@@ -18,9 +18,10 @@
package org.apache.tools.ant.types.resolver;
-import com.sun.org.apache.xml.internal.resolver.Catalog;
-import com.sun.org.apache.xml.internal.resolver.CatalogEntry;
-import com.sun.org.apache.xml.internal.resolver.helpers.PublicId;
+import org.apache.xml.resolver.Catalog;
+import org.apache.xml.resolver.CatalogEntry;
+import org.apache.xml.resolver.helpers.PublicId;
+
/**
* This class extends the Catalog class provided by Norman Walsh's
@@ -54,7 +55,7 @@ public class ApacheCatalog extends Catalog {
* @return the catalog.
*/
protected Catalog newCatalog() {
- ApacheCatalog cat = (ApacheCatalog) super.newCatalog();
+ final ApacheCatalog cat = (ApacheCatalog) super.newCatalog();
cat.setResolver(resolver);
return cat;
}
@@ -63,7 +64,7 @@ public class ApacheCatalog extends Catalog {
* Set the resolver object to callback.
* @param resolver the apache catalog resolver.
*/
- public void setResolver(ApacheCatalogResolver resolver) {
+ public void setResolver(final ApacheCatalogResolver resolver) {
this.resolver = resolver;
}
@@ -84,14 +85,14 @@ public class ApacheCatalog extends Catalog {
*
* @param entry The CatalogEntry to process.
*/
- public void addEntry(CatalogEntry entry) {
+ public void addEntry(final CatalogEntry entry) {
- int type = entry.getEntryType();
+ final int type = entry.getEntryType();
if (type == PUBLIC) {
- String publicid = PublicId.normalize(entry.getEntryArg(0));
- String systemid = normalizeURI(entry.getEntryArg(1));
+ final String publicid = PublicId.normalize(entry.getEntryArg(0));
+ final String systemid = normalizeURI(entry.getEntryArg(1));
if (resolver == null) {
catalogManager.debug
@@ -102,8 +103,8 @@ public class ApacheCatalog extends Catalog {
} else if (type == URI) {
- String uri = normalizeURI(entry.getEntryArg(0));
- String altURI = normalizeURI(entry.getEntryArg(1));
+ final String uri = normalizeURI(entry.getEntryArg(0));
+ final String altURI = normalizeURI(entry.getEntryArg(1));
if (resolver == null) {
catalogManager.debug
http://git-wip-us.apache.org/repos/asf/ant/blob/789422e1/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
index 17b1e8a..2312d3d 100644
--- a/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
+++ b/src/main/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.java
@@ -25,10 +25,10 @@ import java.net.URL;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.ResourceLocation;
import org.apache.tools.ant.types.XMLCatalog;
+import org.apache.xml.resolver.Catalog;
+import org.apache.xml.resolver.CatalogManager;
+import org.apache.xml.resolver.tools.CatalogResolver;
-import com.sun.org.apache.xml.internal.resolver.Catalog;
-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
/**
* <p>This class extends the CatalogResolver class provided by Norman
@@ -91,7 +91,7 @@ public class ApacheCatalogResolver extends CatalogResolver {
* Set the XMLCatalog object to callback.
* @param xmlCatalog the XMLCatalog to use.
*/
- public void setXMLCatalog(XMLCatalog xmlCatalog) {
+ public void setXMLCatalog(final XMLCatalog xmlCatalog) {
this.xmlCatalog = xmlCatalog;
}
@@ -100,22 +100,22 @@ public class ApacheCatalogResolver extends CatalogResolver {
* file within a <code><catalogfiles></code> fileset.
* @param file the external catalog file.
*/
- public void parseCatalog(String file) {
+ public void parseCatalog(final String file) {
- Catalog catalog = getCatalog();
+ final Catalog catalog = getCatalog();
if (!(catalog instanceof ApacheCatalog)) {
throw new BuildException("Wrong catalog type found: " + catalog.getClass().getName());
}
- ApacheCatalog apacheCatalog = (ApacheCatalog) catalog;
+ final ApacheCatalog apacheCatalog = (ApacheCatalog) catalog;
// Pass in reference to ourselves so we can be called back.
apacheCatalog.setResolver(this);
try {
apacheCatalog.parseCatalog(file);
- } catch (MalformedURLException ex) {
+ } catch (final MalformedURLException ex) {
throw new BuildException(ex);
- } catch (IOException ex) {
+ } catch (final IOException ex) {
throw new BuildException(ex);
}
}
@@ -133,11 +133,11 @@ public class ApacheCatalogResolver extends CatalogResolver {
* directory in which the catalog is located.
*
*/
- public void addPublicEntry(String publicid,
- String systemid,
- URL base) {
+ public void addPublicEntry(final String publicid,
+ final String systemid,
+ final URL base) {
- ResourceLocation dtd = new ResourceLocation();
+ final ResourceLocation dtd = new ResourceLocation();
dtd.setBase(base);
dtd.setPublicId(publicid);
dtd.setLocation(systemid);
@@ -159,11 +159,11 @@ public class ApacheCatalogResolver extends CatalogResolver {
* directory in which the catalog is located.
*
*/
- public void addURIEntry(String uri,
- String altURI,
- URL base) {
+ public void addURIEntry(final String uri,
+ final String altURI,
+ final URL base) {
- ResourceLocation entity = new ResourceLocation();
+ final ResourceLocation entity = new ResourceLocation();
entity.setBase(base);
entity.setPublicId(uri);
entity.setLocation(altURI);
http://git-wip-us.apache.org/repos/asf/ant/blob/789422e1/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
index f086b1f..38bb728 100644
--- a/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
+++ b/src/main/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.java
@@ -23,7 +23,11 @@ import java.util.StringTokenizer;
import com.sun.org.apache.bcel.internal.classfile.ConstantClass;
import com.sun.org.apache.bcel.internal.classfile.ConstantNameAndType;
+import com.sun.org.apache.bcel.internal.classfile.ConstantPool;
+import com.sun.org.apache.bcel.internal.classfile.EmptyVisitor;
+import com.sun.org.apache.bcel.internal.classfile.Field;
import com.sun.org.apache.bcel.internal.classfile.JavaClass;
+import com.sun.org.apache.bcel.internal.classfile.Method;
/**
* A BCEL visitor implementation to collect class dependency information
@@ -31,7 +35,7 @@ import com.sun.org.apache.bcel.internal.classfile.JavaClass;
*/
public class DependencyVisitor extends EmptyVisitor {
/** The collected dependencies */
- private Hashtable<String, String> dependencies = new Hashtable<String, String>();
+ private final Hashtable<String, String> dependencies = new Hashtable<String, String>();
/**
* The current class's constant pool - used to determine class names
* from class references.
@@ -58,7 +62,7 @@ public class DependencyVisitor extends EmptyVisitor {
*
* @param constantPool the constant pool of the class being visited.
*/
- public void visitConstantPool(ConstantPool constantPool) {
+ public void visitConstantPool(final ConstantPool constantPool) {
this.constantPool = constantPool;
}
@@ -67,8 +71,8 @@ public class DependencyVisitor extends EmptyVisitor {
*
* @param constantClass the constantClass entry for the class reference
*/
- public void visitConstantClass(ConstantClass constantClass) {
- String classname
+ public void visitConstantClass(final ConstantClass constantClass) {
+ final String classname
= constantClass.getConstantValue(constantPool).toString();
addSlashClass(classname);
}
@@ -80,18 +84,18 @@ public class DependencyVisitor extends EmptyVisitor {
*
* @param obj the name and type reference being visited.
*/
- public void visitConstantNameAndType(ConstantNameAndType obj) {
- String name = obj.getName(constantPool);
+ public void visitConstantNameAndType(final ConstantNameAndType obj) {
+ final String name = obj.getName(constantPool);
if (obj.getSignature(constantPool).equals("Ljava/lang/Class;")
&& name.startsWith("class$")) {
String classname
= name.substring("class$".length()).replace('$', '.');
// does the class have a package structure
- int index = classname.lastIndexOf(".");
+ final int index = classname.lastIndexOf(".");
if (index > 0) {
char start;
// check if the package structure is more than 1 level deep
- int index2 = classname.lastIndexOf(".", index - 1);
+ final int index2 = classname.lastIndexOf(".", index - 1);
if (index2 != -1) {
// class name has more than 1 package level 'com.company.Class'
start = classname.charAt(index2 + 1);
@@ -124,7 +128,7 @@ public class DependencyVisitor extends EmptyVisitor {
*
* @param field the field being visited
*/
- public void visitField(Field field) {
+ public void visitField(final Field field) {
addClasses(field.getSignature());
}
@@ -133,7 +137,7 @@ public class DependencyVisitor extends EmptyVisitor {
*
* @param javaClass the class being visited.
*/
- public void visitJavaClass(JavaClass javaClass) {
+ public void visitJavaClass(final JavaClass javaClass) {
addClass(javaClass.getClassName());
}
@@ -142,9 +146,9 @@ public class DependencyVisitor extends EmptyVisitor {
*
* @param method the method being visited.
*/
- public void visitMethod(Method method) {
- String signature = method.getSignature();
- int pos = signature.indexOf(")");
+ public void visitMethod(final Method method) {
+ final String signature = method.getSignature();
+ final int pos = signature.indexOf(")");
addClasses(signature.substring(1, pos));
addClasses(signature.substring(pos + 1));
}
@@ -154,7 +158,7 @@ public class DependencyVisitor extends EmptyVisitor {
*
* @param classname the class to be added to the list of dependencies.
*/
- void addClass(String classname) {
+ void addClass(final String classname) {
dependencies.put(classname, classname);
}
@@ -164,11 +168,11 @@ public class DependencyVisitor extends EmptyVisitor {
* @param string the descriptor string, being descriptors separated by
* ';' characters.
*/
- private void addClasses(String string) {
- StringTokenizer tokens = new StringTokenizer(string, ";");
+ private void addClasses(final String string) {
+ final StringTokenizer tokens = new StringTokenizer(string, ";");
while (tokens.hasMoreTokens()) {
- String descriptor = tokens.nextToken();
- int pos = descriptor.indexOf('L');
+ final String descriptor = tokens.nextToken();
+ final int pos = descriptor.indexOf('L');
if (pos != -1) {
addSlashClass(descriptor.substring(pos + 1));
}
@@ -181,7 +185,7 @@ public class DependencyVisitor extends EmptyVisitor {
*
* @param classname the class name in slash format
*/
- private void addSlashClass(String classname) {
+ private void addSlashClass(final String classname) {
addClass(classname.replace('/', '.'));
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/789422e1/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
index 643afaf..5c43376 100644
--- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
+++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
@@ -19,12 +19,14 @@
package org.apache.tools.ant.util.regexp;
import java.util.Vector;
-import java.util.regex.MatchResult;
+import org.apache.oro.text.regex.MatchResult;
+import org.apache.oro.text.regex.Pattern;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
import org.apache.tools.ant.BuildException;
+
/**
* Implementation of RegexpMatcher for Jakarta-ORO.
*
@@ -47,7 +49,7 @@ public class JakartaOroMatcher implements RegexpMatcher {
* Set the regexp pattern from the String description.
* @param pattern the pattern to match
*/
- public void setPattern(String pattern) {
+ public void setPattern(final String pattern) {
this.pattern = pattern;
}
@@ -65,13 +67,13 @@ public class JakartaOroMatcher implements RegexpMatcher {
* @return the compiled pattern
* @throws BuildException on error
*/
- protected Pattern getCompiledPattern(int options)
+ protected Pattern getCompiledPattern(final int options)
throws BuildException {
try {
// compute the compiler options based on the input options first
- Pattern p = compiler.compile(pattern, getCompilerOptions(options));
+ final Pattern p = compiler.compile(pattern, getCompilerOptions(options));
return p;
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new BuildException(e);
}
}
@@ -82,7 +84,7 @@ public class JakartaOroMatcher implements RegexpMatcher {
* @return true if the pattern matches
* @throws BuildException on error
*/
- public boolean matches(String argument) throws BuildException {
+ public boolean matches(final String argument) throws BuildException {
return matches(argument, MATCH_DEFAULT);
}
@@ -93,9 +95,9 @@ public class JakartaOroMatcher implements RegexpMatcher {
* @return true if the pattern matches
* @throws BuildException on error
*/
- public boolean matches(String input, int options)
+ public boolean matches(final String input, final int options)
throws BuildException {
- Pattern p = getCompiledPattern(options);
+ final Pattern p = getCompiledPattern(options);
return matcher.contains(input, p);
}
@@ -110,7 +112,7 @@ public class JakartaOroMatcher implements RegexpMatcher {
* @return the vector of groups
* @throws BuildException on error
*/
- public Vector getGroups(String argument) throws BuildException {
+ public Vector getGroups(final String argument) throws BuildException {
return getGroups(argument, MATCH_DEFAULT);
}
@@ -125,14 +127,14 @@ public class JakartaOroMatcher implements RegexpMatcher {
* @return the vector of groups
* @throws BuildException on error
*/
- public Vector getGroups(String input, int options)
+ public Vector getGroups(final String input, final int options)
throws BuildException {
if (!matches(input, options)) {
return null;
}
- Vector v = new Vector();
- MatchResult mr = matcher.getMatch();
- int cnt = mr.groups();
+ final Vector v = new Vector();
+ final MatchResult mr = matcher.getMatch();
+ final int cnt = mr.groups();
for (int i = 0; i < cnt; i++) {
String match = mr.group(i);
// treat non-matching groups as empty matches
@@ -149,7 +151,7 @@ public class JakartaOroMatcher implements RegexpMatcher {
* @param options the generic options
* @return the specific options
*/
- protected int getCompilerOptions(int options) {
+ protected int getCompilerOptions(final int options) {
int cOptions = Perl5Compiler.DEFAULT_MASK;
if (RegexpUtil.hasFlag(options, MATCH_CASE_INSENSITIVE)) {
http://git-wip-us.apache.org/repos/asf/ant/blob/789422e1/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
index 156b452..529a78a 100644
--- a/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
+++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroRegexp.java
@@ -18,6 +18,8 @@
package org.apache.tools.ant.util.regexp;
import org.apache.oro.text.regex.Perl5Substitution;
+import org.apache.oro.text.regex.Substitution;
+import org.apache.oro.text.regex.Util;
import org.apache.tools.ant.BuildException;
/***
@@ -40,10 +42,10 @@ public class JakartaOroRegexp extends JakartaOroMatcher implements Regexp {
* @return the result of the operation
* @throws BuildException on error
*/
- public String substitute(String input, String argument, int options)
+ public String substitute(final String input, final String argument, final int options)
throws BuildException {
// translate \1 to $1 so that the Perl5Substitution will work
- StringBuffer subst = new StringBuffer();
+ final StringBuffer subst = new StringBuffer();
for (int i = 0; i < argument.length(); i++) {
char c = argument.charAt(i);
if (c == '$') {
@@ -52,7 +54,7 @@ public class JakartaOroRegexp extends JakartaOroMatcher implements Regexp {
} else if (c == '\\') {
if (++i < argument.length()) {
c = argument.charAt(i);
- int value = Character.digit(c, DECIMAL);
+ final int value = Character.digit(c, DECIMAL);
if (value > -1) {
subst.append("$").append(value);
} else {
@@ -68,7 +70,7 @@ public class JakartaOroRegexp extends JakartaOroMatcher implements Regexp {
}
// Do the substitution
- Substitution s =
+ final Substitution s =
new Perl5Substitution(subst.toString(),
Perl5Substitution.INTERPOLATE_ALL);
return Util.substitute(matcher,
@@ -84,8 +86,8 @@ public class JakartaOroRegexp extends JakartaOroMatcher implements Regexp {
* @param options the ant regexp options
* @return the oro substition options
*/
- protected int getSubsOptions(int options) {
- boolean replaceAll = RegexpUtil.hasFlag(options, REPLACE_ALL);
+ protected int getSubsOptions(final int options) {
+ final boolean replaceAll = RegexpUtil.hasFlag(options, REPLACE_ALL);
int subsOptions = 1;
if (replaceAll) {
subsOptions = Util.SUBSTITUTE_ALL;