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

michi at wyona.com michi at wyona.com
Tue Oct 2 09:46:09 CEST 2007


Author: michi
Date: 2007-10-02 09:46:08 +0200 (Tue, 02 Oct 2007)
New Revision: 27877

Modified:
   public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
Log:
source view mime type fixed

Modified: public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java
===================================================================
--- public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java	2007-10-02 07:45:49 UTC (rev 27876)
+++ public/yanel/trunk/src/resources/xml/src/java/org/wyona/yanel/impl/resources/XMLResource.java	2007-10-02 07:46:08 UTC (rev 27877)
@@ -157,6 +157,11 @@
      * Get mime type
      */
     public String getMimeType(String viewId) throws Exception {
+        if (viewId != null && viewId.equals(SOURCE_VIEW_ID)) {
+            String mimeType = getResourceConfigProperty("source-view-mime-type");
+            if (mimeType != null) return mimeType;
+        }
+
         String mimeType = getResourceConfigProperty("mime-type");
         if (mimeType != null) return mimeType;
 
@@ -440,7 +445,7 @@
 
         sb.append("\n  <resource name=\"" + name + "\">");
         sb.append("\n  <edit mime-type=\"application/xhtml+xml\">");
-        sb.append("\n    <checkout url=\"" + name + "?yanel.resource.viewid=source&amp;yanel.resource.usecase=checkout\" method=\"GET\"/>");
+        sb.append("\n    <checkout url=\"" + name + "?yanel.resource.viewid=" + SOURCE_VIEW_ID + "&amp;yanel.resource.usecase=checkout\" method=\"GET\"/>");
         sb.append("\n    <checkin  url=\"" + name + "?yanel.resource.usecase=checkin\" method=\"PUT\"/>");
         sb.append("\n    <release-lock url=\"" + name + "?yanel.resource.usecase=release-lock\" method=\"GET\"/>");
         sb.append("\n  </edit>");
@@ -463,9 +468,8 @@
         sb.append("</navigation>");
 
         sb.append("<resource name=\"" + name + "\">");
-        //sb.append("<edit mime-type=\"application/xml\">");
-        sb.append("<edit mime-type=\"" + this.getMimeType(null) + "\">");
-        sb.append("<checkout url=\"?yanel.resource.viewid=source&amp;yanel.resource.usecase=checkout\" method=\"GET\"/>");
+        sb.append("<edit mime-type=\"" + this.getMimeType(SOURCE_VIEW_ID) + "\">");
+        sb.append("<checkout url=\"?yanel.resource.viewid=" + SOURCE_VIEW_ID + "&amp;yanel.resource.usecase=checkout\" method=\"GET\"/>");
         sb.append("<checkin  url=\"?yanel.resource.usecase=checkin\"  method=\"PUT\"/>");
         sb.append("<release-lock url=\"?yanel.resource.usecase=release-lock\" method=\"GET\"/>");
         sb.append("</edit>");



More information about the Yanel-commits mailing list