Author: tyrell Date: Thu Feb 12 22:27:07 2009 New Revision: 30748 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=30748
Log: Fixing MASHUP-1097 Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomEntryHostObject.java branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomFeedHostObject.java branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Entry.java branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Feed.java branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IEntry.java branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IFeed.java Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomEntryHostObject.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomEntryHostObject.java?rev=30748&r1=30747&r2=30748&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomEntryHostObject.java (original) +++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomEntryHostObject.java Thu Feb 12 22:27:07 2009 @@ -23,6 +23,7 @@ import org.mozilla.javascript.Context; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; +import org.mozilla.javascript.NativeArray; import org.wso2.javascript.xmlimpl.XML; import org.wso2.mashup.hostobjects.feed.IEntry; import org.wso2.mashup.MashupFault; @@ -204,16 +205,16 @@ entry.addLink(String.valueOf(link)); } - public String[] jsGet_link() { + public NativeArray jsGet_link() { if (entry != null) { List list = entry.getLinks(); int size = list.size(); - String[] links = new String[size]; + NativeArray nativeArray = new NativeArray(0); for (int i = 0; i < size; i++) { Link element = (Link) list.get(i); - links[i] = element.getHref().toString(); + nativeArray.put(i, nativeArray, element.getHref().toString()); } - return links; + return nativeArray; } return null; } @@ -275,7 +276,7 @@ public void jsSet_title(Object title) { if (title instanceof XML) { entry.setTitleAsXhtml(title.toString()); - } else { + } else { entry.setTitle(String.valueOf(title)); } } Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomFeedHostObject.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomFeedHostObject.java?rev=30748&r1=30747&r2=30748&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomFeedHostObject.java (original) +++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/atom/AtomFeedHostObject.java Thu Feb 12 22:27:07 2009 @@ -26,6 +26,7 @@ import org.mozilla.javascript.Function; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; +import org.mozilla.javascript.NativeArray; import org.wso2.javascript.xmlimpl.XML; import org.wso2.mashup.hostobjects.feed.IFeed; import org.wso2.mashup.hostobjects.file.JavaScriptFileObject; @@ -207,16 +208,16 @@ feed.addLink(String.valueOf(link)); } - public String[] jsGet_link() { + public NativeArray jsGet_link() { if (feed != null) { + NativeArray nativeArray = new NativeArray(0); List list = feed.getLinks(); int size = list.size(); - String[] links = new String[size]; for (int i = 0; i < size; i++) { Link element = (Link) list.get(i); - links[i] = element.getHref().toString(); + nativeArray.put(i, nativeArray, element.getHref().toString()); } - return links; + return nativeArray; } return null; } Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Entry.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Entry.java?rev=30748&r1=30747&r2=30748&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Entry.java (original) +++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Entry.java Thu Feb 12 22:27:07 2009 @@ -30,6 +30,7 @@ import org.mozilla.javascript.Function; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; +import org.mozilla.javascript.NativeArray; import org.wso2.mashup.MashupFault; import java.util.ArrayList; @@ -152,21 +153,19 @@ entry.setLink(String.valueOf(link)); } - public String[] jsGet_link() { - String[] links; - if (entry.getLinks().size() > 0) { + public NativeArray jsGet_link() { + NativeArray nativeArray = new NativeArray(0); + if (entry.getLinks() != null) { List list = entry.getLinks(); int size = list.size(); - links = new String[size]; for (int i = 0; i < size; i++) { SyndLink element = (SyndLink) list.get(i); - links[i] = element.getHref(); + nativeArray.put(i, nativeArray, element.getHref()); } - return links; + return nativeArray; } else if (entry.getLink() != null) { - links = new String[1]; - links[0] = entry.getLink(); - return links; + nativeArray.put(0, nativeArray, entry.getLink()); + return nativeArray; } return null; Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Feed.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Feed.java?rev=30748&r1=30747&r2=30748&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Feed.java (original) +++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/Feed.java Thu Feb 12 22:27:07 2009 @@ -26,6 +26,7 @@ import org.mozilla.javascript.Function; import org.mozilla.javascript.Scriptable; import org.mozilla.javascript.ScriptableObject; +import org.mozilla.javascript.NativeArray; import org.wso2.mashup.MashupFault; import org.wso2.mashup.hostobjects.file.JavaScriptFileObject; @@ -167,22 +168,20 @@ feed.setLink(String.valueOf(link)); } - public String[] jsGet_link() { + public NativeArray jsGet_link() { if (feed != null) { - String[] links; - if (feed.getLinks().size() > 0) { + NativeArray nativeArray = new NativeArray(0); + if (feed.getLinks() != null) { List list = feed.getLinks(); int size = list.size(); - links = new String[size]; for (int i = 0; i < size; i++) { SyndLink element = (SyndLink) list.get(i); - links[i] = element.getHref(); + nativeArray.put(i, nativeArray, element.getHref()); } - return links; + return nativeArray; } else if (feed.getLink().compareTo("") != 0) { - links = new String[1]; - links[0] = feed.getLink(); - return links; + nativeArray.put(0, nativeArray, feed.getLink()); + return nativeArray; } } return null; Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IEntry.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IEntry.java?rev=30748&r1=30747&r2=30748&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IEntry.java (original) +++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IEntry.java Thu Feb 12 22:27:07 2009 @@ -16,6 +16,7 @@ package org.wso2.mashup.hostobjects.feed; import org.mozilla.javascript.Scriptable; +import org.mozilla.javascript.NativeArray; import org.wso2.mashup.MashupFault; import java.util.Date; @@ -47,7 +48,7 @@ void jsSet_link(Object link); - String[] jsGet_link(); + NativeArray jsGet_link(); void jsSet_published(Object published) throws MashupFault; Modified: branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IFeed.java URL: http://wso2.org/svn/browse/wso2/branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IFeed.java?rev=30748&r1=30747&r2=30748&view=diff ============================================================================== --- branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IFeed.java (original) +++ branches/mashup/java/1.5/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/feed/IFeed.java Thu Feb 12 22:27:07 2009 @@ -16,6 +16,7 @@ package org.wso2.mashup.hostobjects.feed; import org.mozilla.javascript.Scriptable; +import org.mozilla.javascript.NativeArray; import org.wso2.mashup.MashupFault; @@ -41,7 +42,7 @@ void jsSet_link(Object link); - String[] jsGet_link(); + NativeArray jsGet_link(); void jsSet_title(Object title); _______________________________________________ Mashup-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
