svn commit: r560233 - in /lenya/trunk/src/modules/editors: java/src/org/apache/lenya/cms/editors/InsertAsset.java usecases/insertAsset.jx usecases/insertLink.jx

Author: andreas
Date: Fri Jul 27 06:59:51 2007
New Revision: 560233

URL: http://svn.apache.org/viewvc?view=rev&rev=560233
Log:
Refactoring in InsertAsset usecase, added error message display to inserAsset and insertLink JX templates

Modified:
    lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
    lenya/trunk/src/modules/editors/usecases/insertAsset.jx
    lenya/trunk/src/modules/editors/usecases/insertLink.jx

Modified: lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java?view=diff&rev=560233&r1=560232&r2=560233
==============================================================================
--- lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java (original)
+++ lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/InsertAsset.java Fri Jul 27 06:59:51 2007
@@ -72,11 +72,18 @@
     }
 
     protected Document[] getResourceDocuments() throws DocumentException {
+        String mimeTypePrefix = getParameterAsString("mimeTypePrefix", "");
         List list = new ArrayList();
         Document[] docs = getSourceDocument().area().getDocuments();
         for (int i = 0; i < docs.length; i++) {
             if (docs[i].getResourceType().getName().equals("resource")) {
-                list.add(docs[i]);
+                String resMimeType = docs[i].getMimeType();
+                if (resMimeType == null) {
+                    resMimeType = "unknown";
+                }
+                if (resMimeType.startsWith(mimeTypePrefix)) {
+                    list.add(docs[i]);
+                }
             }
         }
         return (Document[]) list.toArray(new Document[list.size()]);
@@ -96,16 +103,8 @@
 
             Document[] resources = getResourceDocuments();
 
-            List selectedResources = new ArrayList();
-            String mimeTypePrefix = getParameterAsString("mimeTypePrefix", "");
             for (int i = 0; i < resources.length; i++) {
-                String resMimeType = resources[i].getMimeType();
-                if (resMimeType == null)
-                    resMimeType = "unknown";
-                if (resMimeType.startsWith(mimeTypePrefix)) {
-                    selectedResources.add(resources[i]);
-                }
-                
+
                 String originalUrl = resources[i].getCanonicalWebappURL();
                 int lastDotIndex = originalUrl.lastIndexOf('.');
                 String extension = resources[i].getSourceExtension();
@@ -113,10 +112,10 @@
 
                 String proxyUrl = rewriter.rewrite(url);
                 asset2proxyUrl.put(resources[i], proxyUrl);
-                
+
             }
 
-            setParameter("assets", selectedResources);
+            setParameter("assets", resources);
         } catch (final Exception e) {
             throw new RuntimeException(e);
         } finally {

Modified: lenya/trunk/src/modules/editors/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/usecases/insertAsset.jx?view=diff&rev=560233&r1=560232&r2=560233
==============================================================================
--- lenya/trunk/src/modules/editors/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/editors/usecases/insertAsset.jx Fri Jul 27 06:59:51 2007
@@ -32,6 +32,9 @@
   </page:title>
   
   <page:body>
+    
+    <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
+    
     <form method="POST" name="image" id="image">
       <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
       <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>

Modified: lenya/trunk/src/modules/editors/usecases/insertLink.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/usecases/insertLink.jx?view=diff&rev=560233&r1=560232&r2=560233
==============================================================================
--- lenya/trunk/src/modules/editors/usecases/insertLink.jx (original)
+++ lenya/trunk/src/modules/editors/usecases/insertLink.jx Fri Jul 27 06:59:51 2007
@@ -55,6 +55,8 @@
   </page:title>
   
   <page:body>
+    
+    <jx:import uri="fallback://lenya/modules/usecase/templates/messages.jx"/>
 
     <div id="lenya-info-treecanvas" style="width: 30%">