[Yanel-commits] rev 47460 - public/yanel/trunk/src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce

[michi at wyona.com]

Author: michi
Date: 2010-02-05 15:01:57 +0100 (Fri, 05 Feb 2010)
New Revision: 47460

Modified:
   public/yanel/trunk/src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java
Log:
javadoc added and duplicate code removed

Modified: public/yanel/trunk/src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java
===================================================================
--- public/yanel/trunk/src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java	2010-02-05 14:01:04 UTC (rev 47459)
+++ public/yanel/trunk/src/resources/tinymce/src/java/org/wyona/yanel/impl/resources/tinymce/TinyMCEResource.java	2010-02-05 14:01:57 UTC (rev 47460)
@@ -178,16 +178,22 @@
             return generateView(VIEW_DONE);
         }         
         contentToEdit = resourceContent;
+
+        // Checkout resource to be edited
         try {
-            if (isResToEditVersionableV2() && !isResToEditCheckedOut()) {
-                VersionableV2 versionable = (VersionableV2) getResToEdit();
-                if (!versionable.isCheckedOut()) {
-                    versionable.checkout(userID);
+            if (isResToEditVersionableV2()) {
+                if (!isResToEditCheckedOut()) {
+                    ((VersionableV2) getResToEdit()).checkout(userID);
+                } else {
+                    log.warn("Resource '" + getResToEdit().getPath() + "' is already checked out!");
                 }
+            } else {
+                log.warn("Resource '" + getResToEdit().getPath() + "' is not VersionableV2 and hence cannot be checked out!");
             }
         } catch (Exception e) {
             log.warn("Could not checkout resource: " + getResToEdit().getPath() + " " + e.getMessage());
         }
+
         return generateView(viewID); // this will show the default view if the param is not set
     }
     
@@ -230,6 +236,7 @@
                     OutputStream os = ((ModifiableV2) resToEdit).getOutputStream();
                     IOUtils.write(content, os);
                     addInfoMessage("Succesfully saved resource " + resToEdit.getPath() + ". ");
+                    log.warn("DEBUG: Try to checkin resource: " + resToEdit.getPath());
                     if (isResToEditVersionableV2()) {
                         VersionableV2 versionable  = (VersionableV2)resToEdit;
                         try {
@@ -241,6 +248,8 @@
                             addError(msg);
                             throw new UsecaseException(msg, e);
                         }
+                    } else {
+                        log.warn("Resource '" + getResToEdit().getPath() + "' is not VersionableV2 and hence cannot be checked out!");
                     }
                 } catch (Exception e) {
                     log.error("Exception: " + e);
@@ -377,6 +386,9 @@
         return resToEdit;
     }
 
+    /**
+     * Check if resource is VersionableV2
+     */
     private boolean isResToEditVersionableV2() {
         try {
             if (ResourceAttributeHelper.hasAttributeImplemented(getResToEdit(), "Versionable", "2")) {
@@ -387,7 +399,10 @@
         }
         return false;     
     }
-    
+
+    /**
+     * Check wheter resource is checked-out
+     */
     private boolean isResToEditCheckedOut()  {
         try {
             if (isResToEditVersionableV2()) {