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:37 UTC
[maven-jxr] 02/04: Remove fileManager from JavaCodeTransform
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 b1a27bf534e9ec31e48bdb635e2478ce0a33f8ef
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Apr 17 17:57:21 2021 +0200
Remove fileManager from JavaCodeTransform
---
.../src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java | 2 +-
maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java | 3 +--
maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java | 2 +-
maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java | 2 +-
.../src/test/java/org/apache/maven/jxr/JavaCodeTransformTest.java | 2 +-
maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java | 2 +-
6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
index 386d68c..199571a 100644
--- a/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
+++ b/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
@@ -270,7 +270,7 @@ public abstract class AbstractJxrReport
{
FileManager fileManager = new FileManager();
PackageManager packageManager = new PackageManager( fileManager );
- CodeTransformer codeTransform = new JavaCodeTransform( packageManager, fileManager );
+ CodeTransformer codeTransform = new JavaCodeTransform( packageManager );
JXR jxr = new JXR( packageManager, fileManager, Collections.singletonMap( "java", codeTransform ) );
jxr.setDest( Paths.get( destinationDirectory ) );
diff --git a/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java b/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
index 67f5080..420ba19 100644
--- a/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
+++ b/maven-jxr/src/main/java/org/apache/maven/jxr/JavaCodeTransform.java
@@ -60,7 +60,6 @@ import javax.inject.Named;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.jxr.pacman.ClassType;
-import org.apache.maven.jxr.pacman.FileManager;
import org.apache.maven.jxr.pacman.ImportType;
import org.apache.maven.jxr.pacman.JavaFile;
import org.apache.maven.jxr.pacman.PackageManager;
@@ -269,7 +268,7 @@ public class JavaCodeTransform
}
@Inject
- public JavaCodeTransform( PackageManager packageManager, FileManager fileManager )
+ public JavaCodeTransform( PackageManager packageManager )
{
this.packageManager = packageManager;
}
diff --git a/maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java b/maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java
index 1c7d9ae..4decfa7 100644
--- a/maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java
+++ b/maven-jxr/src/test/java/org/apache/maven/jxr/IncludeExcludeTest.java
@@ -47,7 +47,7 @@ public class IncludeExcludeTest
{
FileManager fileManager = new FileManager();
PackageManager packageManager = new PackageManager( fileManager );
- CodeTransformer codeTransform = new JavaCodeTransform( packageManager, fileManager );
+ CodeTransformer codeTransform = new JavaCodeTransform( packageManager );
jxr = new JXR( packageManager, fileManager, Collections.singletonMap( "java", codeTransform ) );
jxr.setDest( Paths.get( "target" ) );
diff --git a/maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java b/maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java
index 1564b35..b1f1ca6 100644
--- a/maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java
+++ b/maven-jxr/src/test/java/org/apache/maven/jxr/JXR141Test.java
@@ -46,7 +46,7 @@ public class JXR141Test
{
FileManager fileManager = new FileManager();
PackageManager packageManager = new PackageManager( fileManager );
- CodeTransformer codeTransform = new JavaCodeTransform( packageManager, fileManager );
+ CodeTransformer codeTransform = new JavaCodeTransform( packageManager );
jxr = new JXR( packageManager, fileManager, Collections.singletonMap( "java", codeTransform ) );
}
diff --git a/maven-jxr/src/test/java/org/apache/maven/jxr/JavaCodeTransformTest.java b/maven-jxr/src/test/java/org/apache/maven/jxr/JavaCodeTransformTest.java
index a804f72..962d912 100644
--- a/maven-jxr/src/test/java/org/apache/maven/jxr/JavaCodeTransformTest.java
+++ b/maven-jxr/src/test/java/org/apache/maven/jxr/JavaCodeTransformTest.java
@@ -51,7 +51,7 @@ public class JavaCodeTransformTest
public void setUp() throws Exception
{
fileManager = new FileManager();
- codeTransform = new JavaCodeTransform( new PackageManager( fileManager ), fileManager);
+ codeTransform = new JavaCodeTransform( new PackageManager( fileManager ) );
}
/**
diff --git a/maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java b/maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java
index 6bc9efb..4591548 100644
--- a/maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java
+++ b/maven-jxr/src/test/java/org/apache/maven/jxr/JxrBeanTest.java
@@ -35,7 +35,7 @@ public class JxrBeanTest
public void setUp()
{ FileManager fileManager = new FileManager();
PackageManager packageManager = new PackageManager( fileManager );
- CodeTransformer codeTransform = new JavaCodeTransform( packageManager, fileManager );
+ CodeTransformer codeTransform = new JavaCodeTransform( packageManager );
jxrBean = new JXR( packageManager, fileManager, Collections.singletonMap( "java", codeTransform ) );
jxrBean.setDest( Paths.get( "target" ) );
jxrBean.setInputEncoding( "ISO-8859-1" );