Author: simoneg
Date: Wed Oct 21 12:28:47 2009
New Revision: 827985

URL: http://svn.apache.org/viewvc?rev=827985&view=rev
Log:
LABS-492: added layers instead of filters in administration base cruds

Modified:
    
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractCrudHandler.java
    
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/CompleteCrudHandler.java

Modified: 
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractCrudHandler.java
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractCrudHandler.java?rev=827985&r1=827984&r2=827985&view=diff
==============================================================================
--- 
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractCrudHandler.java
 (original)
+++ 
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/AbstractCrudHandler.java
 Wed Oct 21 12:28:47 2009
@@ -19,7 +19,7 @@
 import org.apache.magma.basics.LocalizableString;
 import org.apache.magma.basics.MagmaException;
 import org.apache.magma.database.Database;
-import org.apache.magma.view.tree.ViewCustomizer;
+import org.apache.magma.view.MagDefaultLayers;
 import org.apache.magma.website.CompoundType;
 import org.apache.magma.website.HtmlProducer;
 import org.apache.magma.website.WebHandler;
@@ -32,9 +32,11 @@
 
        protected Class<T> myclass = null;
        
-       protected ViewCustomizer listCustomizer = null;
-       protected ViewCustomizer showCustomizer = null;
-       protected ViewCustomizer editCustomizer = null;
+       protected static String[] ALL_LAYERS = new String[] { 
MagDefaultLayers.ALL }; 
+       
+       protected String[] listLayers = null;
+       protected String[] showLayers = ALL_LAYERS;
+       protected String[] editLayers = ALL_LAYERS;
        
        protected int listSize = 100;
        
@@ -50,13 +52,13 @@
                HtmlProducer header = new StringHtmlProducer("<h1>" + new 
LocalizableString("List of " +  myclass.getSimpleName()).toString() + "</h1>");
                return new SmartList(myclass, "")
                        .setLink("doShow")
-                       .setFilter(listCustomizer)
+                       .setLayers(listLayers)
                        .setHeader(header)
                        .setElementsPerPage(listSize);
        }
        
        protected HtmlProducer doShow(T bean) {
-               HtmlProducer ret = new ShowBean(bean, showCustomizer);
+               HtmlProducer ret = new ShowBean(bean, showLayers);
                ret.compoundWith(
                                new StringHtmlProducer("<h1>" + new 
LocalizableString("Display " +  myclass.getSimpleName()).toString() + "</h1>")
                                , CompoundType.HEAD);
@@ -76,12 +78,12 @@
                        throw new MagmaException(e, "Error instantiating bean 
of class {0}", this.myclass);
                }
                HtmlProducer header = new StringHtmlProducer("<h1>" + new 
LocalizableString("New " +  myclass.getSimpleName()).toString() + "</h1>");
-               return new SmartForm(bean, "hiddenSave", 
header).setFilter(editCustomizer);
+               return new SmartForm(bean, "hiddenSave", 
header).setLayers(editLayers);
        }
        
        protected SmartForm handleEdit(T bean) {                
                HtmlProducer header = new StringHtmlProducer("<h1>" + new 
LocalizableString("Modify " +  myclass.getSimpleName()).toString() + "</h1>");
-               return new SmartForm(bean, "hiddenSave", 
header).setFilter(editCustomizer);             
+               return new SmartForm(bean, "hiddenSave", 
header).setLayers(editLayers);         
        }
        
        public HtmlProducer hiddenSave(T bean) {

Modified: 
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/CompleteCrudHandler.java
URL: 
http://svn.apache.org/viewvc/labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/CompleteCrudHandler.java?rev=827985&r1=827984&r2=827985&view=diff
==============================================================================
--- 
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/CompleteCrudHandler.java
 (original)
+++ 
labs/magma/trunk/website-administration/src/main/java/org/apache/magma/website/admin/CompleteCrudHandler.java
 Wed Oct 21 12:28:47 2009
@@ -16,17 +16,10 @@
  */
 package org.apache.magma.website.admin;
 
-import org.apache.magma.basics.LocalizableString;
-import org.apache.magma.basics.MagmaException;
-import org.apache.magma.database.Database;
-import org.apache.magma.view.tree.ViewCustomizer;
 import org.apache.magma.website.HtmlProducer;
 import org.apache.magma.website.Producer;
-import org.apache.magma.website.WebHandler;
-import org.apache.magma.website.beansview.ShowBean;
 import org.apache.magma.website.beansview.SmartForm;
 import org.apache.magma.website.beansview.SmartList;
-import org.apache.magma.website.producers.StringHtmlProducer;
 
 public class CompleteCrudHandler<T> extends AbstractCrudHandler<T> {
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to