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 2020/10/21 20:12:50 UTC
[maven] 02/07: MNG-6999: LexicalHandler is as same level as
ContentHandler, not as parent
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6999
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 17cc74171b5c9bf0d7405ba2fde2ff493522c4b3
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Oct 17 15:44:14 2020 +0200
MNG-6999: LexicalHandler is as same level as ContentHandler, not as parent
---
.../main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java | 4 +---
.../main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java | 3 +--
.../java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java | 3 +--
.../main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java | 4 +---
.../java/org/apache/maven/xml/sax/filter/AbstractXMLFilterTests.java | 3 +--
5 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java
index 454ae83..e9df96f 100644
--- a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java
+++ b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/AbstractSAXFilter.java
@@ -20,7 +20,6 @@ package org.apache.maven.xml.sax.filter;
*/
import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.XMLFilterImpl;
@@ -41,10 +40,9 @@ public class AbstractSAXFilter extends XMLFilterImpl implements LexicalHandler
super();
}
- public <T extends XMLReader & LexicalHandler> AbstractSAXFilter( T parent )
+ public AbstractSAXFilter( AbstractSAXFilter parent )
{
setParent( parent );
- setLexicalHandler( parent );
}
public LexicalHandler getLexicalHandler()
diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java
index 14bcf70..56b30e8 100644
--- a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java
+++ b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/BuildPomXMLFilter.java
@@ -20,7 +20,6 @@ package org.apache.maven.xml.sax.filter;
*/
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
/**
* Filter to adjust pom on filesystem before being processed for effective pom.
@@ -39,7 +38,7 @@ public class BuildPomXMLFilter extends AbstractSAXFilter
super();
}
- <T extends XMLReader & LexicalHandler> BuildPomXMLFilter( T parent )
+ BuildPomXMLFilter( AbstractSAXFilter parent )
{
super( parent );
}
diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java
index 1c227a7..c02092d 100644
--- a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java
+++ b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/ConsumerPomXMLFilter.java
@@ -20,7 +20,6 @@ package org.apache.maven.xml.sax.filter;
*/
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
/**
* XML Filter to transform pom.xml to consumer pom.
@@ -35,7 +34,7 @@ import org.xml.sax.ext.LexicalHandler;
*/
public class ConsumerPomXMLFilter extends AbstractSAXFilter
{
- <T extends XMLReader & LexicalHandler> ConsumerPomXMLFilter( T filter )
+ ConsumerPomXMLFilter( AbstractSAXFilter filter )
{
super( filter );
}
diff --git a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java
index 0100e6b..5c4a363 100644
--- a/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java
+++ b/maven-xml/src/main/java/org/apache/maven/xml/sax/filter/FastForwardFilter.java
@@ -26,8 +26,6 @@ import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
/**
* This filter will skip all following filters and write directly to the output.
@@ -61,7 +59,7 @@ class FastForwardFilter extends AbstractSAXFilter
super();
}
- <T extends XMLReader & LexicalHandler> FastForwardFilter( T parent )
+ FastForwardFilter( AbstractSAXFilter parent )
{
super( parent );
}
diff --git a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/AbstractXMLFilterTests.java b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/AbstractXMLFilterTests.java
index f01f268..2b2f173 100644
--- a/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/AbstractXMLFilterTests.java
+++ b/maven-xml/src/test/java/org/apache/maven/xml/sax/filter/AbstractXMLFilterTests.java
@@ -39,7 +39,6 @@ import org.apache.maven.xml.Factories;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.ext.LexicalHandler;
public abstract class AbstractXMLFilterTests
{
@@ -141,7 +140,7 @@ public abstract class AbstractXMLFilterTests
super();
}
- public <T extends XMLReader & LexicalHandler> PerCharXMLFilter( T parent )
+ public PerCharXMLFilter( AbstractSAXFilter parent )
{
super( parent );
}