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 2007/05/24 01:22:57 UTC
svn commit: r541117 [2/2] - in /incubator/abdera/java/trunk:
core/src/main/java/org/apache/abdera/model/
core/src/main/java/org/apache/abdera/parser/
core/src/main/java/org/apache/abdera/util/
dependencies/i18n/src/main/java/org/apache/abdera/i18n/iri/...
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategories.java Wed May 23 16:22:54 2007
@@ -26,7 +26,6 @@
import org.apache.abdera.model.Category;
import org.apache.abdera.parser.stax.util.FOMHelper;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -105,8 +104,7 @@
public Category addCategory(
String scheme,
String term,
- String label)
- throws IRISyntaxException {
+ String label) {
FOMFactory factory = (FOMFactory) this.factory;
Category category = factory.newCategory(this);
category.setTerm(term);
@@ -120,13 +118,12 @@
return _getChildrenAsSet(CATEGORY);
}
- public List<Category> getCategories(String scheme) throws IRISyntaxException {
+ public List<Category> getCategories(String scheme) {
return FOMHelper.getCategories(this, scheme);
}
private List<Category> copyCategoriesWithScheme(
- List<Category> cats)
- throws IRISyntaxException {
+ List<Category> cats) {
List<Category> newcats = new ArrayList<Category>();
IRI scheme = getScheme();
for (Category cat : cats) {
@@ -138,15 +135,15 @@
return newcats;
}
- public List<Category> getCategoriesWithScheme() throws IRISyntaxException {
+ public List<Category> getCategoriesWithScheme() {
return copyCategoriesWithScheme(getCategories());
}
- public List<Category> getCategoriesWithScheme(String scheme) throws IRISyntaxException {
+ public List<Category> getCategoriesWithScheme(String scheme) {
return copyCategoriesWithScheme(getCategories(scheme));
}
- public IRI getScheme() throws IRISyntaxException {
+ public IRI getScheme() {
String value = getAttributeValue(SCHEME);
return (value != null) ? new IRI(value) : null;
}
@@ -163,22 +160,22 @@
removeAttribute(FIXED);
}
- public void setScheme(String scheme) throws IRISyntaxException {
+ public void setScheme(String scheme) {
if (scheme != null)
setAttributeValue(SCHEME, new IRI(scheme).toString());
else
removeAttribute(SCHEME);
}
- public IRI getHref() throws IRISyntaxException {
+ public IRI getHref() {
return _getUriValue(getAttributeValue(HREF));
}
- public IRI getResolvedHref() throws IRISyntaxException {
+ public IRI getResolvedHref() {
return _resolve(getResolvedBaseUri(), getHref());
}
- public void setHref(String href) throws IRISyntaxException {
+ public void setHref(String href) {
if (href != null)
setAttributeValue(HREF, (new IRI(href)).toString());
else
@@ -186,15 +183,13 @@
}
public boolean contains(
- String term)
- throws IRISyntaxException {
+ String term) {
return contains(term,null);
}
public boolean contains(
String term,
- String scheme)
- throws IRISyntaxException {
+ String scheme) {
List<Category> categories = getCategories();
IRI catscheme = getScheme();
IRI uri = (scheme != null) ?
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMCategory.java Wed May 23 16:22:54 2007
@@ -22,7 +22,6 @@
import org.apache.abdera.model.Category;
import org.apache.abdera.util.Constants;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -48,8 +47,7 @@
public FOMCategory(
String term,
String scheme,
- String label)
- throws IRISyntaxException {
+ String label) {
this();
setTerm(term);
setScheme(scheme);
@@ -104,12 +102,12 @@
removeAttribute(TERM);
}
- public IRI getScheme() throws IRISyntaxException {
+ public IRI getScheme() {
String value = getAttributeValue(SCHEME);
return (value != null) ? new IRI(value) : null;
}
- public void setScheme(String scheme) throws IRISyntaxException {
+ public void setScheme(String scheme) {
if (scheme != null)
setAttributeValue(SCHEME, new IRI(scheme).toString());
else
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=541117&r1=541116&r2=541117
==============================================================================
--- 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 May 23 16:22:54 2007
@@ -32,7 +32,6 @@
import org.apache.abdera.util.Constants;
import org.apache.abdera.util.MimeTypeHelper;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -56,8 +55,7 @@
public FOMCollection(
String title,
String href,
- String[] accepts)
- throws IRISyntaxException {
+ String[] accepts) {
this();
setTitle(title);
setHref(href);
@@ -130,15 +128,15 @@
return getFirstChild(TITLE);
}
- public IRI getHref() throws IRISyntaxException {
+ public IRI getHref() {
return _getUriValue(getAttributeValue(HREF));
}
- public IRI getResolvedHref() throws IRISyntaxException {
+ public IRI getResolvedHref() {
return _resolve(getResolvedBaseUri(), getHref());
}
- public void setHref(String href) throws IRISyntaxException {
+ public void setHref(String href) {
if (href != null)
setAttributeValue(HREF, (new IRI(href).toString()));
else
@@ -242,8 +240,7 @@
}
public Categories addCategories(
- String href)
- throws IRISyntaxException {
+ String href) {
Categories cats = ((FOMFactory)factory).newCategories();
cats.setHref(href);
addCategories(cats);
@@ -253,8 +250,7 @@
public Categories addCategories(
List<Category> categories,
boolean fixed,
- String scheme)
- throws IRISyntaxException {
+ String scheme) {
Categories cats = ((FOMFactory)factory).newCategories();
cats.setFixed(fixed);
if (scheme != null) cats.setScheme(scheme);
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMContent.java Wed May 23 16:22:54 2007
@@ -28,7 +28,6 @@
import org.apache.abdera.model.Element;
import org.apache.abdera.util.Constants;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.attachments.utils.DataHandlerUtils;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
@@ -160,15 +159,15 @@
removeAttribute(TYPE);
}
- public IRI getSrc() throws IRISyntaxException {
+ public IRI getSrc() {
return _getUriValue(getAttributeValue(SRC));
}
- public IRI getResolvedSrc() throws IRISyntaxException {
+ public IRI getResolvedSrc() {
return _resolve(getResolvedBaseUri(), getSrc());
}
- public void setSrc(String src) throws IRISyntaxException {
+ public void setSrc(String src) {
if (src != null)
setAttributeValue(SRC, (new IRI(src)).toString());
else
@@ -298,8 +297,7 @@
}
@Override
- public IRI getBaseUri()
- throws IRISyntaxException {
+ public IRI getBaseUri() {
if (Type.XHTML.equals(type)) {
Element el = getValueElement();
if (el != null) {
@@ -316,8 +314,7 @@
}
@Override
- public IRI getResolvedBaseUri()
- throws IRISyntaxException {
+ public IRI getResolvedBaseUri() {
if (Type.XHTML.equals(type)) {
Element el = getValueElement();
if (el != null) {
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMDocument.java Wed May 23 16:22:54 2007
@@ -35,7 +35,6 @@
import org.apache.abdera.model.ElementWrapper;
import org.apache.abdera.util.EntityTag;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.abdera.i18n.lang.InvalidLangTagSyntax;
import org.apache.abdera.i18n.lang.Lang;
import org.apache.axiom.om.OMComment;
@@ -115,7 +114,7 @@
return base;
}
- public void setBaseUri(String base) throws IRISyntaxException {
+ public void setBaseUri(String base) {
this.base = new IRI(base);
}
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMElement.java Wed May 23 16:22:54 2007
@@ -52,7 +52,6 @@
import org.apache.abdera.util.MimeTypeHelper;
import org.apache.abdera.util.URIHelper;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.abdera.i18n.lang.InvalidLangTagSyntax;
import org.apache.abdera.i18n.lang.Lang;
import org.apache.axiom.om.OMAttribute;
@@ -228,7 +227,7 @@
setAttributeValue(LANG,language);
}
- public IRI getBaseUri() throws IRISyntaxException {
+ public IRI getBaseUri() {
IRI uri = _getUriValue(getAttributeValue(BASE));
if (URIHelper.isJavascriptUri(uri) ||
URIHelper.isMailtoUri(uri)) { uri = null; }
@@ -242,7 +241,7 @@
return uri;
}
- public IRI getResolvedBaseUri() throws IRISyntaxException {
+ public IRI getResolvedBaseUri() {
IRI baseUri = null;
IRI uri = _getUriValue(getAttributeValue(BASE));
if (URIHelper.isJavascriptUri(uri) ||
@@ -263,7 +262,7 @@
setAttributeValue(BASE,_getStringValue(base));
}
- public void setBaseUri(String base) throws IRISyntaxException {
+ public void setBaseUri(String base) {
setBaseUri((base != null) ? new IRI(base) : null);
}
@@ -317,7 +316,7 @@
}
}
- protected IRI _getUriValue(String v) throws IRISyntaxException {
+ protected IRI _getUriValue(String v) {
return (v != null) ? new IRI(v) : null;
}
@@ -325,7 +324,7 @@
return (uri != null) ? uri.toString() : null;
}
- protected IRI _resolve(IRI base, IRI value) throws IRISyntaxException {
+ protected IRI _resolve(IRI base, IRI value) {
if (value == null) return null;
if ("".equals(value.toString()) ||
"#".equals(value.toString()) ||
@@ -504,7 +503,7 @@
}
- protected Element _parse(String value, IRI baseUri) throws ParseException, IRISyntaxException, UnsupportedEncodingException {
+ protected Element _parse(String value, IRI baseUri) throws ParseException, UnsupportedEncodingException {
if (value == null) return null;
FOMFactory fomfactory = (FOMFactory) factory;
Parser parser = fomfactory.newParser();
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMEntry.java Wed May 23 16:22:54 2007
@@ -48,7 +48,6 @@
import org.apache.abdera.util.URIHelper;
import org.apache.abdera.i18n.io.InputStreamDataSource;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -124,7 +123,7 @@
return person;
}
- public Person addAuthor(String name, String email, String uri) throws IRISyntaxException {
+ public Person addAuthor(String name, String email, String uri) {
FOMFactory fomfactory = (FOMFactory) this.factory;
Person person = fomfactory.newAuthor(this);
person.setName(name);
@@ -137,7 +136,7 @@
return _getChildrenAsSet(CATEGORY);
}
- public List<Category> getCategories(String scheme) throws IRISyntaxException {
+ public List<Category> getCategories(String scheme) {
return FOMHelper.getCategories(this, scheme);
}
@@ -163,7 +162,7 @@
return category;
}
- public Category addCategory(String scheme, String term, String label) throws IRISyntaxException {
+ public Category addCategory(String scheme, String term, String label) {
FOMFactory factory = (FOMFactory) this.factory;
Category category = factory.newCategory(this);
category.setTerm(term);
@@ -299,7 +298,7 @@
* @throws MimeTypeParseException
* @throws IRISyntaxException
*/
- public Content setContent(IRI uri, String mediatype) throws MimeTypeParseException, IRISyntaxException {
+ public Content setContent(IRI uri, String mediatype) throws MimeTypeParseException {
FOMFactory factory = (FOMFactory) this.factory;
Content content = factory.newContent(new MimeType(mediatype));
content.setSrc(uri.toString());
@@ -327,7 +326,7 @@
String name,
String email,
String uri)
- throws IRISyntaxException {
+ {
FOMFactory fomfactory = (FOMFactory) this.factory;
Person person = fomfactory.newContributor(this);
person.setName(name);
@@ -347,20 +346,20 @@
_removeChildren(ID, false);
}
- public IRI getId() throws IRISyntaxException {
+ public IRI getId() {
IRIElement id = getIdElement();
return (id != null) ? id.getValue() : null;
}
- public IRIElement setId(String value) throws IRISyntaxException {
+ public IRIElement setId(String value) {
return setId(value, false);
}
- public IRIElement newId() throws IRISyntaxException {
+ public IRIElement newId() {
return setId(this.getFactory().newUuidUri(), false);
}
- public IRIElement setId(String value, boolean normalize) throws IRISyntaxException {
+ public IRIElement setId(String value, boolean normalize) {
if (value == null) {
_removeChildren(ID, false);
return null;
@@ -390,11 +389,11 @@
addChild((OMElement)link);
}
- public Link addLink(String href) throws IRISyntaxException {
+ public Link addLink(String href) {
return addLink(href, null);
}
- public Link addLink(String href, String rel) throws IRISyntaxException {
+ public Link addLink(String href, String rel) {
FOMFactory fomfactory = (FOMFactory) factory;
Link link = fomfactory.newLink(this);
link.setHref(href);
@@ -409,7 +408,7 @@
String title,
String hreflang,
long length)
- throws IRISyntaxException, MimeTypeParseException {
+ throws MimeTypeParseException {
FOMFactory fomfactory = (FOMFactory) factory;
Link link = fomfactory.newLink(this);
link.setHref(href);
@@ -739,27 +738,27 @@
return getLink(Link.REL_EDIT_MEDIA);
}
- public IRI getLinkResolvedHref(String rel) throws IRISyntaxException {
+ public IRI getLinkResolvedHref(String rel) {
Link link = getLink(rel);
return (link != null) ? link.getResolvedHref() : null;
}
- public IRI getAlternateLinkResolvedHref() throws IRISyntaxException {
+ public IRI getAlternateLinkResolvedHref() {
Link link = getAlternateLink();
return (link != null) ? link.getResolvedHref() : null;
}
- public IRI getEnclosureLinkResolvedHref() throws IRISyntaxException {
+ public IRI getEnclosureLinkResolvedHref() {
Link link = getEnclosureLink();
return (link != null) ? link.getResolvedHref() : null;
}
- public IRI getEditLinkResolvedHref() throws IRISyntaxException {
+ public IRI getEditLinkResolvedHref() {
Link link = getEditLink();
return (link != null) ? link.getResolvedHref() : null;
}
- public IRI getEditMediaLinkResolvedHref() throws IRISyntaxException {
+ public IRI getEditMediaLinkResolvedHref() {
Link link = getEditMediaLink();
return (link != null) ? link.getResolvedHref() : null;
}
- public IRI getSelfLinkResolvedHref() throws IRISyntaxException {
+ public IRI getSelfLinkResolvedHref() {
Link link = getSelfLink();
return (link != null) ? link.getResolvedHref() : null;
}
@@ -775,7 +774,7 @@
return dh.getInputStream();
}
- public IRI getContentSrc() throws IRISyntaxException {
+ public IRI getContentSrc() {
Content content = getContentElement();
return (content != null) ? content.getResolvedSrc() : null;
}
@@ -815,8 +814,7 @@
public IRI getAlternateLinkResolvedHref(
String type,
String hreflang)
- throws IRISyntaxException,
- MimeTypeParseException {
+ throws MimeTypeParseException {
Link link = getAlternateLink(type, hreflang);
return (link != null) ? link.getResolvedHref() : null;
}
@@ -831,8 +829,7 @@
public IRI getEditMediaLinkResolvedHref(
String type,
String hreflang)
- throws IRISyntaxException,
- MimeTypeParseException {
+ throws MimeTypeParseException {
Link link = getEditMediaLink(type, hreflang);
return (link != null) ? link.getResolvedHref() : null;
}
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFactory.java Wed May 23 16:22:54 2007
@@ -55,7 +55,6 @@
import org.apache.abdera.util.Constants;
import org.apache.abdera.util.MimeTypeHelper;
import org.apache.abdera.util.Version;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -284,9 +283,7 @@
Generator generator = newGenerator(parent);
generator.setVersion(Version.VERSION);
generator.setText(Version.APP_NAME);
- try {
- generator.setUri(Version.URI);
- } catch (IRISyntaxException e) { /* Can't happen */ }
+ generator.setUri(Version.URI);
return generator;
}
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMFeed.java Wed May 23 16:22:54 2007
@@ -30,7 +30,6 @@
import org.apache.abdera.model.Source;
import org.apache.abdera.util.Constants;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -198,7 +197,7 @@
}
};
- public Entry getEntry(String id) throws IRISyntaxException {
+ public Entry getEntry(String id) {
if (id == null) return null;
List<Entry> l = getEntries();
for (Entry e : l) {
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMGenerator.java Wed May 23 16:22:54 2007
@@ -22,7 +22,6 @@
import org.apache.abdera.model.Generator;
import org.apache.abdera.util.Constants;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -43,7 +42,7 @@
String value,
String version,
String uri)
- throws IRISyntaxException {
+ {
this();
setText(value);
setVersion(version);
@@ -89,16 +88,16 @@
super(GENERATOR, parent, factory, builder);
}
- public IRI getUri() throws IRISyntaxException {
+ public IRI getUri() {
String value = getAttributeValue(AURI);
return (value != null) ? new IRI(value) : null;
}
- public IRI getResolvedUri() throws IRISyntaxException {
+ public IRI getResolvedUri() {
return _resolve(getResolvedBaseUri(), getUri());
}
- public void setUri(String uri) throws IRISyntaxException {
+ public void setUri(String uri) {
if (uri != null)
setAttributeValue(AURI, (new IRI(uri)).toString());
else
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMIRI.java Wed May 23 16:22:54 2007
@@ -22,7 +22,6 @@
import org.apache.abdera.model.IRIElement;
import org.apache.abdera.util.URIHelper;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -39,7 +38,7 @@
super(qname);
}
- public FOMIRI(QName qname, String value) throws IRISyntaxException {
+ public FOMIRI(QName qname, String value) {
this(qname);
setValue(value);
}
@@ -70,11 +69,11 @@
super(qname, parent, factory, builder);
}
- public IRI getValue() throws IRISyntaxException {
+ public IRI getValue() {
return _getUriValue(getText());
}
- public void setValue(String iri) throws IRISyntaxException {
+ public void setValue(String iri) {
if (iri != null)
setText((new IRI(iri)).toString());
else
@@ -82,11 +81,11 @@
}
- public IRI getResolvedValue() throws IRISyntaxException {
+ public IRI getResolvedValue() {
return _resolve(getResolvedBaseUri(), getValue());
}
- public void setNormalizedValue(String uri) throws IRISyntaxException {
+ public void setNormalizedValue(String uri) {
if (uri != null)
setValue(URIHelper.normalize(uri));
else
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMLink.java Wed May 23 16:22:54 2007
@@ -28,7 +28,6 @@
import org.apache.abdera.util.Constants;
import org.apache.abdera.util.URIHelper;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMFactory;
@@ -47,7 +46,7 @@
public FOMLink(
String href)
- throws IRISyntaxException {
+ {
this();
setHref(href);
}
@@ -55,7 +54,7 @@
public FOMLink(
String href,
String rel)
- throws IRISyntaxException {
+ {
this();
setHref(href);
setRel(rel);
@@ -102,15 +101,15 @@
super(qname, parent, factory, builder);
}
- public IRI getHref() throws IRISyntaxException {
+ public IRI getHref() {
return _getUriValue(getAttributeValue(HREF));
}
- public IRI getResolvedHref() throws IRISyntaxException {
+ public IRI getResolvedHref() {
return _resolve(getResolvedBaseUri(), getHref());
}
- public void setHref(String href) throws IRISyntaxException {
+ public void setHref(String href) {
if (href != null)
setAttributeValue(HREF, (new IRI(href)).toString());
else
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMPerson.java Wed May 23 16:22:54 2007
@@ -23,7 +23,6 @@
import org.apache.abdera.model.IRIElement;
import org.apache.abdera.model.Person;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -52,8 +51,7 @@
QName qname,
String name,
String email,
- String uri)
- throws IRISyntaxException {
+ String uri) {
this(qname);
setName(name);
setEmail(email);
@@ -157,7 +155,7 @@
_removeChildren(URI, false);
}
- public IRIElement setUri(String uri) throws IRISyntaxException {
+ public IRIElement setUri(String uri) {
if (uri != null) {
FOMFactory fomfactory = (FOMFactory) factory;
IRIElement el = fomfactory.newUri(null);
@@ -170,7 +168,7 @@
}
}
- public IRI getUri() throws IRISyntaxException {
+ public IRI getUri() {
IRIElement iri = getUriElement();
return (iri != null) ? iri.getResolvedValue() : null;
}
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMSource.java Wed May 23 16:22:54 2007
@@ -40,7 +40,6 @@
import org.apache.abdera.util.Constants;
import org.apache.abdera.util.URIHelper;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -118,7 +117,7 @@
return person;
}
- public Person addAuthor(String name, String email, String uri) throws IRISyntaxException {
+ public Person addAuthor(String name, String email, String uri) {
FOMFactory fomfactory = (FOMFactory) this.factory;
Person person = fomfactory.newAuthor(this);
person.setName(name);
@@ -131,7 +130,7 @@
return _getChildrenAsSet(CATEGORY);
}
- public List<Category> getCategories(String scheme) throws IRISyntaxException {
+ public List<Category> getCategories(String scheme) {
return FOMHelper.getCategories(this, scheme);
}
@@ -157,7 +156,7 @@
return category;
}
- public Category addCategory(String scheme, String term, String label) throws IRISyntaxException {
+ public Category addCategory(String scheme, String term, String label) {
FOMFactory factory = (FOMFactory) this.factory;
Category category = factory.newCategory(this);
category.setTerm(term);
@@ -181,7 +180,7 @@
return person;
}
- public Person addContributor(String name, String email, String uri) throws IRISyntaxException {
+ public Person addContributor(String name, String email, String uri) {
FOMFactory fomfactory = (FOMFactory) this.factory;
Person person = fomfactory.newContributor(this);
person.setName(name);
@@ -201,20 +200,20 @@
_removeChildren(ID, false);
}
- public IRI getId() throws IRISyntaxException {
+ public IRI getId() {
IRIElement id = getIdElement();
return (id != null) ? id.getValue() : null;
}
- public IRIElement setId(String value) throws IRISyntaxException {
+ public IRIElement setId(String value) {
return setId(value, false);
}
- public IRIElement newId() throws IRISyntaxException {
+ public IRIElement newId() {
return setId(this.getFactory().newUuidUri(), false);
}
- public IRIElement setId(String value, boolean normalize) throws IRISyntaxException {
+ public IRIElement setId(String value, boolean normalize) {
if (value == null) {
_removeChildren(ID, false);
return null;
@@ -244,11 +243,11 @@
addChild((OMElement)link);
}
- public Link addLink(String href) throws IRISyntaxException {
+ public Link addLink(String href) {
return addLink(href, null);
}
- public Link addLink(String href, String rel) throws IRISyntaxException {
+ public Link addLink(String href, String rel) {
FOMFactory fomfactory = (FOMFactory) factory;
Link link = fomfactory.newLink(this);
link.setHref(href);
@@ -256,7 +255,7 @@
return link;
}
- public Link addLink(String href, String rel, String type, String title, String hreflang, long length) throws IRISyntaxException, MimeTypeParseException {
+ public Link addLink(String href, String rel, String type, String title, String hreflang, long length) throws MimeTypeParseException {
FOMFactory fomfactory = (FOMFactory) factory;
Link link = fomfactory.newLink(this);
link.setHref(href);
@@ -459,7 +458,7 @@
String uri,
String version,
String value)
- throws IRISyntaxException {
+ {
FOMFactory fomfactory = (FOMFactory) factory;
Generator generator = fomfactory.newGenerator(this);
if (uri != null) generator.setUri(uri);
@@ -479,7 +478,7 @@
_removeChildren(ICON, false);
}
- public IRIElement setIcon(String value) throws IRISyntaxException {
+ public IRIElement setIcon(String value) {
if (value == null) {
_removeChildren(ICON, false);
return null;
@@ -490,7 +489,7 @@
return iri;
}
- public IRI getIcon() throws IRISyntaxException {
+ public IRI getIcon() {
IRIElement iri = getIconElement();
IRI uri = (iri != null) ? iri.getResolvedValue() : null;
return (URIHelper.isJavascriptUri(uri) ||
@@ -508,7 +507,7 @@
_removeChildren(LOGO, false);
}
- public IRIElement setLogo(String value) throws IRISyntaxException {
+ public IRIElement setLogo(String value) {
if (value == null) {
_removeChildren(LOGO, false);
return null;
@@ -519,7 +518,7 @@
return iri;
}
- public IRI getLogo() throws IRISyntaxException {
+ public IRI getLogo() {
IRIElement iri = getLogoElement();
IRI uri = (iri != null) ? iri.getResolvedValue() : null;
return (URIHelper.isJavascriptUri(uri) ||
@@ -541,15 +540,15 @@
return getLink(Link.REL_ALTERNATE);
}
- public IRI getLinkResolvedHref(String rel) throws IRISyntaxException {
+ public IRI getLinkResolvedHref(String rel) {
Link link = getLink(rel);
return (link != null) ? link.getResolvedHref() : null;
}
- public IRI getSelfLinkResolvedHref() throws IRISyntaxException {
+ public IRI getSelfLinkResolvedHref() {
Link link = getSelfLink();
return (link != null) ? link.getResolvedHref() : null;
}
- public IRI getAlternateLinkResolvedHref() throws IRISyntaxException {
+ public IRI getAlternateLinkResolvedHref() {
Link link = getAlternateLink();
return (link != null) ? link.getResolvedHref() : null;
}
@@ -590,8 +589,7 @@
public IRI getAlternateLinkResolvedHref(
String type,
String hreflang)
- throws IRISyntaxException,
- MimeTypeParseException {
+ throws MimeTypeParseException {
Link link = getAlternateLink(type, hreflang);
return (link != null) ? link.getResolvedHref() : null;
}
Modified: incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java (original)
+++ incubator/abdera/java/trunk/parser/src/main/java/org/apache/abdera/parser/stax/FOMText.java Wed May 23 16:22:54 2007
@@ -24,7 +24,6 @@
import org.apache.abdera.model.Text;
import org.apache.abdera.util.Constants;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -174,8 +173,7 @@
}
@Override
- public IRI getBaseUri()
- throws IRISyntaxException {
+ public IRI getBaseUri() {
if (Type.XHTML.equals(type)) {
Element el = getValueElement();
if (el != null) {
@@ -192,8 +190,7 @@
}
@Override
- public IRI getResolvedBaseUri()
- throws IRISyntaxException {
+ public IRI getResolvedBaseUri() {
if (Type.XHTML.equals(type)) {
Element el = getValueElement();
if (el != null) {
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=541117&r1=541116&r2=541117
==============================================================================
--- 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 May 23 16:22:54 2007
@@ -27,7 +27,6 @@
import org.apache.abdera.model.Text;
import org.apache.abdera.model.Workspace;
import org.apache.abdera.util.Constants;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
@@ -140,7 +139,7 @@
addChild((OMElement)collection);
}
- public Collection addCollection(String title, String href) throws IRISyntaxException {
+ public Collection addCollection(String title, String href) {
FOMFactory fomfactory = (FOMFactory) factory;
Collection collection = fomfactory.newCollection(this);
collection.setTitle(title);
Modified: incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java (original)
+++ incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/Response.java Wed May 23 16:22:54 2007
@@ -27,7 +27,6 @@
import org.apache.abdera.protocol.util.ProtocolConstants;
import org.apache.abdera.util.EntityTag;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
public interface Response
extends ProtocolConstants {
@@ -57,7 +56,7 @@
public String getContentLanguage();
- public IRI getContentLocation() throws IRISyntaxException;
+ public IRI getContentLocation();
public long getContentLength();
@@ -65,13 +64,13 @@
public String getAllow();
- public IRI getLocation() throws IRISyntaxException;
+ public IRI getLocation();
public String getSlug();
public Date getDateHeader(String name);
- public IRI getUriHeader(String name) throws IRISyntaxException;
+ public IRI getUriHeader(String name);
public String getHeader(String name);
Modified: incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java (original)
+++ incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/AbstractResponse.java Wed May 23 16:22:54 2007
@@ -26,7 +26,6 @@
import org.apache.abdera.util.EntityTag;
import org.apache.abdera.i18n.iri.Escaping;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
public abstract class AbstractResponse
implements Response {
@@ -59,7 +58,7 @@
return (value != null) ? Long.parseLong(value) : -1;
}
- public IRI getContentLocation() throws IRISyntaxException {
+ public IRI getContentLocation() {
return getUriHeader("Content-Location");
}
@@ -85,7 +84,7 @@
return getDateHeader("Last-Modified");
}
- public IRI getLocation() throws IRISyntaxException {
+ public IRI getLocation() {
return getUriHeader("Location");
}
@@ -109,7 +108,7 @@
return ResponseType.select(getStatus());
}
- public IRI getUriHeader(String name) throws IRISyntaxException {
+ public IRI getUriHeader(String name) {
String value = getHeader(name);
return (value != null) ? new IRI(value) : null;
}
Modified: incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java (original)
+++ incubator/abdera/java/trunk/security/src/main/java/org/apache/abdera/security/xmlsec/XmlSignature.java Wed May 23 16:22:54 2007
@@ -30,7 +30,6 @@
import org.apache.abdera.security.util.Constants;
import org.apache.abdera.security.util.SignatureBase;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.keys.KeyInfo;
import org.apache.xml.security.signature.XMLSignature;
@@ -60,8 +59,7 @@
private <T extends Element>T _sign(
T element,
SignatureOptions options)
- throws XMLSecurityException,
- IRISyntaxException {
+ throws XMLSecurityException{
element.setBaseUri(element.getResolvedBaseUri());
org.w3c.dom.Element dom = fomToDom((Element)element.clone(), options);
org.w3c.dom.Document domdoc = dom.getOwnerDocument();
@@ -98,8 +96,7 @@
private boolean is_valid_signature(
XMLSignature sig)
throws XMLSignatureException,
- XMLSecurityException,
- IRISyntaxException {
+ XMLSecurityException {
boolean answer = false;
KeyInfo ki = sig.getKeyInfo();
if (ki != null) {
@@ -120,8 +117,7 @@
T element,
SignatureOptions options)
throws XMLSignatureException,
- XMLSecurityException,
- IRISyntaxException {
+ XMLSecurityException {
List<X509Certificate> certs = new ArrayList<X509Certificate>();
org.w3c.dom.Element dom = fomToDom((Element)element, options);
NodeList children = dom.getChildNodes();
@@ -164,8 +160,7 @@
Element element,
SignatureOptions options)
throws XMLSignatureException,
- XMLSecurityException,
- IRISyntaxException {
+ XMLSecurityException {
boolean answer = false;
org.w3c.dom.Element dom = fomToDom((Element)element, options);
NodeList children = dom.getChildNodes();
Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/provider/AbstractRequestContext.java Wed May 23 16:22:54 2007
@@ -30,7 +30,6 @@
import org.apache.abdera.protocol.server.ServiceContext;
import org.apache.abdera.protocol.util.AbstractRequest;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
public abstract class AbstractRequestContext
extends AbstractRequest
@@ -100,13 +99,9 @@
throws ParseException,
IOException {
if (document == null) {
- try {
- return parser.parse(
- getInputStream(),
- null, options);
- } catch (IRISyntaxException e) {
- throw new ParseException(e); // won't never happen
- }
+ return parser.parse(
+ getInputStream(),
+ null, options);
}
return document;
}
Modified: incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java?view=diff&rev=541117&r1=541116&r2=541117
==============================================================================
--- incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java (original)
+++ incubator/abdera/java/trunk/server/src/main/java/org/apache/abdera/protocol/server/servlet/HttpServletRequestContext.java Wed May 23 16:22:54 2007
@@ -35,7 +35,6 @@
import org.apache.abdera.protocol.server.provider.RequestContext;
import org.apache.abdera.protocol.server.provider.TargetResolver;
import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.i18n.iri.IRISyntaxException;
public class HttpServletRequestContext
extends AbstractRequestContext
@@ -208,24 +207,18 @@
buffer.append(request.getContextPath());
// So that .resolve() works appropriately.
buffer.append("/");
- try {
- return new IRI(buffer.toString());
- } catch (IRISyntaxException e) {
- throw new RuntimeException(e);
- }
+ return new IRI(buffer.toString());
}
private static IRI initRequestUri(HttpServletRequest request) {
IRI uri = null;
- try {
- StringBuffer buf =
- new StringBuffer(
- request.getRequestURI());
- String qs = request.getQueryString();
- if (qs != null && qs.length() != 0)
- buf.append("?" + request.getQueryString());
- uri = new IRI(buf.toString());
- } catch (IRISyntaxException e) {}
+ StringBuffer buf =
+ new StringBuffer(
+ request.getRequestURI());
+ String qs = request.getQueryString();
+ if (qs != null && qs.length() != 0)
+ buf.append("?" + request.getQueryString());
+ uri = new IRI(buf.toString());
return uri;
}
}