abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1372274 - in /abdera/java/branches/axiom-upgrade: ./ dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/ parser/src/main/java/org/apache/abdera/parser/stax/ server/src/main/java/org/apache/abdera/protocol/server/filters/
Date Mon, 13 Aug 2012 06:50:55 GMT
Author: veithen
Date: Mon Aug 13 06:50:55 2012
New Revision: 1372274

URL: http://svn.apache.org/viewvc?rev=1372274&view=rev
Log:
Merged latest changes from trunk.

Modified:
    abdera/java/branches/axiom-upgrade/   (props changed)
    abdera/java/branches/axiom-upgrade/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java
  (props changed)
    abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
    abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
    abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
    abdera/java/branches/axiom-upgrade/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java
  (props changed)

Propchange: abdera/java/branches/axiom-upgrade/
------------------------------------------------------------------------------
  Merged /abdera/java/trunk:r1372163-1372273

Propchange: abdera/java/branches/axiom-upgrade/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java
------------------------------------------------------------------------------
  Merged /abdera/java/trunk/dependencies/i18n/src/main/java/org/apache/abdera/i18n/text/io/CompressionUtil.java:r1372163-1372273

Modified: abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
URL: http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java?rev=1372274&r1=1372273&r2=1372274&view=diff
==============================================================================
--- abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
(original)
+++ abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMComment.java
Mon Aug 13 06:50:55 2012
@@ -28,12 +28,12 @@ import org.apache.axiom.om.impl.llom.OMC
 @SuppressWarnings("unchecked")
 public class FOMComment extends OMCommentImpl implements Comment {
 
-    public FOMComment(OMContainer arg0, OMFactory arg1) {
-        super(arg0, arg1);
+    public FOMComment(OMContainer parent, OMFactory factory) {
+        super(parent, factory);
     }
 
-    public FOMComment(OMContainer arg0, String arg1, OMFactory arg2) {
-        super(arg0, arg1, arg2);
+    public FOMComment(OMContainer parent, String value, OMFactory factory) {
+        super(parent, value, factory);
     }
 
     public String getText() {

Modified: abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
URL: http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java?rev=1372274&r1=1372273&r2=1372274&view=diff
==============================================================================
--- abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
(original)
+++ abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMProcessingInstruction.java
Mon Aug 13 06:50:55 2012
@@ -54,8 +54,6 @@ public class FOMProcessingInstruction ex
     }
 
     public <T extends ProcessingInstruction> T setText(String text) {
-        if (!isComplete() && builder != null)
-            build();
         setValue(text);
         return (T)this;
     }

Modified: abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
URL: http://svn.apache.org/viewvc/abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java?rev=1372274&r1=1372273&r2=1372274&view=diff
==============================================================================
--- abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
(original)
+++ abdera/java/branches/axiom-upgrade/parser/src/main/java/org/apache/abdera/parser/stax/FOMTextValue.java
Mon Aug 13 06:50:55 2012
@@ -32,52 +32,52 @@ import org.apache.axiom.om.impl.llom.OMT
 @SuppressWarnings("unchecked")
 public class FOMTextValue extends OMTextImpl implements TextValue {
 
-    public FOMTextValue(Object arg0, boolean arg1, OMFactory arg2) {
-        super(arg0, arg1, arg2);
+    public FOMTextValue(Object dataHandler, boolean optimize, OMFactory factory) {
+        super(dataHandler, optimize, factory);
     }
 
-    public FOMTextValue(Object arg0, OMFactory arg1) {
-        super(arg0, arg1);
+    public FOMTextValue(Object dataHandler, OMFactory factory) {
+        super(dataHandler, factory);
     }
 
-    public FOMTextValue(OMContainer arg0, char[] arg1, int arg2, OMFactory arg3) {
-        super(arg0, arg1, arg2, arg3);
+    public FOMTextValue(OMContainer parent, char[] charArray, int nodeType, OMFactory factory)
{
+        super(parent, charArray, nodeType, factory);
     }
 
-    public FOMTextValue(OMContainer arg0, QName arg1, int arg2, OMFactory arg3) {
-        super(arg0, arg1, arg2, arg3);
+    public FOMTextValue(OMContainer parent, QName text, int nodeType, OMFactory factory)
{
+        super(parent, text, nodeType, factory);
     }
 
-    public FOMTextValue(OMContainer arg0, QName arg1, OMFactory arg2) {
-        super(arg0, arg1, arg2);
+    public FOMTextValue(OMContainer parent, QName text, OMFactory factory) {
+        super(parent, text, factory);
     }
 
-    public FOMTextValue(OMContainer arg0, String arg1, int arg2, OMFactory arg3) {
-        super(arg0, arg1, arg2, arg3);
+    public FOMTextValue(OMContainer parent, String text, int nodeType, OMFactory factory)
{
+        super(parent, text, nodeType, factory);
     }
 
-    public FOMTextValue(OMContainer arg0, String arg1, OMFactory arg2) {
-        super(arg0, arg1, arg2);
+    public FOMTextValue(OMContainer parent, String text, OMFactory factory) {
+        super(parent, text, factory);
     }
 
-    public FOMTextValue(OMContainer arg0, String arg1, String arg2, boolean arg3, OMFactory
arg4) {
-        super(arg0, arg1, arg2, arg3, arg4);
+    public FOMTextValue(OMContainer parent, String s, String mimeType, boolean optimize,
OMFactory factory) {
+        super(parent, s, mimeType, optimize, factory);
     }
 
-    public FOMTextValue(String arg0, int arg1, OMFactory arg2) {
-        super(arg0, arg1, arg2);
+    public FOMTextValue(String text, int nodeType, OMFactory factory) {
+        super(text, nodeType, factory);
     }
 
-    public FOMTextValue(String arg0, OMContainer arg1, OMXMLParserWrapper arg2, OMFactory
arg3) {
-        super(arg0, arg1, arg2, arg3);
+    public FOMTextValue(String contentID, OMContainer parent, OMXMLParserWrapper builder,
OMFactory factory) {
+        super(contentID, parent, builder, factory);
     }
 
-    public FOMTextValue(String arg0, OMFactory arg1) {
-        super(arg0, arg1);
+    public FOMTextValue(String text, OMFactory factory) {
+        super(text, factory);
     }
 
-    public FOMTextValue(String arg0, String arg1, boolean arg2, OMFactory arg3) {
-        super(arg0, arg1, arg2, arg3);
+    public FOMTextValue(String s, String mimeType, boolean optimize, OMFactory factory) {
+        super(s, mimeType, optimize, factory);
     }
 
     public DataHandler getDataHandler() {

Propchange: abdera/java/branches/axiom-upgrade/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java
------------------------------------------------------------------------------
  Merged /abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/filters/OpenSearchFilter.java:r1372163-1372273



Mime
View raw message