Browse Source

Make PMD a bit more happy

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273527 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
657f089143
8 changed files with 6 additions and 45 deletions
  1. +2
    -3
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
  2. +0
    -6
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
  3. +0
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
  4. +0
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
  5. +0
    -1
      src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
  6. +3
    -5
      src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
  7. +0
    -23
      src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
  8. +1
    -4
      src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java

+ 2
- 3
src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java View File

@@ -391,9 +391,8 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exe
* Generate stubs & sketelton for each home found into the DD * Generate stubs & sketelton for each home found into the DD
* Add all the generate class file into the ejb files * Add all the generate class file into the ejb files
* @param ithomes : iterator on home class * @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; Execute execTask = null;


execTask = new Execute(this); execTask = new Execute(this);
@@ -460,7 +459,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exe
} // end of if () } // end of if ()
} // end of while () } // end of while ()


buildBorlandStubs(homes.iterator(), files);
buildBorlandStubs(homes.iterator());


//add the gen files to the collection //add the gen files to the collection
files.putAll(_genfiles); files.putAll(_genfiles);


+ 0
- 6
src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java View File

@@ -88,12 +88,6 @@ public class EjbcHelper {
*/ */
private File manifestFile; private File manifestFile;
/**
* The classpath to be used in the weblogic ejbc calls. It must contain the weblogic
* classes <b>and</b> 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 source directory for the home and remote interfaces. This is used to determine if
* the generated deployment classes are out of date. * the generated deployment classes are out of date.


+ 0
- 2
src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java View File

@@ -1320,8 +1320,6 @@ public class IPlanetEjbc {
final String implFullClass = implementation.getQualifiedWithUnderscores(); final String implFullClass = implementation.getQualifiedWithUnderscores();
int index = 0; int index = 0;


String fullPath;

classnames[index++] = implPkg + "ejb_fac_" + implFullClass; classnames[index++] = implPkg + "ejb_fac_" + implFullClass;
classnames[index++] = implPkg + "ejb_home_" + implFullClass; classnames[index++] = implPkg + "ejb_home_" + implFullClass;
classnames[index++] = implPkg + "ejb_skel_" + implFullClass; classnames[index++] = implPkg + "ejb_skel_" + implFullClass;


+ 0
- 1
src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java View File

@@ -542,7 +542,6 @@ public class JonasDeploymentTool extends GenericDeploymentTool {
Java genicTask = null; // GenIC task Java genicTask = null; // GenIC task
String genicClass = null; // GenIC class (3 GenIC classes for various versions of JOnAS are supported) 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 ) { if ( nogenic ) {
return; return;


+ 0
- 1
src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java View File

@@ -133,7 +133,6 @@ public class VAJAntToolGUI extends Frame {
private Panel iContentsPane = null; private Panel iContentsPane = null;
private Panel iOptionenPanel = null; private Panel iOptionenPanel = null;
private Panel iCommandButtonPanel = null; private Panel iCommandButtonPanel = null;
private FlowLayout iCommandButtonPanelFlowLayout = null;
// Project name // Project name
private Label iProjectLabel = null; private Label iProjectLabel = null;
private Label iProjectText = null; private Label iProjectText = null;


+ 3
- 5
src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java View File

@@ -271,7 +271,7 @@ public class StarTeamCheckin extends TreeBasedTask {
for (int i = 0, size = stFiles.length; i < size; i++) { for (int i = 0, size = stFiles.length; i < size; i++) {
com.starbase.starteam.File stFile = com.starbase.starteam.File stFile =
(com.starbase.starteam.File) stFiles[i]; (com.starbase.starteam.File) stFiles[i];
processFile( stFile, targetFolder);
processFile(stFile);
ufm.removeControlledItem( ufm.removeControlledItem(
new java.io.File(targetFolder, stFile.getName())); 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 * @param targetFolder a java.io.File (Folder) to work
* @throws IOException when StarTeam API fails to work with files * @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(); String filename = eachFile.getName();


// If the file doesn't pass the include/exclude tests, skip it. // If the file doesn't pass the include/exclude tests, skip it.


+ 0
- 23
src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java View File

@@ -154,13 +154,6 @@ public abstract class TreeBasedTask extends StarTeamTask {


private Label labelInUse = null; 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. // GET/SET methods.
// Setters, of course are where ant user passes in values. // Setters, of course are where ant user passes in values.
@@ -441,22 +434,6 @@ public abstract class TreeBasedTask extends StarTeamTask {
return false; 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 * Finds and opens the root starteam folder of the operation specified
* by this task. This will be one of the following cases: * by this task. This will be one of the following cases:


+ 1
- 4
src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java View File

@@ -443,8 +443,6 @@ public class Symlink extends Task {
"UNIX system?)"); "UNIX system?)");
} }
} finally { } finally {
File old = new File(canstr);

// return the resource to its original name. // return the resource to its original name.
if (!temp.renameTo(canfil)) { if (!temp.renameTo(canfil)) {
throw new IOException("Couldn't return resource " + temp + throw new IOException("Couldn't return resource " + temp +
@@ -631,9 +629,8 @@ public class Symlink extends Task {
FileSet fsTemp = (FileSet) fileSets.elementAt(i); FileSet fsTemp = (FileSet) fileSets.elementAt(i);
String workingDir = null; String workingDir = null;
Vector links = new Vector(); Vector links = new Vector();
Vector nolinks = new Vector();
Vector linksFiles = new Vector(); Vector linksFiles = new Vector();
Enumeration enumNoLinks, enumLinks;
Enumeration enumLinks;


DirectoryScanner ds; DirectoryScanner ds;




Loading…
Cancel
Save