You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/04/30 20:25:46 UTC
incubator-tinkerpop git commit: Update NOTICE.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master e2e76c707 -> 0ee87f83a
Update NOTICE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0ee87f83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0ee87f83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0ee87f83
Branch: refs/heads/master
Commit: 0ee87f83ac23a37c942a6160d4c3814f5ea22ee1
Parents: e2e76c7
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 30 14:25:04 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 30 14:25:04 2015 -0400
----------------------------------------------------------------------
NOTICE | 9 +-
.../io/graphml/GraphMLWriterHelper.java | 190 ++++++++-----------
2 files changed, 85 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0ee87f83/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index cea3516..b288d10 100644
--- a/NOTICE
+++ b/NOTICE
@@ -21,4 +21,11 @@ for bundled components and dependencies
------------------------------------------------------------------------
normalize.css
------------------------------------------------------------------------
-Copyright (c) Nicolas Gallagher and Jonathan Neal
\ No newline at end of file
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+------------------------------------------------------------------------
+GraphMLWriterHelper.DelegatingXMLStreamWriter
+GraphMLWriterHelper.IndentingXMLStreamWriter
+------------------------------------------------------------------------
+Taken from Activiti - Apache 2 License - https://github.com/Activiti/Activiti
+Copyright 2010-2014 Alfresco Software, Ltd.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0ee87f83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
index 8f73268..cedb302 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLWriterHelper.java
@@ -18,8 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.structure.io.graphml;
-import org.apache.commons.lang.StringUtils;
-
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -30,227 +28,199 @@ import java.util.Stack;
*/
class GraphMLWriterHelper {
/**
- * Delegating {@link javax.xml.stream.XMLStreamWriter}.
- *
- * @author Kohsuke Kawaguchi
+ * @author Tijs Rademakers
*/
- private abstract static class DelegatingXMLStreamWriter implements XMLStreamWriter {
+ abstract static class DelegatingXMLStreamWriter implements XMLStreamWriter {
+
private final XMLStreamWriter writer;
- public DelegatingXMLStreamWriter(final XMLStreamWriter writer) {
+ public DelegatingXMLStreamWriter(XMLStreamWriter writer) {
this.writer = writer;
}
- @Override
- public void writeStartElement(final String localName) throws XMLStreamException {
+ public void writeStartElement(String localName) throws XMLStreamException {
writer.writeStartElement(localName);
}
- @Override
- public void writeStartElement(final String namespaceURI, final String localName) throws XMLStreamException {
+ public void writeStartElement(String namespaceURI, String localName) throws XMLStreamException {
writer.writeStartElement(namespaceURI, localName);
}
- @Override
- public void writeStartElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
+ public void writeStartElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
writer.writeStartElement(prefix, localName, namespaceURI);
}
- @Override
- public void writeEmptyElement(final String namespaceURI, final String localName) throws XMLStreamException {
+ public void writeEmptyElement(String namespaceURI, String localName) throws XMLStreamException {
writer.writeEmptyElement(namespaceURI, localName);
}
- @Override
- public void writeEmptyElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
+ public void writeEmptyElement(String prefix, String localName, String namespaceURI) throws XMLStreamException {
writer.writeEmptyElement(prefix, localName, namespaceURI);
}
- @Override
- public void writeEmptyElement(final String localName) throws XMLStreamException {
+ public void writeEmptyElement(String localName) throws XMLStreamException {
writer.writeEmptyElement(localName);
}
- @Override
public void writeEndElement() throws XMLStreamException {
writer.writeEndElement();
}
- @Override
public void writeEndDocument() throws XMLStreamException {
writer.writeEndDocument();
}
- @Override
public void close() throws XMLStreamException {
writer.close();
}
- @Override
public void flush() throws XMLStreamException {
writer.flush();
}
- @Override
- public void writeAttribute(final String localName, final String value) throws XMLStreamException {
+ public void writeAttribute(String localName, String value) throws XMLStreamException {
writer.writeAttribute(localName, value);
}
- @Override
- public void writeAttribute(final String prefix, final String namespaceURI, final String localName, final String value) throws XMLStreamException {
+ public void writeAttribute(String prefix, String namespaceURI, String localName, String value) throws XMLStreamException {
writer.writeAttribute(prefix, namespaceURI, localName, value);
}
- @Override
- public void writeAttribute(final String namespaceURI, final String localName, final String value) throws XMLStreamException {
+ public void writeAttribute(String namespaceURI, String localName, String value) throws XMLStreamException {
writer.writeAttribute(namespaceURI, localName, value);
}
- @Override
- public void writeNamespace(final String prefix, final String namespaceURI) throws XMLStreamException {
+ public void writeNamespace(String prefix, String namespaceURI) throws XMLStreamException {
writer.writeNamespace(prefix, namespaceURI);
}
- @Override
- public void writeDefaultNamespace(final String namespaceURI) throws XMLStreamException {
+ public void writeDefaultNamespace(String namespaceURI) throws XMLStreamException {
writer.writeDefaultNamespace(namespaceURI);
}
- @Override
- public void writeComment(final String data) throws XMLStreamException {
+ public void writeComment(String data) throws XMLStreamException {
writer.writeComment(data);
}
- @Override
- public void writeProcessingInstruction(final String target) throws XMLStreamException {
+ public void writeProcessingInstruction(String target) throws XMLStreamException {
writer.writeProcessingInstruction(target);
}
- @Override
- public void writeProcessingInstruction(final String target, final String data) throws XMLStreamException {
+ public void writeProcessingInstruction(String target, String data) throws XMLStreamException {
writer.writeProcessingInstruction(target, data);
}
- @Override
- public void writeCData(final String data) throws XMLStreamException {
+ public void writeCData(String data) throws XMLStreamException {
writer.writeCData(data);
}
- @Override
- public void writeDTD(final String dtd) throws XMLStreamException {
+ public void writeDTD(String dtd) throws XMLStreamException {
writer.writeDTD(dtd);
}
- @Override
- public void writeEntityRef(final String name) throws XMLStreamException {
+ public void writeEntityRef(String name) throws XMLStreamException {
writer.writeEntityRef(name);
}
- @Override
public void writeStartDocument() throws XMLStreamException {
writer.writeStartDocument();
}
- @Override
- public void writeStartDocument(final String version) throws XMLStreamException {
+ public void writeStartDocument(String version) throws XMLStreamException {
writer.writeStartDocument(version);
}
- @Override
- public void writeStartDocument(final String encoding, final String version) throws XMLStreamException {
+ public void writeStartDocument(String encoding, String version) throws XMLStreamException {
writer.writeStartDocument(encoding, version);
}
- @Override
- public void writeCharacters(final String text) throws XMLStreamException {
+ public void writeCharacters(String text) throws XMLStreamException {
writer.writeCharacters(text);
}
- @Override
- public void writeCharacters(final char[] text, final int start, final int len) throws XMLStreamException {
+ public void writeCharacters(char[] text, int start, int len) throws XMLStreamException {
writer.writeCharacters(text, start, len);
}
- @Override
- public String getPrefix(final String uri) throws XMLStreamException {
+ public String getPrefix(String uri) throws XMLStreamException {
return writer.getPrefix(uri);
}
- @Override
- public void setPrefix(final String prefix, final String uri) throws XMLStreamException {
+ public void setPrefix(String prefix, String uri) throws XMLStreamException {
writer.setPrefix(prefix, uri);
}
- @Override
- public void setDefaultNamespace(final String uri) throws XMLStreamException {
+ public void setDefaultNamespace(String uri) throws XMLStreamException {
writer.setDefaultNamespace(uri);
}
- @Override
- public void setNamespaceContext(final NamespaceContext context) throws XMLStreamException {
+ public void setNamespaceContext(NamespaceContext context) throws XMLStreamException {
writer.setNamespaceContext(context);
}
- @Override
public NamespaceContext getNamespaceContext() {
return writer.getNamespaceContext();
}
- @Override
- public Object getProperty(final String name) throws IllegalArgumentException {
+ public Object getProperty(String name) throws IllegalArgumentException {
return writer.getProperty(name);
}
}
/**
- * @author Kohsuke Kawaguchi
+ * @author Tijs Rademakers
*/
public static class IndentingXMLStreamWriter extends DelegatingXMLStreamWriter {
+
private final static Object SEEN_NOTHING = new Object();
private final static Object SEEN_ELEMENT = new Object();
private final static Object SEEN_DATA = new Object();
private Object state = SEEN_NOTHING;
- private Stack<Object> stateStack = new Stack<>();
+ private Stack<Object> stateStack = new Stack<Object>();
private String indentStep = " ";
- private static final String lineSeparator = System.getProperty("line.separator", "\n");
private int depth = 0;
- public IndentingXMLStreamWriter(final XMLStreamWriter writer) {
+ public IndentingXMLStreamWriter(XMLStreamWriter writer) {
super(writer);
}
/**
* Return the current indent step.
- * <p/>
- * <p>Return the current indent step: each start tag will be
- * indented by this number of spaces times the number of
- * ancestors that the element has.</p>
*
- * @return The number of spaces in each indentation step,
- * or 0 or less for no indentation.
+ * <p>
+ * Return the current indent step: each start tag will be indented by this
+ * number of spaces times the number of ancestors that the element has.
+ * </p>
+ *
+ * @return The number of spaces in each indentation step, or 0 or less for no
+ * indentation.
* @see #setIndentStep(int)
+ *
* @deprecated Only return the length of the indent string.
*/
public int getIndentStep() {
return indentStep.length();
}
-
/**
* Set the current indent step.
*
- * @param indentStep The new indent step (0 or less for no
- * indentation).
+ * @param indentStep
+ * The new indent step (0 or less for no indentation).
* @see #getIndentStep()
+ *
* @deprecated Should use the version that takes string.
*/
public void setIndentStep(int indentStep) {
- this.indentStep = StringUtils.repeat(" ", indentStep);
+ StringBuilder s = new StringBuilder();
+ for (; indentStep > 0; indentStep--)
+ s.append(' ');
+ setIndentStep(s.toString());
}
- public void setIndentStep(final String s) {
+ public void setIndentStep(String s) {
this.indentStep = s;
}
@@ -258,7 +228,7 @@ class GraphMLWriterHelper {
stateStack.push(SEEN_ELEMENT);
state = SEEN_NOTHING;
if (depth > 0) {
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
doIndent();
depth++;
@@ -267,7 +237,7 @@ class GraphMLWriterHelper {
private void onEndElement() throws XMLStreamException {
depth--;
if (state == SEEN_ELEMENT) {
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
doIndent();
}
state = stateStack.pop();
@@ -276,7 +246,7 @@ class GraphMLWriterHelper {
private void onEmptyElement() throws XMLStreamException {
state = SEEN_ELEMENT;
if (depth > 0) {
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
doIndent();
}
@@ -284,8 +254,9 @@ class GraphMLWriterHelper {
/**
* Print indentation for the current level.
*
- * @throws javax.xml.stream.XMLStreamException If there is an error writing the indentation characters, or if a filter
- * further down the chain raises an exception.
+ * @exception org.xml.sax.SAXException
+ * If there is an error writing the indentation characters, or if
+ * a filter further down the chain raises an exception.
*/
private void doIndent() throws XMLStreamException {
if (depth > 0) {
@@ -294,84 +265,77 @@ class GraphMLWriterHelper {
}
}
-
- @Override
public void writeStartDocument() throws XMLStreamException {
super.writeStartDocument();
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
- @Override
- public void writeStartDocument(final String version) throws XMLStreamException {
+ public void writeStartDocument(String version) throws XMLStreamException {
super.writeStartDocument(version);
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
- @Override
- public void writeStartDocument(final String encoding, final String version) throws XMLStreamException {
+ public void writeStartDocument(String encoding, String version)
+ throws XMLStreamException {
super.writeStartDocument(encoding, version);
- super.writeCharacters(lineSeparator);
+ super.writeCharacters("\n");
}
- @Override
- public void writeStartElement(final String localName) throws XMLStreamException {
+ public void writeStartElement(String localName) throws XMLStreamException {
onStartElement();
super.writeStartElement(localName);
}
- @Override
- public void writeStartElement(final String namespaceURI, final String localName) throws XMLStreamException {
+ public void writeStartElement(String namespaceURI, String localName)
+ throws XMLStreamException {
onStartElement();
super.writeStartElement(namespaceURI, localName);
}
- @Override
- public void writeStartElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
+ public void writeStartElement(String prefix, String localName,
+ String namespaceURI) throws XMLStreamException {
onStartElement();
super.writeStartElement(prefix, localName, namespaceURI);
}
- @Override
- public void writeEmptyElement(final String namespaceURI, final String localName) throws XMLStreamException {
+ public void writeEmptyElement(String namespaceURI, String localName)
+ throws XMLStreamException {
onEmptyElement();
super.writeEmptyElement(namespaceURI, localName);
}
- @Override
- public void writeEmptyElement(final String prefix, final String localName, final String namespaceURI) throws XMLStreamException {
+ public void writeEmptyElement(String prefix, String localName,
+ String namespaceURI) throws XMLStreamException {
onEmptyElement();
super.writeEmptyElement(prefix, localName, namespaceURI);
}
- @Override
- public void writeEmptyElement(final String localName) throws XMLStreamException {
+ public void writeEmptyElement(String localName) throws XMLStreamException {
onEmptyElement();
super.writeEmptyElement(localName);
}
- @Override
public void writeEndElement() throws XMLStreamException {
onEndElement();
super.writeEndElement();
}
- @Override
- public void writeCharacters(final String text) throws XMLStreamException {
+ public void writeCharacters(String text) throws XMLStreamException {
state = SEEN_DATA;
super.writeCharacters(text);
}
- @Override
- public void writeCharacters(final char[] text, final int start, final int len) throws XMLStreamException {
+ public void writeCharacters(char[] text, int start, int len)
+ throws XMLStreamException {
state = SEEN_DATA;
super.writeCharacters(text, start, len);
}
- @Override
- public void writeCData(final String data) throws XMLStreamException {
+ public void writeCData(String data) throws XMLStreamException {
state = SEEN_DATA;
super.writeCData(data);
}
+
}
}