From 657f089143cab96b011611bbacbe57fcee8137b7 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 8 Nov 2002 16:37:44 +0000 Subject: [PATCH] Make PMD a bit more happy git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273527 13f79535-47bb-0310-9956-ffa450edef68 --- .../optional/ejb/BorlandDeploymentTool.java | 5 ++-- .../ant/taskdefs/optional/ejb/EjbcHelper.java | 6 ----- .../taskdefs/optional/ejb/IPlanetEjbc.java | 2 -- .../optional/ejb/JonasDeploymentTool.java | 1 - .../taskdefs/optional/ide/VAJAntToolGUI.java | 1 - .../optional/starteam/StarTeamCheckin.java | 8 +++---- .../optional/starteam/TreeBasedTask.java | 23 ------------------- .../ant/taskdefs/optional/unix/Symlink.java | 5 +--- 8 files changed, 6 insertions(+), 45 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java index 4d62c50ec..27655bb37 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java @@ -391,9 +391,8 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exe * Generate stubs & sketelton for each home found into the DD * Add all the generate class file into the ejb files * @param ithomes : iterator on home class - * @param files : file list , updated by the adding generated files */ - private void buildBorlandStubs(Iterator ithomes, Hashtable files) { + private void buildBorlandStubs(Iterator ithomes) { Execute execTask = null; execTask = new Execute(this); @@ -460,7 +459,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exe } // end of if () } // end of while () - buildBorlandStubs(homes.iterator(), files); + buildBorlandStubs(homes.iterator()); //add the gen files to the collection files.putAll(_genfiles); diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java index 652995407..99fb83553 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java @@ -88,12 +88,6 @@ public class EjbcHelper { */ private File manifestFile; - /** - * The classpath to be used in the weblogic ejbc calls. It must contain the weblogic - * classes and the implementation classes of the home and remote interfaces. - */ - private String classpath; - /** * The source directory for the home and remote interfaces. This is used to determine if * the generated deployment classes are out of date. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java index dc0aa52f0..0beb5794e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java @@ -1320,8 +1320,6 @@ public class IPlanetEjbc { final String implFullClass = implementation.getQualifiedWithUnderscores(); int index = 0; - String fullPath; - classnames[index++] = implPkg + "ejb_fac_" + implFullClass; classnames[index++] = implPkg + "ejb_home_" + implFullClass; classnames[index++] = implPkg + "ejb_skel_" + implFullClass; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java index 2b6a30ad0..343224515 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java @@ -542,7 +542,6 @@ public class JonasDeploymentTool extends GenericDeploymentTool { Java genicTask = null; // GenIC task String genicClass = null; // GenIC class (3 GenIC classes for various versions of JOnAS are supported) - boolean error = false; // true if an error occurs during the GenIC call if ( nogenic ) { return; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java index 7300b1e41..28ad74cf3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java @@ -133,7 +133,6 @@ public class VAJAntToolGUI extends Frame { private Panel iContentsPane = null; private Panel iOptionenPanel = null; private Panel iCommandButtonPanel = null; - private FlowLayout iCommandButtonPanelFlowLayout = null; // Project name private Label iProjectLabel = null; private Label iProjectText = null; diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java index 2cf5850e5..044cef7b2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java @@ -271,7 +271,7 @@ public class StarTeamCheckin extends TreeBasedTask { for (int i = 0, size = stFiles.length; i < size; i++) { com.starbase.starteam.File stFile = (com.starbase.starteam.File) stFiles[i]; - processFile( stFile, targetFolder); + processFile(stFile); ufm.removeControlledItem( new java.io.File(targetFolder, stFile.getName())); @@ -310,10 +310,8 @@ public class StarTeamCheckin extends TreeBasedTask { * @param targetFolder a java.io.File (Folder) to work * @throws IOException when StarTeam API fails to work with files */ - private void processFile(com.starbase.starteam.File eachFile, - java.io.File targetFolder ) - throws IOException - { + private void processFile(com.starbase.starteam.File eachFile) + throws IOException { String filename = eachFile.getName(); // If the file doesn't pass the include/exclude tests, skip it. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java index 2ec2cae35..beeb90eb1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java @@ -154,13 +154,6 @@ public abstract class TreeBasedTask extends StarTeamTask { private Label labelInUse = null; - /** - * holds a list of local files against which files in the repository - * will be compared for addition on checkins or deletion on checkouts if - * the proper options have been set. - */ - private Hashtable localFileList = new Hashtable(); - /////////////////////////////////////////////////////////////// // GET/SET methods. // Setters, of course are where ant user passes in values. @@ -441,22 +434,6 @@ public abstract class TreeBasedTask extends StarTeamTask { return false; } - /** - * gets a url representing the root of the view. - * - * @return a url corresponding to the root of the starteam view tree, useful for - * starteam lookups - */ - private final String getRootStarteamURL() { - StringBuffer buf = new StringBuffer(getViewURL()); - if (!this.rootStarteamFolder.startsWith("/")) { - buf.append("/"); - } - buf.append(this.rootStarteamFolder); - return buf.toString(); - - } - /** * Finds and opens the root starteam folder of the operation specified * by this task. This will be one of the following cases: diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java index 93078d9da..a42457c4d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java @@ -443,8 +443,6 @@ public class Symlink extends Task { "UNIX system?)"); } } finally { - File old = new File(canstr); - // return the resource to its original name. if (!temp.renameTo(canfil)) { throw new IOException("Couldn't return resource " + temp + @@ -631,9 +629,8 @@ public class Symlink extends Task { FileSet fsTemp = (FileSet) fileSets.elementAt(i); String workingDir = null; Vector links = new Vector(); - Vector nolinks = new Vector(); Vector linksFiles = new Vector(); - Enumeration enumNoLinks, enumLinks; + Enumeration enumLinks; DirectoryScanner ds;