Skip to content

Commit

Permalink
fix lines
Browse files Browse the repository at this point in the history
  • Loading branch information
XenoAmess committed Jun 6, 2020
1 parent edcf481 commit ab752e1
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
Expand Up @@ -6067,9 +6067,11 @@ private URL getResource( final List<String> classPath, final String resource )
}
}
URL resourceURL = null;
try ( URLClassLoader javadocClassLoader = new URLClassLoader( urls.toArray( new URL[urls.size()] ), null ) ) {
try ( URLClassLoader javadocClassLoader = new URLClassLoader( urls.toArray( new URL[urls.size()] ), null ) )
{
resourceURL = javadocClassLoader.getResource( resource );
} catch ( IOException e ) {
} catch ( IOException e )
{
// ignore
}
return resourceURL;
Expand Down
22 changes: 15 additions & 7 deletions src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
Expand Up @@ -275,7 +275,9 @@ protected static String quotedPathArgument( String value )
}
pathBuilder.append( '\'' );
path = pathBuilder.toString();
} else {
}
else
{
path = "'" + path + "'";
}
}
Expand Down Expand Up @@ -534,7 +536,8 @@ else if ( StringUtils.isNotEmpty( out.getOutput() ) )
throw new IllegalArgumentException( "No output found from the command line 'javadoc -J-version'" );
}

private static final Pattern EXTRACT_JAVADOC_VERSION_PATTERN = Pattern.compile( "(?s).*?[^a-zA-Z](([0-9]+\\.?[0-9]*)(\\.[0-9]+)?).*" );
private static final Pattern EXTRACT_JAVADOC_VERSION_PATTERN =
Pattern.compile( "(?s).*?[^a-zA-Z](([0-9]+\\.?[0-9]*)(\\.[0-9]+)?).*" );

/**
* Parse the output for 'javadoc -J-version' and return the javadoc version recognized. <br>
Expand Down Expand Up @@ -596,15 +599,20 @@ protected static String extractJavadocVersion( String output )
return matcher.group( 1 );
}

private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_0 = Pattern.compile( "^\\s*(\\d+)\\s*?\\s*$" );
private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_0 =
Pattern.compile( "^\\s*(\\d+)\\s*?\\s*$" );

private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_1 = Pattern.compile( "^\\s*(\\d+)\\s*k(b)?\\s*$", Pattern.CASE_INSENSITIVE );
private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_1 =
Pattern.compile( "^\\s*(\\d+)\\s*k(b)?\\s*$", Pattern.CASE_INSENSITIVE );

private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_2 = Pattern.compile( "^\\s*(\\d+)\\s*m(b)?\\s*$", Pattern.CASE_INSENSITIVE );
private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_2 =
Pattern.compile( "^\\s*(\\d+)\\s*m(b)?\\s*$", Pattern.CASE_INSENSITIVE );

private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_3 = Pattern.compile( "^\\s*(\\d+)\\s*g(b)?\\s*$", Pattern.CASE_INSENSITIVE );
private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_3 =
Pattern.compile( "^\\s*(\\d+)\\s*g(b)?\\s*$", Pattern.CASE_INSENSITIVE );

private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_4 = Pattern.compile( "^\\s*(\\d+)\\s*t(b)?\\s*$", Pattern.CASE_INSENSITIVE );
private static final Pattern PARSE_JAVADOC_MEMORY_PATTERN_4 =
Pattern.compile( "^\\s*(\\d+)\\s*t(b)?\\s*$", Pattern.CASE_INSENSITIVE );

/**
* Parse a memory string which be used in the JVM arguments <code>-Xms</code> or <code>-Xmx</code>. <br>
Expand Down

0 comments on commit ab752e1

Please sign in to comment.