conor 2003/07/17 03:36:29
Modified: src/main/org/apache/tools/ant/loader AntClassLoader2.java
src/main/org/apache/tools/ant/taskdefs Definer.java
src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool
FieldRefCPInfo.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
BorlandDeploymentTool.java DDCreator.java
DDCreatorHelper.java DescriptorHandler.java
EJBDeploymentTool.java EjbJar.java EjbcHelper.java
InnerClassFilenameFilter.java
JbossDeploymentTool.java
WeblogicDeploymentTool.java
WeblogicTOPLinkDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/vss
MSVSS.java MSVSSADD.java MSVSSCHECKOUT.java
MSVSSGET.java
Log:
style
Revision Changes Path
1.7 +49 -49
ant/src/main/org/apache/tools/ant/loader/AntClassLoader2.java
Index: AntClassLoader2.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/loader/AntClassLoader2.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -u -r1.6 -r1.7
1.37 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Definer.java
Index: Definer.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Definer.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -u -r1.36 -r1.37
--- Definer.java 14 Jul 2003 13:42:32 -0000 1.36
+++ Definer.java 17 Jul 2003 10:36:27 -0000 1.37
@@ -460,7 +460,7 @@
/**
* Set the classname of the class that the definition
* must be compatible with, either directly or
- * by use of the adapeter class.
+ * by use of the adapter class.
*
* @param adaptTo the name of the adaptto class
*/
1.9 +4 -4
ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java
Index: FieldRefCPInfo.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.23 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
Index: BorlandDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -w -u -r1.22 -r1.23
1.20 +13 -13
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
Index: DDCreator.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
1.13 +15 -15
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java
Index: DDCreatorHelper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.28 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java
Index: DescriptorHandler.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -w -u -r1.27 -r1.28
1.15 +5 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
Index: EJBDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -u -r1.14 -r1.15
1.42 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
Index: EjbJar.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -w -u -r1.41 -r1.42
1.20 +36 -36
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java
Index: EjbcHelper.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
1.9 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java
Index: InnerClassFilenameFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
1.13 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
Index: JbossDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.50 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
Index: WeblogicDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -w -u -r1.49 -r1.50
1.16 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java
Index: WeblogicTOPLinkDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -u -r1.15 -r1.16
1.33 +19 -30
ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -w -u -r1.32 -r1.33
--- MSVSS.java 4 Jul 2003 15:51:53 -0000 1.32
+++ MSVSS.java 17 Jul 2003 10:36:28 -0000 1.33
@@ -216,10 +216,9 @@
* Executes the task. <br>
* Builds a command line to execute ss.exe and then calls Exec's run
method
* to execute the command line.
- * @throws BuildException
+ * @throws BuildException if the command cannot execute.
*/
- public void execute()
- throws BuildException {
+ public void execute() throws BuildException {
int result = 0;
Commandline commandLine = buildCmdLine();
result = run(commandLine);
@@ -382,12 +381,10 @@
String label = m_Label.substring(0, 30);
log("Label is longer than 31 characters, truncated to: " +
label, Project.MSG_WARN);
return FLAG_LABEL + label;
- }
- else {
+ } else {
return FLAG_LABEL + m_Label;
}
- }
- else {
+ } else {
return "";
}
}
@@ -410,11 +407,9 @@
protected String getVersionDateLabel() {
if (m_Version != null) {
return FLAG_VERSION + m_Version;
- }
- else if (m_Date != null) {
+ } else if (m_Date != null) {
return FLAG_VERSION_DATE + m_Date;
- }
- else {
+ } else {
// Use getLabel() so labels longer then 30 char are truncated
// and the user is warned
String label = getLabel();
@@ -618,14 +613,11 @@
public String getFileTimeStamp() {
if (m_timestamp == null) {
return "";
- }
- else if (m_timestamp.getValue().equals(TIME_MODIFIED)) {
+ } else if (m_timestamp.getValue().equals(TIME_MODIFIED)) {
return FLAG_FILETIME_MODIFIED;
- }
- else if (m_timestamp.getValue().equals(TIME_UPDATED)) {
+ } else if (m_timestamp.getValue().equals(TIME_UPDATED)) {
return FLAG_FILETIME_UPDATED;
- }
- else {
+ } else {
return FLAG_FILETIME_DEF;
}
}
@@ -638,17 +630,14 @@
public String getWritableFiles() {
if (m_writablefiles == null) {
return "";
- }
- else if (m_writablefiles.getValue().equals(WRITABLE_REPLACE)) {
+ } else if (m_writablefiles.getValue().equals(WRITABLE_REPLACE)) {
return FLAG_REPLACE_WRITABLE;
- }
- else if (m_writablefiles.getValue().equals(WRITABLE_SKIP)) {
+ } else if (m_writablefiles.getValue().equals(WRITABLE_SKIP)) {
// ss.exe exits with '100', when files have been skipped
// so we have to ignore the failure
m_FailOnError = false;
return FLAG_SKIP_WRITABLE;
- }
- else {
+ } else {
return "";
}
}
1.13 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.java
Index: MSVSSADD.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -u -r1.12 -r1.13
1.18 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
Index: MSVSSCHECKOUT.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -u -r1.17 -r1.18
1.27 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
Index: MSVSSGET.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -u -r1.26 -r1.27
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
