You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/11/01 23:31:10 UTC
svn commit: r709791 - in
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability:
ArtifactResolverDiagnoser.java SystemWarnings.java
plugin/ExpressionDocumentationException.java plugin/ExpressionDocumenter.java
Author: hboutemy
Date: Sat Nov 1 15:31:10 2008
New Revision: 709791
URL: http://svn.apache.org/viewvc?rev=709791&view=rev
Log:
fixed minor source formatting issues (merged from 2.1.x branch r709789)
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/SystemWarnings.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java?rev=709791&r1=709790&r2=709791&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/ArtifactResolverDiagnoser.java Sat Nov 1 15:31:10 2008
@@ -47,9 +47,9 @@
message.append( "Failed to resolve artifact." );
message.append( "\n\n" );
message.append( exception.getMessage() );
-
+
IOException ioe = (IOException) DiagnosisUtils.getFromCausality( exception, IOException.class );
-
+
if ( ioe != null && exception.getMessage().indexOf( ioe.getMessage() ) < 0 )
{
message.append( "\n\nCaused by I/O exception: " ).append( ioe.getMessage() );
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/SystemWarnings.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/SystemWarnings.java?rev=709791&r1=709790&r2=709791&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/SystemWarnings.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/SystemWarnings.java Sat Nov 1 15:31:10 2008
@@ -1,4 +1,6 @@
-package org.apache.maven.usability;/*
+package org.apache.maven.usability;
+
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java?rev=709791&r1=709790&r2=709791&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumentationException.java Sat Nov 1 15:31:10 2008
@@ -1,4 +1,6 @@
-package org.apache.maven.usability.plugin;/*
+package org.apache.maven.usability.plugin;
+
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java?rev=709791&r1=709790&r2=709791&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java Sat Nov 1 15:31:10 2008
@@ -52,7 +52,7 @@
if ( expressionDocumentation == null )
{
expressionDocumentation = new HashMap();
-
+
ClassLoader docLoader = initializeDocLoader();
for ( int i = 0; i < EXPRESSION_ROOTS.length; i++ )
@@ -84,7 +84,7 @@
}
}
}
-
+
return expressionDocumentation;
}
@@ -117,25 +117,25 @@
throws IOException, XmlPullParserException
{
Reader reader = new BufferedReader( ReaderFactory.newXmlReader( docStream ) );
-
+
ParamdocXpp3Reader paramdocReader = new ParamdocXpp3Reader();
-
+
ExpressionDocumentation documentation = paramdocReader.read( reader, true );
-
+
List expressions = documentation.getExpressions();
-
+
Map bySyntax = new HashMap();
-
+
if ( expressions != null && !expressions.isEmpty() )
{
for ( Iterator it = expressions.iterator(); it.hasNext(); )
{
Expression expr = (Expression) it.next();
-
+
bySyntax.put( expr.getSyntax(), expr );
}
}
-
+
return bySyntax;
}
@@ -143,13 +143,13 @@
throws ExpressionDocumentationException
{
String myResourcePath = ExpressionDocumenter.class.getName().replace( '.', '/' ) + ".class";
-
+
URL myResource = ExpressionDocumenter.class.getClassLoader().getResource( myResourcePath );
String myClasspathEntry = myResource.getPath();
-
+
myClasspathEntry = myClasspathEntry.substring( 0, myClasspathEntry.length() - ( myResourcePath.length() + 2 ) );
-
+
if ( myClasspathEntry.startsWith( "file:" ) )
{
myClasspathEntry = myClasspathEntry.substring( "file:".length() );