Changeset 9392 for extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service

Timestamp:

Feb 27, 2011, 1:38:04 PM (13 years ago)

Author:

mlg

Message:

Changes function name (to english)
version changed to 0.13.1

Location:

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service

Files:

• CategoryService.java (modified) (4 diffs)
• CommentService.java (modified) (2 diffs)
• ImageService.java (modified) (6 diffs)
• TagService.java (modified) (2 diffs)

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/CategoryService.java

@@ -73 +73 @@
     /**
      * Lists all categories
-     * @param rafraichir true to refresh
      * @param recursive true : recursive listing
      * @return the list of categories
      * @throws IOException
      */
-    public List<Category> lister(boolean recursive) throws IOException {
-        return CategoryDao.getInstance(sessionManager).lister(recursive);
+    public List<Category> list(boolean recursive) throws IOException {
+        return CategoryDao.getInstance(sessionManager).list(recursive);
     }
 
@@ -88 +87 @@
      */
     public List<Category> makeTree() throws IOException {
-        List<Category> list = CategoryDao.getInstance(sessionManager).lister(true);
+        List<Category> list = CategoryDao.getInstance(sessionManager).list(true);
         for (Category category : list) {
             for (Category category2 : list) {
-                if (category2.getIdCategoriesMeres().size() != 1
-                        && category.getIdentifiant().equals(
-                                category2.getIdCategoriesMeres().get(category2.getIdCategoriesMeres().size() - 2))) {
-                    category.getCategoriesFilles().add(category2);
-                    category2.getCategoriesMeres().add(category);
+                if (category2.getIdParentCategories().size() != 1
+                        && category.getIdentifier().equals(
+                                category2.getIdParentCategories().get(category2.getIdParentCategories().size() - 2))) {
+                    category.getChildCategories().add(category2);
+                    category2.getParentCategories().add(category);
                 }
 
@@ -111 +110 @@
      * @return true if successful
      */
-    public boolean creer(String nom, Integer parent) {
+    public boolean create(String nom, Integer parent) {
         Category category = new Category();
-        category.setParentDirect(parent);
-        category.setNom(nom);
-        return CategoryDao.getInstance(sessionManager).creer(category);
+        category.setDirectParent(parent);
+        category.setName(nom);
+        return CategoryDao.getInstance(sessionManager).create(category);
     }
 
@@ -123 +122 @@
      * @return true if successful
      */
-    public boolean creer(String nom) {
+    public boolean create(String nom) {
         Category category = new Category();
-        category.setNom(nom);
-        return CategoryDao.getInstance(sessionManager).creer(category);
+        category.setName(nom);
+        return CategoryDao.getInstance(sessionManager).create(category);
     }
 }

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/CommentService.java

@@ -76 +76 @@
      * @throws IOException
      */
-    public List<Comment> lister(Integer imageId) throws IOException {
-        return CommentDao.getInstance(sessionManager).lister(imageId);
+    public List<Comment> list(Integer imageId) throws IOException {
+        return CommentDao.getInstance(sessionManager).list(imageId);
     }
 
@@ -88 +88 @@
      * @throws IOException
      */
-    public boolean creer(String content, Integer imageId, String auteur) throws IOException {
-        Comment commentaire = new Comment();
-        commentaire.setContent(content);
-        commentaire.setImageId(imageId);
-        commentaire.setAuthor(auteur);
-        return CommentDao.getInstance(sessionManager).creer(commentaire);
+    public boolean create(String content, Integer imageId, String auteur) throws IOException {
+        Comment comment = new Comment();
+        comment.setContent(content);
+        comment.setImageId(imageId);
+        comment.setAuthor(auteur);
+        return CommentDao.getInstance(sessionManager).create(comment);
     }
 

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/ImageService.java

@@ -9 +9 @@
 import fr.mael.jiwigo.transverse.session.SessionManager;
 import fr.mael.jiwigo.transverse.util.ImagesUtil;
-import fr.mael.jiwigo.transverse.util.Outil;
+import fr.mael.jiwigo.transverse.util.Tools;
 
 /*
@@ -78 +78 @@
      * Lists all images for a category
      * @param categoryId the id of the category
-     * @param rafraichir true : refresh the list of images
      * @return the list of images
      * @throws IOException
      */
-    public List<Image> listerParCategory(Integer categoryId, boolean rafraichir) throws IOException {
-        return ImageDao.getInstance(sessionManager).listerParCategory(categoryId, rafraichir);
+    public List<Image> listByCategory(Integer categoryId, boolean rafraichir) throws IOException {
+        return ImageDao.getInstance(sessionManager).listByCategory(categoryId, rafraichir);
     }
 
@@ -92 +91 @@
      * @param originalWidth width for the original image
      * @param originalHeight height for the original image
-     * @return
+     * @return true if the image is created
      * @throws Exception
      */
-    public boolean creer(String filePath, Integer idCategory, Integer originalWidth, Integer originalHeight,
+    public boolean create(String filePath, Integer idCategory, Integer originalWidth, Integer originalHeight,
             Double chunckSize, Integer privacyLevel) throws Exception {
         File originalFile = new File(filePath);
         //get the byte array of the original file, to keep metadata
-        byte[] bytesFichierOriginal = Outil.getBytesFromFile(originalFile);
+        byte[] bytesFichierOriginal = Tools.getBytesFromFile(originalFile);
 
         //resize the picture (or not)
@@ -114 +113 @@
             //the methode Outil.enrich will fail, but the procedure has to continue
             try {
-                byte[] fichierEnrichi = Outil.enrich(bytesFichierOriginal, Outil.getBytesFromFile(new File(System
+                byte[] fichierEnrichi = Tools.enrich(bytesFichierOriginal, Tools.getBytesFromFile(new File(System
                         .getProperty("java.io.tmpdir")
                         + "/originale.jpg")));
-                Outil.byteToFile(System.getProperty("java.io.tmpdir") + "/originale.jpg", fichierEnrichi);
+                Tools.byteToFile(System.getProperty("java.io.tmpdir") + "/originale.jpg", fichierEnrichi);
             } catch (Exception e) {
             }
@@ -131 +130 @@
         image.setPrivacyLevel(String.valueOf(privacyLevel));
         //now we call the dao to send the image to the webservice
-        return ImageDao.getInstance(sessionManager).creer(image, chunckSize);
+        return ImageDao.getInstance(sessionManager).create(image, chunckSize);
     }
 
@@ -142 +141 @@
      */
     public boolean addTags(Image image, String tagId) throws IOException {
-        return ImageDao.getInstance(sessionManager).addTags(image.getIdentifiant(), tagId);
+        return ImageDao.getInstance(sessionManager).addTags(image.getIdentifier(), tagId);
     }
 

extensions/jiwigo-ws-api/src/main/java/fr/mael/jiwigo/service/TagService.java

@@ -77 +77 @@
      * @throws IOException
      */
-    public List<Tag> lister() throws IOException {
-        return TagDao.getInstance(sessionManager).lister();
+    public List<Tag> list() throws IOException {
+        return TagDao.getInstance(sessionManager).list();
     }
 
@@ -87 +87 @@
      * @throws IOException
      */
-    public boolean creer(String nom) throws IOException {
+    public boolean create(String nom) throws IOException {
         Tag tag = new Tag();
-        tag.setNom(nom);
-        return TagDao.getInstance(sessionManager).creer(tag);
+        tag.setName(nom);
+        return TagDao.getInstance(sessionManager).create(tag);
     }