svn commit: r633971 - /incubator/tuscany/java/sca/modules/binding-feed-atom/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java

[jsdelfino]

Author: jsdelfino
Date: Wed Mar  5 10:50:29 2008
New Revision: 633971

URL: http://svn.apache.org/viewvc?rev=633971&view=rev
Log:
Support atom 'related' links.

Modified:
    
incubator/tuscany/java/sca/modules/binding-feed-atom/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java

Modified: 
incubator/tuscany/java/sca/modules/binding-feed-atom/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-feed-atom/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java?rev=633971&r1=633970&r2=633971&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-feed-atom/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-feed-atom/src/main/java/org/apache/tuscany/sca/binding/feed/provider/FeedBindingListenerServlet.java
 Wed Mar  5 10:50:29 2008
@@ -324,7 +324,7 @@
 
             String href = item.getLink();
             if (href == null && key != null) {
-                       href = key.toString();
+                href = key.toString();
             }
 
             if (href != null) {
@@ -332,15 +332,19 @@
                 feedEntry.addLink(href,"alternate");
             }
                 
+            String related = item.getRelated();
+            if (related != null) {
+                feedEntry.addLink(href, "related");
+            }
+                
             Date date = item.getDate();
-            if (date == null) {
-                date = new Date();
+            if (date != null) {
+                feedEntry.setUpdated(date);
             }
-            feedEntry.setUpdated(date);
             return feedEntry;
             
         } else if (data != null) {
-                Entry feedEntry = abdera.getFactory().newEntry();
+            Entry feedEntry = abdera.getFactory().newEntry();
              feedEntry.setId(key.toString());
              feedEntry.setTitle("item");
              
@@ -357,8 +361,6 @@
              feedEntry.addLink(key.toString(), "edit");
              feedEntry.addLink(key.toString(), "alternate");
      
-             feedEntry.setUpdated(new Date());
-
              return feedEntry;
         } else {
             return null;
@@ -382,12 +384,15 @@
                 
                 for (Link link : feedEntry.getLinks()) {
                     if (link.getRel() == null || "edit".equals(link.getRel())) 
{
-                        String href = link.getHref().toString();
-                        if (href.startsWith("null/")) {
-                            href = href.substring(5);
+                        if (item.getLink() == null) {
+                            String href = link.getHref().toString();
+                            item.setLink(href);
+                        }
+                    } else if ("related".equals(link.getRel())) {
+                        if (item.getRelated() == null) {
+                            String related = link.getHref().toString();
+                            item.setRelated(related);
                         }
-                        item.setLink(href);
-                        break;
                     }
                 }
                 
@@ -400,7 +405,6 @@
                if ( feedEntry.getId() != null) {
                        feedEntry.getId().toString();
                }
-                
                 
                 // Create the item from XML
                if (feedEntry.getContentElement().getElements().size() == 0) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]