You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/09/26 19:16:31 UTC
svn commit: r1705481 -
/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/
Author: veithen
Date: Sat Sep 26 17:16:30 2015
New Revision: 1705481
URL: http://svn.apache.org/viewvc?rev=1705481&view=rev
Log:
Don't implement org.apache.abdera.util.Constants.
Modified:
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,13 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.ACCEPT;
+import static org.apache.abdera.util.Constants.CATEGORIES;
+import static org.apache.abdera.util.Constants.PREFIXED_TITLE;
+import static org.apache.abdera.util.Constants.PRE_RFC_ACCEPT;
+import static org.apache.abdera.util.Constants.PRE_RFC_CATEGORIES;
+import static org.apache.abdera.util.Constants.TITLE;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMContent.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,12 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.BASE;
+import static org.apache.abdera.util.Constants.LANG;
+import static org.apache.abdera.util.Constants.SRC;
+import static org.apache.abdera.util.Constants.TYPE;
+import static org.apache.abdera.util.Constants.XHTML_NS;
+
import javax.activation.DataHandler;
import javax.activation.MimeType;
import javax.activation.URLDataSource;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMControl.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,11 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.DRAFT;
+import static org.apache.abdera.util.Constants.NO;
+import static org.apache.abdera.util.Constants.PRE_RFC_DRAFT;
+import static org.apache.abdera.util.Constants.YES;
+
import org.apache.abdera.model.Control;
import org.apache.axiom.fom.AbderaControl;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMDiv.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,11 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.AID;
+import static org.apache.abdera.util.Constants.ATITLE;
+import static org.apache.abdera.util.Constants.CLASS;
+import static org.apache.abdera.util.Constants.XHTML_NS;
+
import java.io.StringWriter;
import java.util.Iterator;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMElement.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,10 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.BASE;
+import static org.apache.abdera.util.Constants.LANG;
+import static org.apache.abdera.util.Constants.SPACE;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -51,7 +55,6 @@ import org.apache.abdera.parser.ParseExc
import org.apache.abdera.parser.Parser;
import org.apache.abdera.parser.ParserOptions;
import org.apache.abdera.parser.stax.util.FOMElementIteratorWrapper;
-import org.apache.abdera.util.Constants;
import org.apache.abdera.util.MimeTypeHelper;
import org.apache.abdera.writer.Writer;
import org.apache.abdera.writer.WriterOptions;
@@ -74,7 +77,7 @@ import org.apache.axiom.om.OMText;
import org.apache.axiom.om.impl.intf.AxiomElement;
@SuppressWarnings("unchecked")
-public class FOMElement extends FOMChildNode implements AbderaElement, AxiomElement, Constants {
+public class FOMElement extends FOMChildNode implements AbderaElement, AxiomElement {
protected void setParentDocument(Document parent) {
((OMContainer)parent).addChild(this);
}
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,23 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.APP_NS;
+import static org.apache.abdera.util.Constants.AUTHOR;
+import static org.apache.abdera.util.Constants.CONTENT;
+import static org.apache.abdera.util.Constants.CONTRIBUTOR;
+import static org.apache.abdera.util.Constants.CONTROL;
+import static org.apache.abdera.util.Constants.EDITED;
+import static org.apache.abdera.util.Constants.ID;
+import static org.apache.abdera.util.Constants.LINK;
+import static org.apache.abdera.util.Constants.PRE_RFC_CONTROL;
+import static org.apache.abdera.util.Constants.PRE_RFC_EDITED;
+import static org.apache.abdera.util.Constants.PUBLISHED;
+import static org.apache.abdera.util.Constants.RIGHTS;
+import static org.apache.abdera.util.Constants.SOURCE;
+import static org.apache.abdera.util.Constants.SUMMARY;
+import static org.apache.abdera.util.Constants.TITLE;
+import static org.apache.abdera.util.Constants.UPDATED;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,8 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.ENTRY;
+
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,9 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.AURI;
+import static org.apache.abdera.util.Constants.VERSION;
+
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Generator;
import org.apache.axiom.fom.AbderaGenerator;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMMultipartCollection.java Sat Sep 26 17:16:30 2015
@@ -1,5 +1,10 @@
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.ACCEPT;
+import static org.apache.abdera.util.Constants.ALTERNATE;
+import static org.apache.abdera.util.Constants.LN_ALTERNATE_MULTIPART_RELATED;
+import static org.apache.abdera.util.Constants.PRE_RFC_ACCEPT;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,10 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.EMAIL;
+import static org.apache.abdera.util.Constants.NAME;
+import static org.apache.abdera.util.Constants.URI;
+
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Element;
import org.apache.abdera.model.IRIElement;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMService.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,9 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.PRE_RFC_WORKSPACE;
+import static org.apache.abdera.util.Constants.WORKSPACE;
+
import java.util.ArrayList;
import java.util.List;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMSource.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,21 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.AUTHOR;
+import static org.apache.abdera.util.Constants.COLLECTION;
+import static org.apache.abdera.util.Constants.CONTRIBUTOR;
+import static org.apache.abdera.util.Constants.ENTRY;
+import static org.apache.abdera.util.Constants.GENERATOR;
+import static org.apache.abdera.util.Constants.ICON;
+import static org.apache.abdera.util.Constants.ID;
+import static org.apache.abdera.util.Constants.LINK;
+import static org.apache.abdera.util.Constants.LOGO;
+import static org.apache.abdera.util.Constants.PRE_RFC_COLLECTION;
+import static org.apache.abdera.util.Constants.RIGHTS;
+import static org.apache.abdera.util.Constants.SUBTITLE;
+import static org.apache.abdera.util.Constants.TITLE;
+import static org.apache.abdera.util.Constants.UPDATED;
+
import java.util.Date;
import java.util.Iterator;
import java.util.List;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMText.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,11 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.BASE;
+import static org.apache.abdera.util.Constants.LANG;
+import static org.apache.abdera.util.Constants.TYPE;
+import static org.apache.abdera.util.Constants.XHTML_NS;
+
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Div;
import org.apache.abdera.model.Element;
Modified: webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java?rev=1705481&r1=1705480&r2=1705481&view=diff
==============================================================================
--- webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java (original)
+++ webservices/axiom/trunk/implementations/fom-impl/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java Sat Sep 26 17:16:30 2015
@@ -17,6 +17,11 @@
*/
package org.apache.abdera.parser.stax;
+import static org.apache.abdera.util.Constants.COLLECTION;
+import static org.apache.abdera.util.Constants.PREFIXED_TITLE;
+import static org.apache.abdera.util.Constants.PRE_RFC_COLLECTION;
+import static org.apache.abdera.util.Constants.TITLE;
+
import java.util.ArrayList;
import java.util.List;