dion 2002/07/14 08:51:23
Modified: src/java/org/apache/maven XmlPomValidator.java
MavenUtils.java ProjectVerifier.java MavenTool.java
DVSLPathTool.java
Log:
Style violations
Revision Changes Path
1.7 +12 -12
jakarta-turbine-maven/src/java/org/apache/maven/XmlPomValidator.java
Index: XmlPomValidator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/XmlPomValidator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XmlPomValidator.java 27 May 2002 14:07:58 -0000 1.6
+++ XmlPomValidator.java 14 Jul 2002 15:51:23 -0000 1.7
@@ -144,8 +144,8 @@
parser.setFeature("http://xml.org/sax/features/namespaces";,
setNameSpaces);
- parser.setProperty("http://apache.org/xml/properties/schema/"; +
- "external-noNamespaceSchemaLocation",
+ parser.setProperty("http://apache.org/xml/properties/schema/";
+ + "external-noNamespaceSchemaLocation",
xmlSchema.getAbsolutePath());
// apache.org features and properties
@@ -188,9 +188,9 @@
*/
public void warning(SAXParseException ex)
{
- System.err.println("[Warning] " +
- getLocationString(ex) + ": " +
- ex.getMessage());
+ System.err.println("[Warning] "
+ + getLocationString(ex) + ": "
+ + ex.getMessage());
}
/**
@@ -200,9 +200,9 @@
*/
public void error(SAXParseException ex)
{
- System.err.println("[Error] " +
- getLocationString(ex) + ": " +
- ex.getMessage());
+ System.err.println("[Error] "
+ + getLocationString(ex) + ": "
+ + ex.getMessage());
}
/**
@@ -213,9 +213,9 @@
*/
public void fatalError(SAXParseException ex) throws SAXException
{
- System.err.println("[Fatal Error] " +
- getLocationString(ex) + ": " +
- ex.getMessage());
+ System.err.println("[Fatal Error] "
+ + getLocationString(ex) + ": "
+ + ex.getMessage());
}
/**
1.29 +5 -5 jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- MavenUtils.java 14 Jul 2002 15:40:48 -0000 1.28
+++ MavenUtils.java 14 Jul 2002 15:51:23 -0000 1.29
@@ -93,7 +93,7 @@
public static Project getProject(String projectDescriptor)
throws Exception
{
- return getProject( new File( projectDescriptor ) );
+ return getProject(new File(projectDescriptor));
}
/**
@@ -106,7 +106,7 @@
public static Project getProject(File projectDescriptor)
throws Exception
{
- BeanReader beanReader = createBeanReader( Project.class );
+ BeanReader beanReader = createBeanReader(Project.class);
return (Project) beanReader.parse(new FileInputStream(
projectDescriptor));
}
@@ -187,7 +187,7 @@
workspace.setProfile(profile);
// Create our set of project.
- for (Iterator i = profile.getProjectIds().iterator(); i.hasNext(); )
+ for (Iterator i = profile.getProjectIds().iterator(); i.hasNext();)
{
String projectId = (String) i.next();
// This should take care of any trailing slashes, or the directory
@@ -271,7 +271,7 @@
introspector.setNameMapper(new DecapitalizeNameMapper());
beanReader.setXMLIntrospector(introspector);
- beanReader.registerBeanClass( clazz );
+ beanReader.registerBeanClass(clazz);
return beanReader;
}
1.17 +18 -18
jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java
Index: ProjectVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ProjectVerifier.java 14 Jul 2002 15:40:48 -0000 1.16
+++ ProjectVerifier.java 14 Jul 2002 15:51:23 -0000 1.17
@@ -259,12 +259,12 @@
throws Exception
{
for (Iterator i = getMavenProject().getDependencies().iterator();
- i.hasNext(); )
+ i.hasNext();)
{
Dependency dependency = (Dependency) i.next();
String jar = dependency.getJar();
- File jarFile = new File( getMavenLocalRepo() + "/"
+ File jarFile = new File(getMavenLocalRepo() + "/"
+ dependency.getId() + "/jars/", jar);
if (jarFile.exists() == false || jar.endsWith("SNAPSHOT.jar"))
@@ -314,7 +314,7 @@
nonDistMap = getNonDistMap(f);
}
- for (Iterator i = failedDependencies.iterator(); i.hasNext(); )
+ for (Iterator i = failedDependencies.iterator(); i.hasNext();)
{
String dependency = (String) i.next();
File destinationFile = new File(getMavenLocalRepo(),
@@ -329,13 +329,13 @@
String downloadLocation = entry[0];
String additionalNotes = entry[1];
- warnings.append("---------------------------------" +
- "----------------\n");
+ warnings.append("---------------------------------"
+ + "----------------\n");
warnings.append("W A R N I N G\n");
- warnings.append("---------------------------------" +
- "---------------\n");
- warnings.append("The following JAR must be " +
- "downloaded manually:\n");
+ warnings.append("---------------------------------"
+ + "---------------\n");
+ warnings.append("The following JAR must be "
+ + "downloaded manually:\n");
warnings.append(dependency + "\n");
warnings.append("\n");
warnings.append("You can find the JAR here:\n");
@@ -349,11 +349,11 @@
if (!getRemoteFile(dependency, destinationFile))
{
- warnings.append("-------------------------------------" +
- "------------\n");
+ warnings.append("-------------------------------------"
+ + "------------\n");
warnings.append("W A R N I N G\n");
- warnings.append("-------------------------------------" +
- "-----------\n");
+ warnings.append("-------------------------------------"
+ + "-----------\n");
warnings.append("Failed to download dependent file ");
warnings.append(dependency);
warnings.append("\n\n");
@@ -411,8 +411,8 @@
catch (MalformedURLException mue)
{
mue.printStackTrace();
- log("Cannot retrieve " + remoteFile + " from " + remoteRepo +
- "; malformed URL");
+ log("Cannot retrieve " + remoteFile + " from " + remoteRepo
+ + "; malformed URL");
}
}
@@ -439,8 +439,8 @@
// Allow comments to be placed in the payload
// descriptor.
- if (line.startsWith("#") || line.startsWith("--") ||
- line.length() < 1)
+ if (line.startsWith("#") || line.startsWith("--")
+ || line.length() < 1)
{
continue;
}
1.11 +3 -3 jakarta-turbine-maven/src/java/org/apache/maven/MavenTool.java
Index: MavenTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MavenTool.java 14 Jul 2002 15:40:48 -0000 1.10
+++ MavenTool.java 14 Jul 2002 15:51:23 -0000 1.11
@@ -155,8 +155,8 @@
}
if (path == null)
{
- System.err.println("Unable to resolve " + resource +
- " using a base diretory of " + baseDir);
+ System.err.println("Unable to resolve " + resource
+ + " using a base diretory of " + baseDir);
}
return path;
}
@@ -200,7 +200,7 @@
{
List list = null;
Object key = null;
- for (Iterator index = counted.keySet().iterator(); index.hasNext(); )
+ for (Iterator index = counted.keySet().iterator(); index.hasNext();)
{
key = index.next();
list = (List) counted.get(key);
1.11 +5 -5
jakarta-turbine-maven/src/java/org/apache/maven/DVSLPathTool.java
Index: DVSLPathTool.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/DVSLPathTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DVSLPathTool.java 8 Jul 2002 21:37:08 -0000 1.10
+++ DVSLPathTool.java 14 Jul 2002 15:51:23 -0000 1.11
@@ -101,8 +101,8 @@
* Verify the arguments and make sure the filename is relative
* to the base directory.
*/
- if (basedir == null || basedir.length() == 0 || filename == null ||
- filename.length() == 0 || !filename.startsWith(basedir))
+ if (basedir == null || basedir.length() == 0 || filename == null
+ || filename.length() == 0 || !filename.startsWith(basedir))
{
return "";
}
@@ -294,8 +294,8 @@
}
else
{
- shortenedPath = packageName.replace('.', File.separatorChar) +
- File.separatorChar + clazz.getName() + ".java";
+ shortenedPath = packageName.replace('.', File.separatorChar)
+ + File.separatorChar + clazz.getName() + ".java";
}
return shortenedPath;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
