[Yanel-commits] rev 40310 - public/yanel/trunk/src/resources/file/src/java/org/wyona/yanel/impl/resources/node

[michi at wyona.com]

Author: michi
Date: 2008-12-08 15:55:55 +0100 (Mon, 08 Dec 2008)
New Revision: 40310

Modified:
   public/yanel/trunk/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResource.java
Log:
obsolete imports removed and getCheckoutDate log statement added

Modified: public/yanel/trunk/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResource.java
===================================================================
--- public/yanel/trunk/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResource.java	2008-12-08 14:51:12 UTC (rev 40309)
+++ public/yanel/trunk/src/resources/file/src/java/org/wyona/yanel/impl/resources/node/NodeResource.java	2008-12-08 14:55:55 UTC (rev 40310)
@@ -26,7 +26,6 @@
 import org.wyona.yanel.core.attributes.versionable.RevisionInformation;
 import org.wyona.yanel.core.attributes.viewable.View;
 import org.wyona.yanel.core.attributes.viewable.ViewDescriptor;
-import org.wyona.yanel.core.util.PathUtil;
 import org.wyona.yanel.core.workflow.WorkflowException;
 import org.wyona.yanel.core.workflow.WorkflowHelper;
 import org.wyona.yanel.servlet.communication.HttpRequest;
@@ -106,7 +105,7 @@
         if (mimeType != null) return mimeType;
 
         // TODO: Load config mime.types ...
-        String suffix = PathUtil.getSuffix(getPath());
+        String suffix = org.wyona.commons.io.PathUtil.getSuffix(getPath());
         if (suffix != null) {
             log.debug("SUFFIX: " + suffix);
             mimeType = getMimeTypeBySuffix(suffix);
@@ -199,10 +198,9 @@
                 log.warn("Node \"" + getPath() + "\" does not seem to have any revisions! The repository \"" + getRealm().getRepository() + "\"  might not support revisions!");
             }
             return revisionInfos;
-        } else {
-            log.warn("Node '" + getNode().getPath() + "' has no revisions!");
-            return null;
         }
+        log.warn("Node '" + getNode().getPath() + "' has no revisions!");
+        return null;
     }
 
     public void checkin(String comment) throws Exception {
@@ -249,7 +247,8 @@
     }
 
     public Date getCheckoutDate() throws Exception {
-        Node node = getNode();
+        log.warn("Get checkout date not implemented yet!");
+        // Node node = getNode();
         // return node.getCheckoutDate();
         return null;
     }
@@ -325,7 +324,7 @@
                         Streams.copy(is, output, true);
                         uploadMimeType = yanelRequest.getContentType(name);
 
-                        String suffix = PathUtil.getSuffix(newNode.getPath());
+                        String suffix = org.wyona.commons.io.PathUtil.getSuffix(newNode.getPath());
                         if (suffix != null) {
                             if (!getMimeTypeBySuffix(suffix).equals(uploadMimeType)) {
                                 log.warn("Upload request content type '" + uploadMimeType + "' is NOT the same as the guessed mime type '" + getMimeTypeBySuffix(suffix) + "' based on the suffix (Path: " + newNode.getPath() + ")");
@@ -404,7 +403,7 @@
      * Get introspection document
      */
     public String getIntrospection() throws Exception {
-        String name = PathUtil.getName(getPath());
+        String name = org.wyona.commons.io.PathUtil.getName(getPath());
         StringBuffer buf = new StringBuffer();
         buf.append("<?xml version=\"1.0\"?>");
         buf.append("<introspection xmlns=\"http://www.wyona.org/neutron/2.0\">");