[Yanel-commits] rev 22754 - public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-02-17 21:26:40 +0100 (Sat, 17 Feb 2007)
New Revision: 22754

Modified:
   public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/CalendarResource.java
Log:
get mime type fixed

Modified: public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/CalendarResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/CalendarResource.java	2007-02-17 20:26:05 UTC (rev 22753)
+++ public/yanel/trunk/src/contributions/resources/calendar/src/java/org/wyona/yanel/impl/resources/CalendarResource.java	2007-02-17 20:26:40 UTC (rev 22754)
@@ -53,6 +53,28 @@
     /**
      *
      */
+    public String getMimeType(String viewId) {
+        if(viewId == null) {
+            String mimeType = getRTI().getProperty("mime-type");
+            if (mimeType != null) {
+                return mimeType;
+            } else {
+                return "text/calendar";
+            }
+        }
+        if(viewId != null && viewId.equals("xml")) {
+	    return "application/xml";
+        }
+        if (viewId != null && viewId.equals("xhtml")) {
+            return "application/xhtml+xml";
+        }
+        log.warn("No mime type for view id: " + viewId);
+        return null;
+    }
+
+    /**
+     *
+     */
     public boolean exists() throws Exception {
         log.warn("Not implemented yet!");
         return false;
@@ -75,12 +97,7 @@
             if(viewId == null) {
                 View view = new View();
                 //view.setResponse(false);
-                String mimeType = getRTI().getProperty("mime-type");
-                if (mimeType != null) {
-	            view.setMimeType(mimeType);
-	        } else {
-	            view.setMimeType("text/calendar");
-                }
+	        view.setMimeType(getMimeType(null));
 	        view.setInputStream(dataRepo.getInputStream(new org.wyona.yarep.core.Path(getPath())));
                 log.error("DEBUG: Return ICS!");
                 return view;
@@ -127,7 +144,7 @@
 
             View view = new View();
             //view.setResponse(false);
-	    view.setMimeType("application/xml");
+	    view.setMimeType(getMimeType(viewId));
 	    view.setInputStream(new java.io.StringBufferInputStream(calendar.toString()));
             return view;
         } else if (viewId != null && viewId.equals("xhtml")) {
@@ -141,7 +158,7 @@
             }
 
             View view = new View();
-            view.setMimeType("application/xhtml+xml");
+            view.setMimeType(getMimeType(viewId));
 
             view.setInputStream(new java.io.ByteArrayInputStream(out.toByteArray()));
             return view;
@@ -162,12 +179,7 @@
 
             View view = new View();
             //view.setResponse(false);
-            String mimeType = getRTI().getProperty("mime-type");
-            if (mimeType != null) {
-	        view.setMimeType(mimeType);
-	    } else {
-	        view.setMimeType("text/calendar");
-            }
+	    view.setMimeType(getMimeType(null));
 	    view.setInputStream(new java.io.ByteArrayInputStream(out.toByteArray()));
             return view;
         }