bodewig 2002/11/08 08:37:44
Modified: src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandDeploymentTool.java EjbcHelper.java
IPlanetEjbc.java JonasDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/ide
VAJAntToolGUI.java
src/main/org/apache/tools/ant/taskdefs/optional/starteam
StarTeamCheckin.java TreeBasedTask.java
src/main/org/apache/tools/ant/taskdefs/optional/unix
Symlink.java
Log:
Make PMD a bit more happy
Revision Changes Path
1.20 +2 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Index: BorlandDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- BorlandDeploymentTool.java 25 Jul 2002 15:21:13 -0000 1.19
+++ BorlandDeploymentTool.java 8 Nov 2002 16:37:44 -0000 1.20
@@ -391,9 +391,8 @@
* 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 @@
} // end of if ()
} // end of while ()
- buildBorlandStubs(homes.iterator(), files);
+ buildBorlandStubs(homes.iterator());
//add the gen files to the collection
files.putAll(_genfiles);
1.18 +0 -6
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
Index: EjbcHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EjbcHelper.java 25 Jul 2002 15:21:13 -0000 1.17
+++ EjbcHelper.java 8 Nov 2002 16:37:44 -0000 1.18
@@ -89,12 +89,6 @@
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 generated deployment classes are out of date.
*/
1.13 +0 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java
Index: IPlanetEjbc.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- IPlanetEjbc.java 25 Jul 2002 15:21:13 -0000 1.12
+++ IPlanetEjbc.java 8 Nov 2002 16:37:44 -0000 1.13
@@ -1320,8 +1320,6 @@
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;
1.7 +0 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java
Index: JonasDeploymentTool.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JonasDeploymentTool.java 25 Jul 2002 15:21:13 -0000 1.6
+++ JonasDeploymentTool.java 8 Nov 2002 16:37:44 -0000 1.7
@@ -542,7 +542,6 @@
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;
1.16 +0 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
Index: VAJAntToolGUI.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- VAJAntToolGUI.java 25 Jul 2002 15:21:15 -0000 1.15
+++ VAJAntToolGUI.java 8 Nov 2002 16:37:44 -0000 1.16
@@ -133,7 +133,6 @@
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;
1.9 +3 -5
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java
Index: StarTeamCheckin.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- StarTeamCheckin.java 6 Nov 2002 11:07:09 -0000 1.8
+++ StarTeamCheckin.java 8 Nov 2002 16:37:44 -0000 1.9
@@ -271,7 +271,7 @@
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 @@
* @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.
1.12 +0 -23
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
Index: TreeBasedTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TreeBasedTask.java 6 Nov 2002 11:07:09 -0000 1.11
+++ TreeBasedTask.java 8 Nov 2002 16:37:44 -0000 1.12
@@ -154,13 +154,6 @@
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.
@@ -439,22 +432,6 @@
}
}
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();
-
}
/**
1.2 +2 -5
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java
Index: Symlink.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/Symlink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Symlink.java 6 Nov 2002 15:07:23 -0000 1.1
+++ Symlink.java 8 Nov 2002 16:37:44 -0000 1.2
@@ -443,8 +443,6 @@
"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 @@
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;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
