Latest bnd code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1350613 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/libg/sax/ContentFilter.java b/bundleplugin/src/main/java/aQute/libg/sax/ContentFilter.java
index 62ca259..e08f4de 100644
--- a/bundleplugin/src/main/java/aQute/libg/sax/ContentFilter.java
+++ b/bundleplugin/src/main/java/aQute/libg/sax/ContentFilter.java
@@ -1,8 +1,9 @@
package aQute.libg.sax;
-import org.xml.sax.ContentHandler;
+import org.xml.sax.*;
public interface ContentFilter extends ContentHandler {
void setParent(ContentHandler parent);
+
ContentHandler getParent();
}
diff --git a/bundleplugin/src/main/java/aQute/libg/sax/ContentFilterImpl.java b/bundleplugin/src/main/java/aQute/libg/sax/ContentFilterImpl.java
index 7f71568..3bfb6b5 100644
--- a/bundleplugin/src/main/java/aQute/libg/sax/ContentFilterImpl.java
+++ b/bundleplugin/src/main/java/aQute/libg/sax/ContentFilterImpl.java
@@ -1,17 +1,14 @@
package aQute.libg.sax;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
+import org.xml.sax.*;
public class ContentFilterImpl implements ContentFilter {
- private ContentHandler parent;
+ private ContentHandler parent;
public void setParent(ContentHandler parent) {
this.parent = parent;
-
+
}
public ContentHandler getParent() {
@@ -30,8 +27,7 @@
parent.endDocument();
}
- public void startPrefixMapping(String prefix, String uri)
- throws SAXException {
+ public void startPrefixMapping(String prefix, String uri) throws SAXException {
parent.startPrefixMapping(prefix, uri);
}
@@ -39,28 +35,23 @@
parent.endPrefixMapping(prefix);
}
- public void startElement(String uri, String localName, String qName,
- Attributes atts) throws SAXException {
+ public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
parent.startElement(uri, localName, qName, atts);
}
- public void endElement(String uri, String localName, String qName)
- throws SAXException {
+ public void endElement(String uri, String localName, String qName) throws SAXException {
parent.endElement(uri, localName, qName);
}
- public void characters(char[] ch, int start, int length)
- throws SAXException {
+ public void characters(char[] ch, int start, int length) throws SAXException {
parent.characters(ch, start, length);
}
- public void ignorableWhitespace(char[] ch, int start, int length)
- throws SAXException {
+ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
parent.ignorableWhitespace(ch, start, length);
}
- public void processingInstruction(String target, String data)
- throws SAXException {
+ public void processingInstruction(String target, String data) throws SAXException {
parent.processingInstruction(target, data);
}
diff --git a/bundleplugin/src/main/java/aQute/libg/sax/SAXElement.java b/bundleplugin/src/main/java/aQute/libg/sax/SAXElement.java
index b7ce35e..0b7e914 100644
--- a/bundleplugin/src/main/java/aQute/libg/sax/SAXElement.java
+++ b/bundleplugin/src/main/java/aQute/libg/sax/SAXElement.java
@@ -1,16 +1,15 @@
package aQute.libg.sax;
-import org.xml.sax.Attributes;
+import org.xml.sax.*;
public class SAXElement {
- private final String uri;
- private final String localName;
- private final String qName;
- private final Attributes atts;
+ private final String uri;
+ private final String localName;
+ private final String qName;
+ private final Attributes atts;
- public SAXElement(String uri, String localName, String qName,
- Attributes atts) {
+ public SAXElement(String uri, String localName, String qName, Attributes atts) {
this.uri = uri;
this.localName = localName;
this.qName = qName;
diff --git a/bundleplugin/src/main/java/aQute/libg/sax/SAXUtil.java b/bundleplugin/src/main/java/aQute/libg/sax/SAXUtil.java
index 87b058e..ab7b470 100644
--- a/bundleplugin/src/main/java/aQute/libg/sax/SAXUtil.java
+++ b/bundleplugin/src/main/java/aQute/libg/sax/SAXUtil.java
@@ -1,29 +1,28 @@
package aQute.libg.sax;
-import javax.xml.parsers.SAXParserFactory;
-import javax.xml.transform.Result;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
+import javax.xml.parsers.*;
+import javax.xml.transform.*;
+import javax.xml.transform.sax.*;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.XMLReader;
+import org.xml.sax.*;
public class SAXUtil {
-
+
public static XMLReader buildPipeline(Result output, ContentFilter... filters) throws Exception {
SAXTransformerFactory factory = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
TransformerHandler handler = factory.newTransformerHandler();
handler.setResult(output);
-
+
ContentHandler last = handler;
- if (filters != null) for (ContentFilter filter : filters) {
- filter.setParent(last);
- last = filter;
- }
+ if (filters != null)
+ for (ContentFilter filter : filters) {
+ filter.setParent(last);
+ last = filter;
+ }
XMLReader reader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
reader.setContentHandler(last);
-
+
return reader;
}
-
+
}
diff --git a/bundleplugin/src/main/java/aQute/libg/sax/filters/ElementSelectionFilter.java b/bundleplugin/src/main/java/aQute/libg/sax/filters/ElementSelectionFilter.java
index 4411db9..3ba7f5a 100644
--- a/bundleplugin/src/main/java/aQute/libg/sax/filters/ElementSelectionFilter.java
+++ b/bundleplugin/src/main/java/aQute/libg/sax/filters/ElementSelectionFilter.java
@@ -1,17 +1,16 @@
package aQute.libg.sax.filters;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
+import org.xml.sax.*;
-import aQute.libg.sax.ContentFilterImpl;
+import aQute.libg.sax.*;
-public abstract class ElementSelectionFilter extends ContentFilterImpl{
-
- int depth = 0;
- int hiddenDepth = -1;
-
+public abstract class ElementSelectionFilter extends ContentFilterImpl {
+
+ int depth = 0;
+ int hiddenDepth = -1;
+
protected abstract boolean select(int depth, String uri, String localName, String qName, Attributes attribs);
-
+
@Override
public final void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
if (hiddenDepth < 0) {
@@ -21,29 +20,31 @@
else
hiddenDepth = 0;
} else {
- hiddenDepth ++;
+ hiddenDepth++;
}
depth++;
}
-
+
@Override
public final void endElement(String uri, String localName, String qName) throws SAXException {
if (hiddenDepth < 0) {
super.endElement(uri, localName, qName);
} else {
- hiddenDepth --;
+ hiddenDepth--;
}
- depth --;
+ depth--;
}
-
+
@Override
public void characters(char[] ch, int start, int length) throws SAXException {
- if (hiddenDepth < 0) super.characters(ch, start, length);
+ if (hiddenDepth < 0)
+ super.characters(ch, start, length);
}
-
+
@Override
public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
- if (hiddenDepth < 0) super.ignorableWhitespace(ch, start, length);
+ if (hiddenDepth < 0)
+ super.ignorableWhitespace(ch, start, length);
}
-
+
}
diff --git a/bundleplugin/src/main/java/aQute/libg/sax/filters/MergeContentFilter.java b/bundleplugin/src/main/java/aQute/libg/sax/filters/MergeContentFilter.java
index acf5d12..b0d4df8 100644
--- a/bundleplugin/src/main/java/aQute/libg/sax/filters/MergeContentFilter.java
+++ b/bundleplugin/src/main/java/aQute/libg/sax/filters/MergeContentFilter.java
@@ -1,28 +1,26 @@
package aQute.libg.sax.filters;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
+import org.xml.sax.*;
-import aQute.libg.sax.ContentFilterImpl;
-import aQute.libg.sax.SAXElement;
+import aQute.libg.sax.*;
public class MergeContentFilter extends ContentFilterImpl {
- private int elementDepth = 0;
-
- private final List<SAXElement> rootElements = new LinkedList<SAXElement>();
-
+ private int elementDepth = 0;
+
+ private final List<SAXElement> rootElements = new LinkedList<SAXElement>();
+
@Override
public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
if (elementDepth++ == 0) {
if (rootElements.isEmpty())
super.startElement(uri, localName, qName, atts);
else if (!rootElements.get(0).getqName().equals(qName))
- throw new SAXException(String.format("Documents have inconsistent root element names: first was %s, current is %s.", rootElements.get(0).getqName(), qName));
+ throw new SAXException(String.format(
+ "Documents have inconsistent root element names: first was %s, current is %s.", rootElements
+ .get(0).getqName(), qName));
rootElements.add(new SAXElement(uri, localName, qName, atts));
} else {
super.startElement(uri, localName, qName, atts);
@@ -35,13 +33,13 @@
super.endElement(uri, localName, qName);
}
}
-
+
@Override
public void processingInstruction(String target, String data) throws SAXException {
if (rootElements.isEmpty())
super.processingInstruction(target, data);
}
-
+
public void closeRootAndDocument() throws SAXException {
if (!rootElements.isEmpty()) {
SAXElement root = rootElements.get(0);
@@ -49,7 +47,7 @@
}
super.endDocument();
}
-
+
public List<SAXElement> getRootElements() {
return Collections.unmodifiableList(rootElements);
}