You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2006/09/13 17:18:47 UTC
svn commit: r442998 - in /incubator/abdera/java/trunk:
core/src/main/java/org/apache/abdera/model/
parser/src/main/java/org/apache/abdera/parser/stax/
Author: jmsnell
Date: Wed Sep 13 08:18:46 2006
New Revision: 442998
URL: http://svn.apache.org/viewvc?view=rev&rev=442998
Log:
APP Draft 10. Collection and Workspace elements now use atom:title elements. Earlier,
it looked as if multiple atom:title's would be allowed. The spec currently says only
ONE atom:title
Modified:
incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java
incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java
incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java?view=diff&rev=442998&r1=442997&r2=442998
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Collection.java Wed Sep 13 08:18:46 2006
@@ -56,17 +56,7 @@
Text setTitleAsXHtml(String title);
Text getTitleElement();
-
- List<Text> getTitleElements();
-
- Text addTitle(String title);
-
- Text addTitleAsHtml(String title);
-
- Text addTitleAsXhtml(String title);
-
- void addTitle(Text title);
-
+
/**
* APP Draft-08: The app:collection element MUST contain a "href"
* attribute, whose value gives the IRI of the collection.
Modified: incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java?view=diff&rev=442998&r1=442997&r2=442998
==============================================================================
--- incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java (original)
+++ incubator/abdera/java/trunk/core/src/main/java/org/apache/abdera/model/Workspace.java Wed Sep 13 08:18:46 2006
@@ -53,16 +53,6 @@
Text getTitleElement();
- List<Text> getTitleElements();
-
- Text addTitle(String title);
-
- Text addTitleAsHtml(String title);
-
- Text addTitleAsXhtml(String title);
-
- void addTitle(Text title);
-
/**
* Returns the full set of collections in this workspace
*/
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java?view=diff&rev=442998&r1=442997&r2=442998
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCollection.java Wed Sep 13 08:18:46 2006
@@ -35,7 +35,6 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLParserWrapper;
public class FOMCollection
@@ -123,38 +122,6 @@
public Text getTitleElement() {
return getFirstChild(TITLE);
- }
-
- public List<Text> getTitleElements() {
- return _getChildrenAsSet(TITLE);
- }
-
- public Text addTitle(String title) {
- FOMFactory fomfactory = (FOMFactory) factory;
- Text text = fomfactory.newTitle(Text.Type.TEXT);
- text.setValue(title);
- this.addTitle(text);
- return text;
- }
-
- public Text addTitleAsHtml(String title) {
- FOMFactory fomfactory = (FOMFactory) factory;
- Text text = fomfactory.newTitle(Text.Type.HTML);
- text.setValue(title);
- this.addTitle(text);
- return text;
- }
-
- public Text addTitleAsXhtml(String title) {
- FOMFactory fomfactory = (FOMFactory) factory;
- Text text = fomfactory.newTitle(Text.Type.XHTML);
- text.setValue(title);
- this.addTitle(text);
- return text;
- }
-
- public void addTitle(Text title) {
- addChild((OMNode) title);
}
public URI getHref() throws URISyntaxException {
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java?view=diff&rev=442998&r1=442997&r2=442998
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMWorkspace.java Wed Sep 13 08:18:46 2006
@@ -31,7 +31,6 @@
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMXMLParserWrapper;
public class FOMWorkspace
@@ -119,38 +118,6 @@
return getFirstChild(TITLE);
}
- public List<Text> getTitleElements() {
- return _getChildrenAsSet(TITLE);
- }
-
- public Text addTitle(String title) {
- FOMFactory fomfactory = (FOMFactory) factory;
- Text text = fomfactory.newTitle(Text.Type.TEXT);
- text.setValue(title);
- this.addTitle(text);
- return text;
- }
-
- public Text addTitleAsHtml(String title) {
- FOMFactory fomfactory = (FOMFactory) factory;
- Text text = fomfactory.newTitle(Text.Type.HTML);
- text.setValue(title);
- this.addTitle(text);
- return text;
- }
-
- public Text addTitleAsXhtml(String title) {
- FOMFactory fomfactory = (FOMFactory) factory;
- Text text = fomfactory.newTitle(Text.Type.XHTML);
- text.setValue(title);
- this.addTitle(text);
- return text;
- }
-
- public void addTitle(Text title) {
- addChild((OMNode) title);
- }
-
public List<Collection> getCollections() {
return _getChildrenAsSet(COLLECTION);
}