You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2021/04/18 08:25:38 UTC
[maven-jxr] 03/04: Ensure prototypes are respected
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch JXR-145
in repository https://gitbox.apache.org/repos/asf/maven-jxr.git
commit a1e38b62dde84c66690a9b4a6d2f689a2d82621d
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Apr 17 19:53:14 2021 +0200
Ensure prototypes are respected
---
.../src/main/java/org/apache/maven/jxr/JXR.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java b/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
index 3b81bc9..325bbd0 100644
--- a/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
+++ b/maven-jxr/src/main/java/org/apache/maven/jxr/JXR.java
@@ -124,7 +124,8 @@ public class JXR
//now get the list of included files
String[] files = ds.getIncludedFiles();
- Map<String, CodeTransformer> transformerForExtension = new HashMap<>();
+ // < file-extension, named key >, this way we will let DI decide if we get the singleton or a new instance
+ Map<String, String> transformerForExtension = new HashMap<>();
for ( String file : files )
{
@@ -132,25 +133,26 @@ public class JXR
String fileExtension = getExtension( sourceFile );
- CodeTransformer transformer = transformerForExtension.get( fileExtension );
+ String transformerName = transformerForExtension.get( fileExtension );
if ( !transformerForExtension.containsKey( fileExtension ) )
{
- for ( CodeTransformer ct : transformers.values() )
+ for ( Map.Entry<String, CodeTransformer> ct : transformers.entrySet() )
{
- if ( ct.canTransform( fileExtension ) )
+ if ( ct.getValue().canTransform( fileExtension ) )
{
- transformer = ct;
+ transformerName = ct.getKey();
break;
}
}
- transformerForExtension.put( fileExtension, transformer );
+ transformerForExtension.put( fileExtension, transformerName );
}
- if ( transformer != null )
+ if ( transformerName != null )
{
String newFileName = file.replaceFirst( fileExtension + '$', ".html" );
- transform( transformer, sourceFile, this.destDir.resolve( newFileName ), bottom );
+ transform( transformers.get( transformerName ), sourceFile, this.destDir.resolve( newFileName ),
+ bottom );
}
}
}
@@ -254,8 +256,6 @@ public class JXR
{
LOGGER.debug( sourceFile + " -> " + destFile );
- fileManager.getFile( sourceFile );
-
// get a relative link to the javadocs
Path javadoc = javadocLinkDir != null ? getRelativeLink( destFile.getParent(), javadocLinkDir ) : null;
transformer.transform( fileManager.getFile( sourceFile ), destFile, locale, outputEncoding, javadoc, bottom );