Changeset 9902 for extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/CommentDao.java

Timestamp:

Mar 27, 2011, 6:18:38 PM (13 years ago)

Author:

mlg

Message:

Removes jdom lib and changes apache HTTPClient to the newest one
For more compatibility. I _think_ android is now compatible.

File:

• extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/CommentDao.java (modified) (3 diffs)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/dao/CommentDao.java

@@ -5 +5 @@
 import java.util.List;
 
-import org.jdom.Document;
-import org.jdom.Element;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 import fr.mael.jiwigo.om.Comment;
@@ -72 +74 @@
         Document doc = (sessionManager.executeReturnDocument(MethodsEnum.GET_INFO.getLabel(), "image_id", String
                 .valueOf(idImage), "comments_per_page", "100"));
-        Element element = doc.getRootElement().getChild("image").getChild("comments");
-        List<Element> listElement = (List<Element>) element.getChildren("comment");
+        Element elementImage = (Element) doc.getDocumentElement().getElementsByTagName("image").item(0);
+        Element elementComments = (Element) elementImage.getElementsByTagName("comments").item(0);
+        NodeList listComments = elementComments.getElementsByTagName("comment");
         ArrayList<Comment> comments = new ArrayList<Comment>();
-        for (Element com : listElement) {
-            Comment myCom = new Comment();
-            myCom.setIdentifier(Integer.valueOf(com.getAttributeValue("id")));
-            myCom.setDate(com.getAttributeValue("date"));
-            myCom.setAuthor(com.getChildText("author"));
-            myCom.setContent(com.getChildText("content"));
-            comments.add(myCom);
+        for (int i = 0; i < listComments.getLength(); i++) {
+            Node nodeCom = listComments.item(i);
+            if (nodeCom.getNodeType() == Node.ELEMENT_NODE) {
+                Element com = (Element) nodeCom;
+                Comment myCom = new Comment();
+                myCom.setIdentifier(Integer.valueOf(com.getAttribute("id")));
+                myCom.setDate(com.getAttribute("date"));
+                myCom.setAuthor(Tools.getStringValueDom(com, "author"));
+                myCom.setContent(Tools.getStringValueDom(com, "content"));
+                comments.add(myCom);
+            }
         }
         return comments;
@@ -96 +103 @@
         Document doc = (sessionManager.executeReturnDocument(MethodsEnum.GET_INFO.getLabel(), "image_id", String
                 .valueOf(idImage)));
-        String key = doc.getRootElement().getChild("image").getChild("comment_post").getAttributeValue("key");
-        return key;
+        //      String key = doc.getRootElement().getChild("image").getChild("comment_post").getAttributeValue("key");
+        Element elementImage = (Element) doc.getDocumentElement().getElementsByTagName("image").item(0);
+        Element elementCommentPost = (Element) elementImage.getElementsByTagName("comment_post").item(0);
+        return elementCommentPost.getAttribute("key");
     }