Merged xdebug from 1.3.x

[phpeclipse.git] / archive / net.sourceforge.phpeclipse.news / src / net / sourceforge / phpeclipse / news / Item.java

diff --git a/archive/net.sourceforge.phpeclipse.news/src/net/sourceforge/phpeclipse/news/Item.java b/archive/net.sourceforge.phpeclipse.news/src/net/sourceforge/phpeclipse/news/Item.java
index bce05ec..9073b48 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.news/src/net/sourceforge/phpeclipse/news/Item.java
+++ b/archive/net.sourceforge.phpeclipse.news/src/net/sourceforge/phpeclipse/news/Item.java
@@ -18,7 +18,7 @@ import org.w3c.dom.Text;
 /**
  * @author jnegre - http://www.jnegre.org/
  *
- * (c)Copyright 2002 Jérôme Nègre
+ * (c)Copyright 2002 J�r�me N�gre
  * 
  */
 public class Item {
@@ -45,7 +45,11 @@ public class Item {
         this.channel = channel;
         this.title = readValue("title", itemElement, 0);
         this.link = readValue("link", itemElement, 0);
-        this.description = readValue("description", itemElement, 0);
+        
+        String simpleDescription = readValue("description", itemElement, 0);
+        String contentEncoded = readValue("content:encoded", itemElement, 0);
+        this.description = contentEncoded!=null?contentEncoded:simpleDescription;
+        
         this.author = readValue("author", itemElement, 0);
         this.guid = readValue("guid", itemElement, 1);
         String pubDate = readValue("pubDate", itemElement, 0);
@@ -188,7 +192,7 @@ public class Item {
                     if(string.charAt(position) == 'Z') {
                         calendar.set(Calendar.ZONE_OFFSET,0);
                         if(length != position +1) {
-                            //trop de caractères
+                            //trop de caract�res
                             throw new Exception("Invalid format of dc:date (extra tokens)");
                         }
                     } else if(string.charAt(position) == '+' || string.charAt(position) == '-') {
@@ -198,7 +202,7 @@ public class Item {
                         int minute = readInt(string,position+4,2);
                         calendar.set(Calendar.ZONE_OFFSET,sign*(hour*60*60*1000+minute*60*1000));
                         if(length != position +6) {
-                            //trop de caractères
+                            //trop de caract�res
                             throw new Exception("Invalid format of dc:date (extra tokens)");
                         }
                     } else {