You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2020/07/29 13:40:01 UTC
[ant] branch master updated: Remove duplicated code
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
The following commit(s) were added to refs/heads/master by this push:
new eefeb61 Remove duplicated code
new 40d9c2b Merge pull request #115 from twogee/duplications
eefeb61 is described below
commit eefeb6158aa54a8ff24a4bbc3b084d2f2d9ad50c
Author: twogee <g....@gmail.com>
AuthorDate: Sun Jan 12 12:17:45 2020 +0100
Remove duplicated code
---
src/main/org/apache/tools/ant/Main.java | 9 +++------
src/main/org/apache/tools/ant/PropertyHelper.java | 3 +--
.../apache/tools/ant/listener/CommonsLoggingListener.java | 2 --
src/main/org/apache/tools/ant/listener/Log4jListener.java | 2 --
src/main/org/apache/tools/ant/taskdefs/KeySubst.java | 6 ++----
src/main/org/apache/tools/ant/taskdefs/Zip.java | 4 +---
.../org/apache/tools/ant/taskdefs/condition/Http.java | 2 --
.../ant/taskdefs/optional/jlink/ClassNameReader.java | 10 ++++------
.../org/apache/tools/ant/taskdefs/optional/net/FTP.java | 15 ++++-----------
.../ant/taskdefs/optional/net/FTPTaskMirrorImpl.java | 12 ++++--------
.../tools/ant/util/depend/bcel/DependencyVisitor.java | 9 ++-------
11 files changed, 21 insertions(+), 53 deletions(-)
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index a9a540c..18feef8 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -440,9 +440,6 @@ public class Main implements AntMain {
if (searchForFile) {
if (searchForThis != null) {
buildFile = findBuildFile(System.getProperty("user.dir"), searchForThis);
- if (buildFile == null) {
- throw new BuildException("Could not locate a build file!");
- }
} else {
// no search file specified: so search an existing default file
final Iterator<ProjectHelper> it = ProjectHelperRepository.getInstance().getHelpers();
@@ -454,9 +451,9 @@ public class Main implements AntMain {
}
buildFile = findBuildFile(System.getProperty("user.dir"), searchForThis);
} while (buildFile == null && it.hasNext());
- if (buildFile == null) {
- throw new BuildException("Could not locate a build file!");
- }
+ }
+ if (buildFile == null) {
+ throw new BuildException("Could not locate a build file!");
}
} else {
// no build file specified: so search an existing default file
diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java
index 94a031f..154ffdf 100644
--- a/src/main/org/apache/tools/ant/PropertyHelper.java
+++ b/src/main/org/apache/tools/ant/PropertyHelper.java
@@ -1048,12 +1048,11 @@ public class PropertyHelper implements GetProperty {
if (value.charAt(pos + 1) == '$') {
//backwards compatibility two $ map to one mode
fragments.addElement("$");
- prev = pos + 2;
} else {
//new behaviour: $X maps to $X for all values of X!='$'
fragments.addElement(value.substring(pos, pos + 2));
- prev = pos + 2;
}
+ prev = pos + 2;
} else {
//property found, extract its name or bail on a typo
int endName = value.indexOf('}', pos);
diff --git a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
index 96fd274..f813eba 100644
--- a/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
+++ b/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
@@ -282,8 +282,6 @@ public class CommonsLoggingListener implements BuildListener, BuildLogger {
}
break;
case Project.MSG_VERBOSE:
- log.debug(message);
- break;
case Project.MSG_DEBUG:
log.debug(message);
break;
diff --git a/src/main/org/apache/tools/ant/listener/Log4jListener.java b/src/main/org/apache/tools/ant/listener/Log4jListener.java
index 3720d85..169fdf5 100644
--- a/src/main/org/apache/tools/ant/listener/Log4jListener.java
+++ b/src/main/org/apache/tools/ant/listener/Log4jListener.java
@@ -155,8 +155,6 @@ public class Log4jListener implements BuildListener {
log.info(event.getMessage());
break;
case Project.MSG_VERBOSE:
- log.debug(event.getMessage());
- break;
case Project.MSG_DEBUG:
log.debug(event.getMessage());
break;
diff --git a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
index 9095c5e..6424868 100644
--- a/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
+++ b/src/main/org/apache/tools/ant/taskdefs/KeySubst.java
@@ -72,13 +72,11 @@ public class KeySubst extends Task {
String newline = null;
line = br.readLine();
while (line != null) {
- if (line.isEmpty()) {
- bw.newLine();
- } else {
+ if (!line.isEmpty()) {
newline = KeySubst.replace(line, replacements);
bw.write(newline);
- bw.newLine();
}
+ bw.newLine();
line = br.readLine();
}
bw.flush();
diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java
index 9efae6d..aa95aa2 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -623,10 +623,8 @@ public class Zip extends MatchingTask {
skipWriting = true;
executeMain();
skipWriting = false;
- executeMain();
- } else {
- executeMain();
}
+ executeMain();
}
/**
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
index 0eb79c3..1219fab 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
@@ -136,8 +136,6 @@ public class Http extends ProjectComponent implements Condition {
} catch (ProtocolException pe) {
throw new BuildException("Invalid HTTP protocol: "
+ requestMethod, pe);
- } catch (SocketTimeoutException ste) {
- return false;
} catch (IOException e) {
return false;
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
index 0a44ec0..dbe2447 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.java
@@ -64,6 +64,10 @@ class ConstantPool {
break;
case INTEGER :
+ case FIELDREF :
+ case METHODREF :
+ case INTERFACEMETHODREF :
+ case NAMEANDTYPE :
values[i] = data.readInt();
break;
@@ -86,12 +90,6 @@ class ConstantPool {
values[i] = data.readUnsignedShort();
break;
- case FIELDREF :
- case METHODREF :
- case INTERFACEMETHODREF :
- case NAMEANDTYPE :
- values[i] = data.readInt();
- break;
default:
// Do nothing
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 90bb9a1..5e2c935 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -561,9 +561,6 @@ public class FTP extends Task implements FTPTaskConfig {
}
ftp.changeToParentDirectory();
- } catch (FTPConnectionClosedException ftpcce) {
- throw new BuildException("Error while communicating with FTP "
- + "server: ", ftpcce);
} catch (IOException e) {
throw new BuildException("Error while communicating with FTP "
+ "server: ", e);
@@ -2535,16 +2532,12 @@ public class FTP extends Task implements FTPTaskConfig {
if (binary) {
ftp.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE);
- if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
- throw new BuildException("could not set transfer type: %s",
- ftp.getReplyString());
- }
} else {
ftp.setFileType(org.apache.commons.net.ftp.FTP.ASCII_FILE_TYPE);
- if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
- throw new BuildException("could not set transfer type: %s",
- ftp.getReplyString());
- }
+ }
+ if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
+ throw new BuildException("could not set transfer type: %s",
+ ftp.getReplyString());
}
if (passive) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index aec12cc..db63d95 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -1812,16 +1812,12 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
if (task.isBinary()) {
ftp.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE);
- if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
- throw new BuildException("could not set transfer type: %s",
- ftp.getReplyString());
- }
} else {
ftp.setFileType(org.apache.commons.net.ftp.FTP.ASCII_FILE_TYPE);
- if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
- throw new BuildException("could not set transfer type: %s",
- ftp.getReplyString());
- }
+ }
+ if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
+ throw new BuildException("could not set transfer type: %s",
+ ftp.getReplyString());
}
if (task.isPassive()) {
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 37e7a21..db1069b 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
@@ -115,16 +115,11 @@ public class DependencyVisitor extends EmptyVisitor {
// is upper case ascii. so according to the spec it's an inner class
classname = classname.substring(0, index) + "$"
+ classname.substring(index + 1);
- addClass(classname);
- } else {
- // Add the class in dotted notation 'com.company.Class'
- addClass(classname);
}
// CheckStyle:MagicNumber ON
- } else {
- // Add a class with no package 'Class'
- addClass(classname);
}
+ // Add the class, with or without the package name
+ addClass(classname);
}
}