Changeset 2442

Timestamp:

11/30/09 22:51:56 (2 years ago)

Author:

mswertz

Message:

Refactored UI to make it easier to extend. E.g. to add a command or action to a generated MOLGENIS. Also a first step was made to add an alternative UI style base on YUI. When this refactoring is finished it will be possible to omit the *ui.xml and instead assemble the UI by a manual program.

Location:

molgenis/3.3/src/org/molgenis/framework/ui

Files:

• FormController.java (modified) (1 diff)
• FormModel.java (modified) (17 diffs)
• FormView.ftl (modified) (1 diff)
• FormViewYUI.ftl (added)
• MainYUI.ftl (added)
• MenuController.java (modified) (1 diff)
• MenuModel.java (modified) (1 diff)
• MenuViewYUI.ftl (added)
• ScreenModel.java (modified) (2 diffs)
• SimpleModel.java (modified) (1 diff)
• UserInterface-EBI.ftl (modified) (1 diff)
• UserInterface.ftl (modified) (1 diff)
• UserInterface.java (modified) (1 diff)
• commands/AddBatchCommand.java (modified) (6 diffs)
• commands/AddCommand.java (modified) (4 diffs)
• commands/AddCommand2.java (modified) (4 diffs)
• commands/ChangeListLimitCommand.java (modified) (4 diffs)
• commands/CommandMenu.java (modified) (2 diffs)
• commands/DownloadAllCommand.java (modified) (2 diffs)
• commands/DownloadSelectedCommand.java (modified) (4 diffs)
• commands/DownloadVisibleCommand.java (modified) (3 diffs)
• commands/EditSelectedCommand.java (modified) (4 diffs)
• commands/RemoveSelectedCommand.java (modified) (3 diffs)
• commands/ScreenCommand.java (modified) (4 diffs)
• commands/SimpleCommand.java (modified) (13 diffs)
• commands/ViewEditViewCommand.java (modified) (3 diffs)
• commands/ViewListViewCommand.java (modified) (3 diffs)
• html/Form.java (modified) (1 diff)
• html/HtmlForm.java (modified) (3 diffs)

molgenis/3.3/src/org/molgenis/framework/ui/FormController.java

@@ -294 +294 @@
         public void reload(Database db)
         {
-                logger.debug("reloading...");
+                logger.info("reloading...");
 
                 // FIXME

molgenis/3.3/src/org/molgenis/framework/ui/FormModel.java

@@ -15 +15 @@
 // jdk
 import java.io.File;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -56 +57 @@
 public abstract class FormModel<E extends Entity> extends SimpleModel
 {
+        /**
+         * Parameters to enable links between parent forms and subforms using
+         * foreign key relationships (aka master-detail views)
+         * 
+         * @author Morris Swertz
+         */
+        public static class ParentFilter
+        {
+                /** for filtering based on parentform */
+                private String parentForm;
+                private String parentId;
+                private String parentLabel;
+                private String xrefToParent;
+
+                public ParentFilter(String parentForm, String parentId, String parentLabel, String xrefToParent)
+                {
+                        this.parentForm = parentForm;
+                        this.parentId = parentId;
+                        this.parentLabel = parentLabel;
+                        this.xrefToParent = xrefToParent;
+                }
+
+                public String getParentForm()
+                {
+                        return parentForm;
+                }
+
+                public String getParentId()
+                {
+                        return parentId;
+                }
+
+                public String getXrefToParent()
+                {
+                        return xrefToParent;
+                }
+
+                public void setParentForm(String parentForm)
+                {
+                        this.parentForm = parentForm;
+                }
+
+                public void setParentId(String parentId)
+                {
+                        this.parentId = parentId;
+                }
+
+                public void setXrefToParent(String xrefToParent)
+                {
+                        this.xrefToParent = xrefToParent;
+                }
+
+                public String getParentLabel()
+                {
+                        return parentLabel;
+                }
+
+                public void setParentLabel(String parentLabel)
+                {
+                        this.parentLabel = parentLabel;
+                }
+        }
+
         // ABSTRACT METHODS, varied per entity
         /**
@@ -63 +127 @@
          * @param entity
          * @param newrecord
+         * @throws ParseException
          */
         public abstract HtmlForm<E> getInputs(E entity, boolean newrecord);
@@ -87 +152 @@
         {
                 LIST_VIEW("listview"), EDIT_VIEW("editview");
-                //RECORD_VIEW("recordview")
-                //, EMBEDDED_VIEW("embeddedview"),;
+                // RECORD_VIEW("recordview")
+                // , EMBEDDED_VIEW("embeddedview"),;
 
                 private Mode(String tag)
@@ -104 +169 @@
 
         // CONSTANTS
+        public static final String INPUT_SHOW = "__show";
         public static final String INPUT_OFFSET = "__offset";
         public static final String INPUT_DOWNLOADFILENAME = "__filename";
@@ -161 +227 @@
         /** Helper object that takes care of database paging */
         private DatabasePager<E> pager;
-        
-        /** Here the currently selected is are stored*/
+
+        /** Here the currently selected is are stored */
         private List<Object> selectedIds;
+        /** Filter of parent form filtering */
+        // TODO make this infer automatically
+        private List<ParentFilter> parentFilters = new ArrayList<ParentFilter>();
 
         /** */
@@ -198 +267 @@
 
                 setController(new FormController<E>(this));
-                
-                //add all actions
+
+                // add all actions
                 // menu FILE
 
@@ -232 +301 @@
 
                 // menu VIEW
-                //SimpleCommand<E> v2 = new ViewRecordViewCommand<E>("recordview", this);
-                //v2.setToolbar(true);
-                //super.addCommand("View", v2);
+                // SimpleCommand<E> v2 = new ViewRecordViewCommand<E>("recordview",
+                // this);
+                // v2.setToolbar(true);
+                // super.addCommand("View", v2);
 
                 SimpleCommand<E> v3 = new ViewEditViewCommand<E>("editview", this);
-                //v3.setToolbar(true);
+                // v3.setToolbar(true);
                 super.addCommand("View", v3);
 
                 SimpleCommand<E> v4 = new ViewListViewCommand<E>("listview", this);
-                v4.setToolbar(true);            
+                v4.setToolbar(true);
                 super.addCommand("View", v4);
 
@@ -274 +344 @@
                 }
         }
-        
+
         @Override
         public boolean isVisible()
@@ -289 +359 @@
         {
                 Vector<ScreenCommand> toolbar = new Vector<ScreenCommand>();
-                
-                for(CommandMenu<E> menu: this.getMenus())
-                {
-                        for(ScreenCommand<E> c: menu.getCommands())
+
+                for (CommandMenu<E> menu : this.getMenus())
+                {
+                        for (ScreenCommand<E> c : menu.getCommands())
                         {
-                                if(c.isToolbar() && c.isVisible())
+                                if (c.isToolbar() && c.isVisible())
                                 {
                                         toolbar.add(c);
@@ -300 +370 @@
                         }
                 }
-                
+
                 return toolbar;
         }
@@ -315 +385 @@
 
         /**
-         * A convenience method that merges system and user rules, excluding limit and offset
-         * (i.e., if you want 'all').
+         * A convenience method that merges system and user rules, excluding limit
+         * and offset (i.e., if you want 'all').
          * 
          * @return an array of all rules
@@ -353 +423 @@
                 try
                 {
-                        return getEntityClass().newInstance();
+                        E entity = getEntityClass().newInstance();
+
+                        // set defaults for xrefs
+                        for (ParentFilter pf : this.getParentFilters())
+                        {
+                                FormModel parent = (FormModel) this.get(pf.getParentForm());
+                                List<Entity> records = parent.getRecords();
+                                if (records.size() > 0)
+                                {
+                                        // xref only
+                                        Object value = records.get(0).get(pf.getParentId());
+                                        Object label = records.get(0).get(pf.getParentLabel());
+                                        if (!(value instanceof List) && value != null)
+                                        {
+                                                entity.set(pf.getXrefToParent(), value);
+                                                entity.set(pf.getXrefToParent()+"_"+pf.getParentLabel(), label);
+                                        }
+                                }
+                        }
+
+                        return entity;
                 }
                 catch (Exception e)
                 {
-                        //should never happen
+                        // should never happen
                         logger.error("failed to create class " + getEntityClass() + ": " + e);
                         e.printStackTrace();
@@ -602 +692 @@
          * field of a related record.
          */
-        public abstract List<QueryRule> getSystemRules();
+        public List<QueryRule> getSystemRules()
+        {
+                List<QueryRule> rules = new ArrayList<QueryRule>();
+
+                // parent filters
+                if (this.getParentFilters() != null && this.getParentFilters().size() > 0)
+                {
+                        List<QueryRule> xref_filters = new ArrayList<QueryRule>();
+
+                        for (ParentFilter pf : this.getParentFilters())
+                        {
+                                FormModel parent = (FormModel) this.get(pf.getParentForm());
+                                List<Entity> records = parent.getRecords();
+
+                                // add filters for xref or mref relationships (if any)
+                                // if multiple xrefs apply then the filters are union (so xref1
+                                // OR
+                                // xref2 OR etc)
+                                if (records.size() > 0)
+                                {
+
+                                        Object parentValue = records.get(0).get(pf.getParentId());
+                                        // mref?
+                                        if (parentValue instanceof List)
+                                        {
+                                                List values = (List) parentValue;
+                                                if (values.size() > 0) for (Object val : values)
+                                                {
+                                                        QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS, val);
+                                                        rule.setOr(true);
+                                                        xref_filters.add(rule);
+                                                }
+                                                // if no filters then prohibit to get ALL data by adding
+                                                // impossible condition
+                                                else
+                                                {
+                                                        QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS,
+                                                                        Integer.MIN_VALUE);
+                                                        rule.setOr(true);
+                                                        xref_filters.add(rule);
+                                                }
+                                        }
+                                        // xref
+                                        else if (parentValue != null)
+                                        {
+                                                QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS, parentValue);
+                                                rule.setOr(true);
+                                                xref_filters.add(rule);
+                                        }
+                                        else
+                                        {
+                                                QueryRule rule = new QueryRule(pf.getXrefToParent(), QueryRule.Operator.EQUALS,
+                                                                Integer.MIN_VALUE);
+                                                rule.setOr(true);
+                                                xref_filters.add(rule);
+                                        }
+                                }
+                        }
+                        // put it all in one clause, e.g. (xref1 = 0 OR xref1 = 1 OR xref2=3
+                        // ....)
+                        rules.add(new QueryRule(xref_filters));
+                }
+
+                // security filters
+                {
+                        QueryRule rule = super.getRootScreen().getLogin().getRowlevelSecurityFilters(this.create());
+                        if (rule != null /* && !rule.equals(new QueryRule()) */) rules.add(rule);
+                }
+                return rules;
+
+        }
 
         /**
@@ -623 +783 @@
         }
 
-        public void setMessages(ScreenMessage<E> ... messages)
+        public void setMessages(ScreenMessage<E>... messages)
         {
                 this.messages = new Vector<ScreenMessage<E>>(Arrays.asList(messages));
         }
-        
-        
+
         /**
          * @return Messages to inform the user of state changes and succes.
@@ -745 +904 @@
                 return ((FormController) getController()).getPager();
         }
-        
+
         public List<Object> getSelectedIds()
         {
@@ -755 +914 @@
                 this.selectedIds = selected;
         }
+
+        public void setParentFilters(List<ParentFilter> parentFilters)
+        {
+                this.parentFilters = parentFilters;
+        }
+
+        public List<ParentFilter> getParentFilters()
+        {
+                return parentFilters;
+        }
+
 }

molgenis/3.3/src/org/molgenis/framework/ui/FormView.ftl

@@ -27 +27 @@
                 <#list menu.getCommands() as command>
                         <#if command.isVisible()>
-                                                                                <tr><td class="submenuitem" onclick="${command.getJavaScriptAction()}"><img src="${command.icon}" align="left" />${command.label}</td></tr>
+                                                                                <tr><td class="submenuitem" onclick="${command.getJavaScriptAction()}"><#if command.icon?exists><img src="${command.icon}" align="left" /><#else>&nbsp; </#if>${command.label}</td></tr>
                         </#if>
                 </#list>

molgenis/3.3/src/org/molgenis/framework/ui/MenuController.java

@@ -49 +49 @@
         public void reload(Database db)
         {
+                logger.debug("reloading Menu("+view.getName()+")");
                 ScreenModel selected = view.getSelected();
                 if (selected == null)

molgenis/3.3/src/org/molgenis/framework/ui/MenuModel.java

@@ -59 +59 @@
                 super(name, parent);
                 setController(new MenuController(this));
+                //macro has exact name as class, but then ending with 'view'.
                 setViewMacro(MenuModel.class.getSimpleName().replace("Model", "View"));
         }

molgenis/3.3/src/org/molgenis/framework/ui/ScreenModel.java

@@ -18 +18 @@
 import org.molgenis.util.EmailService;
 import org.molgenis.util.Tree;
-import org.molgenis.util.SimpleEmailService.EmailException;
 
 // jdk
@@ -47 +46 @@
         /** Bind parameter name for screen action (to be used by layout renderer) */
         public static final String INPUT_ACTION = "__action";
+        
         /**
          * Parameter to indicate how the results should be shown (as download, as
          * popup, inline with the rest of the GUI (Default)
          */
-        public static final String INPUT_SHOW = "__show";
-
-        /** The default of 'input_show' */
-        public static final String SHOW_INLINE = "inline";
-
-        /** Show current screen in a popup */
-        public static final String SHOW_DIALOG = "popup";
-
-        /**
-         * Pass current screen in handlerequest the outputstream so it can be
-         * downloaded
-         */
-        public static final String SHOW_DOWNLOAD = "download";
+        public enum Show
+        {
+                /**
+                 * Show the current screen as part of its parent. This means the layout template is called on the root of the user interface.
+                 */
+                SHOW_MAIN("inline"), 
+                /**
+                 * Show the current screen or command as popup. This means the layout template is applied on this element.
+                 */
+                SHOW_DIALOG("popup"), 
+                /**
+                 * Pass current screen in handlerequest the outputstream so it can be
+                 * downloaded. This result in a download file.
+                 */
+                SHOW_DOWNLOAD("download");
+                
+                private String TAG;
+                Show(String name)
+                {
+                        this.TAG = name;
+                }
+                
+                public String toString()
+                {
+                        return this.TAG;
+                }
+                
+                public boolean equals(String str)
+                {
+                        if(str != null && str.equals(this.TAG)) return true;
+                        return false;
+                }
+        }
 
         /**

molgenis/3.3/src/org/molgenis/framework/ui/SimpleModel.java

@@ -194 +194 @@
         {
                 // link the command to the screen
+                command.setScreen(this);
                 command.setTarget(this.getName());
 

molgenis/3.3/src/org/molgenis/framework/ui/UserInterface-EBI.ftl

@@ -6 +6 @@
                 <meta http-equiv="Window-target" content="_top" />
                 <meta name="no-email-collection" content="http://www.unspam.com/noemailcollection/" />          
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-11526343-1");
+pageTracker._trackPageview();
+} catch(err) {}
+</script>               
                 <!--link rel="shortcut icon" href="generated-res/img/molgenis.ico"-->
                 <link rel="stylesheet"  href="http://www.ebi.ac.uk/inc/css/contents.css"     type="text/css" />

molgenis/3.3/src/org/molgenis/framework/ui/UserInterface.ftl

@@ -30 +30 @@
 <@molgenis_header/>
 <div id="container">
-        <div id="header">       
-                <div><p><a href="http://www.molgenis.org"><img src="generated-res/img/logo_molgenis.gif" height="70px" align="right"/></a>&nbsp;${application.getLabel()}</p></div>
-                        <!--div align="right" style="color: maroon; font: 12px Arial;margin-right: 10px;">| <a href="about.html">About</a>  | <a href="doc/objectmodel.html">Object model</a>  | <a href="api/R">R-project API</a> | <a href="api/find">HTTP API</a> | <a href="api/soap?wsdl">Web Services API</a></div-->
-        </div>
+        
 <#list screen.getVisibleChildren() as subscreen>
         <@layout subscreen />
 </#list>
+
         <div id="push">
         </div>

molgenis/3.3/src/org/molgenis/framework/ui/UserInterface.java

@@ -145 +145 @@
         public void reload(Database db)
         {
-                if(this.getController() != this)
+                for(ScreenModel s: this.getChildren())
                 {
-                        this.getController().reload(db);
+                        s.getController().reload(db);
                 }
-                else
-                {
-                        if(this.getSelected() != null)
-                                this.getSelected().getController().reload(db);
-                }
+                
+//              if(this.getController() != this)
+//              {
+//                      this.getController().reload(db);
+//              }
+//              else
+//              {
+//                      //refresh whole selected subtree
+//                      if(this.getSelected() != null)
+//                              this.getSelected().getController().reload(db);
+//              }
         }
 

molgenis/3.3/src/org/molgenis/framework/ui/commands/AddBatchCommand.java

@@ -13 +13 @@
 import org.molgenis.framework.ui.FormModel;
 import org.molgenis.framework.ui.ScreenMessage;
+import org.molgenis.framework.ui.ScreenModel;
+import org.molgenis.framework.ui.ScreenModel.Show;
 import org.molgenis.framework.ui.html.ActionInput;
 import org.molgenis.framework.ui.html.HtmlInput;
@@ -53 +55 @@
         public List<HtmlInput> getInputs() throws DatabaseException
         {
-                // todo add help/subheadings
-
                 // delegate to the formscreen
-                List<HtmlInput> inputs = this.getScreen().getNewRecordForm().getInputs();
+                List<HtmlInput> inputs = this.getFormScreen().getNewRecordForm().getInputs();
 
                 // remove not-null constraints
@@ -72 +72 @@
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException, DatabaseException,
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException, DatabaseException,
                         IOException
         {
@@ -83 +83 @@
                         try
                         {
-                                CsvToDatabase<E> csvReader = this.getScreen().getCsvReader();
+                                CsvToDatabase<E> csvReader = this.getFormScreen().getCsvReader();
 
                                 int updatedRows = csvReader.importCsv(db, new CsvStringReader(request
@@ -92 +92 @@
                                 msg = new ScreenMessage<E>("CSV UPLOAD SUCCESS: added " + updatedRows + " rows", null, true);
                                 logger.debug("CSV UPLOAD SUCCESS: added " + updatedRows + " rows");
-                                getScreen().getPager().resetFilters();
-                                getScreen().getPager().last(db);
+                                getFormScreen().getPager().resetFilters();
+                                getFormScreen().getPager().last(db);
                         }
                         catch (Exception e)
@@ -101 +101 @@
                                 logger.error("CSV UPLOAD FAILED: " + e.getMessage());
                         }
-                        getScreen().getMessages().add(msg);
+                        getFormScreen().getMessages().add(msg);
                 }
 
-                return true;
+                //show result in the main screen
+                return ScreenModel.Show.SHOW_MAIN;
         }
 

molgenis/3.3/src/org/molgenis/framework/ui/commands/AddCommand.java

@@ -11 +11 @@
 import org.molgenis.framework.ui.FormController;
 import org.molgenis.framework.ui.FormModel;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.html.ActionInput;
 import org.molgenis.framework.ui.html.HtmlInput;
@@ -34 +35 @@
         {
                 // delegate to the formscreen
-                return this.getScreen().getNewRecordForm().getInputs();
+                return this.getFormScreen().getNewRecordForm().getInputs();
         }
 
@@ -60 +61 @@
         {
                 //hide add button if the screen is readonly
-                return !this.getScreen().isReadonly(); 
+                return !this.getFormScreen().isReadonly(); 
         }
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException,
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException,
                         DatabaseException, IOException
         {               
@@ -72 +73 @@
                         ((FormController) this.getScreen().getController()).doAdd(db, request);
                 }
-                return true;
+                return ScreenModel.Show.SHOW_MAIN;
         }
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/AddCommand2.java

@@ -13 +13 @@
 import org.molgenis.framework.ui.FormModel;
 import org.molgenis.framework.ui.ScreenMessage;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.html.ActionInput;
 import org.molgenis.framework.ui.html.Form;
@@ -42 +43 @@
         {
                 Form f = new Form();
-                f.addAll(this.getScreen().getNewRecordForm().getInputs());              
+                f.addAll(this.getFormScreen().getNewRecordForm().getInputs());          
                 f.setAll(previousRequest);
                 return f.getInputs();
@@ -70 +71 @@
         {
                 // hide add button from the menu/toolbar if the screen is readonly
-                return !this.getScreen().isReadonly();
+                return !this.getFormScreen().isReadonly();
         }
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException, DatabaseException,
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException, DatabaseException,
                         IOException
         {
@@ -81 +82 @@
                         // delegate to the form controller
                         boolean success = ((FormController<E>) this.getScreen().getController()).doAdd(db, request);
-                        this.messages = this.getScreen().getMessages(); 
+                        this.messages = this.getFormScreen().getMessages(); 
                 }
-                return true;
+                return ScreenModel.Show.SHOW_MAIN;
         }
         

molgenis/3.3/src/org/molgenis/framework/ui/commands/ChangeListLimitCommand.java

@@ -5 +5 @@
 
 import java.io.PrintWriter;
+import java.util.List;
 
 import org.molgenis.framework.db.Database;
+import org.molgenis.framework.db.DatabaseException;
 import org.molgenis.framework.ui.FormModel;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.FormModel.Mode;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.Entity;
 import org.molgenis.util.Tuple;
@@ -33 +37 @@
         {
                 // only show in list view
-                return getScreen().getMode().equals(Mode.LIST_VIEW);
+                return getFormScreen().getMode().equals(Mode.LIST_VIEW);
         }
         
@@ -43 +47 @@
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter downloadStream)
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter downloadStream)
         {
 
-                getScreen().setLimit(getLimit());
-                return true;
+                getFormScreen().setLimit(getLimit());
+                return ScreenModel.Show.SHOW_MAIN;
         }
 
@@ -59 +63 @@
                 this.limit = limit;
         }
+
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/CommandMenu.java

@@ -3 +3 @@
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
+import org.molgenis.framework.db.DatabaseException;
 import org.molgenis.framework.ui.FormModel;
 import org.molgenis.framework.ui.Templateable;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.Entity;
 
@@ -65 +68 @@
         }
 
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/DownloadAllCommand.java

@@ -5 +5 @@
 
 import java.io.PrintWriter;
+import java.util.List;
 
 import org.molgenis.framework.db.Database;
 import org.molgenis.framework.db.DatabaseException;
 import org.molgenis.framework.ui.FormModel;
+import org.molgenis.framework.ui.ScreenModel;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.CsvWriter;
 import org.molgenis.util.Entity;
@@ -29 +32 @@
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter csvDownload) throws DatabaseException
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter csvDownload) throws DatabaseException
         {
                 logger.debug(this.getName());
 
-                FormModel<E> view = this.getScreen();
+                FormModel<E> view = this.getFormScreen();
                 db.find(view.getEntityClass(), new CsvWriter(csvDownload), view.getRulesExclLimitOffset());
 
-                return true;
+                return ScreenModel.Show.SHOW_MAIN;
+        }
+
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
         }
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/DownloadSelectedCommand.java

@@ -16 +16 @@
 import org.molgenis.framework.db.QueryRule.Operator;
 import org.molgenis.framework.ui.FormModel;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.FormModel.Mode;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.CsvWriter;
 import org.molgenis.util.Entity;
@@ -40 +42 @@
         {
                 // only show in listview
-                return this.getScreen().getMode().equals(Mode.LIST_VIEW);
+                return this.getFormScreen().getMode().equals(Mode.LIST_VIEW);
         }
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter csvDownload) throws ParseException, DatabaseException,
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter csvDownload) throws ParseException, DatabaseException,
                         IOException
         {
                 logger.debug(this.getName());
                 
-                FormModel<E> view = this.getScreen();
+                FormModel<E> view = this.getFormScreen();
 
                 Object ids = request.getObject(FormModel.INPUT_SELECTED);
@@ -64 +66 @@
                 {
                         csvDownload.println("No records selected.");
-                        return true;
+                        return ScreenModel.Show.SHOW_MAIN;
                 }
 
@@ -70 +72 @@
                 db.find(view.getEntityClass(), new CsvWriter(csvDownload),
                                 new QueryRule("id", Operator.IN, records));
-                return true;
+                return ScreenModel.Show.SHOW_MAIN;
+        }
+
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
         }
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/DownloadVisibleCommand.java

@@ -12 +12 @@
 import org.molgenis.framework.db.DatabaseException;
 import org.molgenis.framework.ui.FormModel;
+import org.molgenis.framework.ui.ScreenModel;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.CsvWriter;
 import org.molgenis.util.Entity;
@@ -33 +35 @@
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter csvDownload) throws ParseException, DatabaseException,
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter csvDownload) throws ParseException, DatabaseException,
                         IOException
         {
                 logger.debug(this.getName());
 
-                FormModel<E> view = this.getScreen();
+                FormModel<E> view = this.getFormScreen();
                 List<E> records = view.getRecords();
                 CsvWriter writer = new CsvWriter(csvDownload, view.create().getFields());
@@ -44 +46 @@
                 for (E e : records)
                         writer.writeRow(e);
-                return true;
+                
+                return ScreenModel.Show.SHOW_MAIN;              
+        }
+
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
         }
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/EditSelectedCommand.java

@@ -9 +9 @@
 import org.molgenis.framework.ui.FormModel;
 import org.molgenis.framework.ui.ScreenMessage;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.FormModel.Mode;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.Entity;
 import org.molgenis.util.Tuple;
@@ -36 +38 @@
         public boolean isVisible()
         {
-                FormModel<E> view = this.getScreen();
+                FormModel<E> view = this.getFormScreen();
                 return !view.isReadonly() && view.getMode().equals(Mode.LIST_VIEW);
         }
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter out) throws DatabaseException
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter out) throws DatabaseException
         {
                 logger.debug(this.getName());
@@ -48 +50 @@
                 if (request.getString(FormModel.INPUT_SHOW) == null)
                 {
-                        FormModel<E> view = this.getScreen();
+                        FormModel<E> view = this.getFormScreen();
                         List<Object> idList = request.getList(FormModel.INPUT_SELECTED);
                         for (Object id : idList)
@@ -90 +92 @@
                         view.getMessages().add(msg);
                 }
-                return true;
+                return ScreenModel.Show.SHOW_MAIN;
+        }
+
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
         }
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/RemoveSelectedCommand.java

@@ -14 +14 @@
 import org.molgenis.framework.ui.FormModel;
 import org.molgenis.framework.ui.ScreenMessage;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.FormModel.Mode;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.Entity;
 import org.molgenis.util.Tuple;
@@ -31 +33 @@
         {
                 //only in listview
-                return getScreen().getMode().equals(Mode.LIST_VIEW);
+                return getFormScreen().getMode().equals(Mode.LIST_VIEW);
         }
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws DatabaseException, ParseException, IOException
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws DatabaseException, ParseException, IOException
         {
                 logger.debug(this.getName());
                 
-                FormModel<E> view = getScreen();
+                FormModel<E> view = getFormScreen();
 
                 ScreenMessage<E> msg = null;
@@ -73 +75 @@
                 }
                 
-                return true;
+                return ScreenModel.Show.SHOW_MAIN;
+        }
+
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
         }
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/ScreenCommand.java

@@ -9 +9 @@
 import org.molgenis.framework.db.DatabaseException;
 import org.molgenis.framework.ui.FormModel;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.Templateable;
 import org.molgenis.framework.ui.html.HtmlInput;
@@ -92 +93 @@
          * @return The screen this command is a child of
          */
-        public FormModel<E> getScreen();
+        public ScreenModel getScreen();
+        
+        /**
+         * Helper method to reduce casting
+         */
+        public FormModel getFormScreen();
 
         /**
@@ -98 +104 @@
          *            The screen this command belongs to
          */
-        public void setScreen(FormModel<E> screen);
+        public void setScreen(ScreenModel screen);
 
         /** @return true if this command should show a dialog */
@@ -142 +148 @@
          * @param downloadStream
          *            this the request can use to write results as download
-         * @return true if the request was handled succesfully
+         * @return if their should still be a popup, inline or download
          * @throws IOException
          * @throws DatabaseException
          * @throws ParseException
          */
-        public boolean handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException,
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException,
                         DatabaseException, IOException;
 

molgenis/3.3/src/org/molgenis/framework/ui/commands/SimpleCommand.java

@@ -11 +11 @@
 import org.molgenis.framework.ui.FormModel;
 import org.molgenis.framework.ui.ScreenModel;
+import org.molgenis.framework.ui.ScreenModel.Show;
 import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.Entity;
-import org.molgenis.util.SimpleTree;
 import org.molgenis.util.Tuple;
 
@@ -20 +20 @@
  * TODO: this may be very useful for other screens also.
  */
-public class SimpleCommand<E extends Entity> implements ScreenCommand<E> 
+public abstract class SimpleCommand<E extends Entity> implements ScreenCommand<E>
 {
         /** Logger */
         public Logger logger = Logger.getLogger(this.getClass().getSimpleName());
-        
+
         /** Internal name of this command (unique within the screen( */
         private String name;
@@ -46 +46 @@
         private boolean download = false;
 
-        /** The FormScreen this command is linked to */
-        private FormModel<E> screen;
+        /** The Screen this command is linked to */
+        private ScreenModel screen;
 
         /** The name of the menu this command should be shown on */
         private String menu;
-        
+
         /** Indicates to the screen to show this command on the toolbar */
         private boolean toolbar;
@@ -62 +62 @@
 
         /**
+         * Default constructure. Note that this.setScreen needs to be called
+         * elsewhere.
+         */
+        public SimpleCommand()
+        {
+                this.setName(this.getClass().getSimpleName());
+                // note that this.setScreen needs to be called elsewhere.
+        }
+
+        /**
          * Constructor
-         * @param name unique name of the command (within the screen)
+         * 
+         * @param name
+         *            unique name of the command (within the screen)
          * @param parentScreen
          */
@@ -73 +85 @@
 
         /**
-         * Get the javascript needed.
-         * If not provided it will be auto-generated.
+         * Get the javascript needed. If not provided it will be auto-generated.
          */
         public String getJavaScriptAction()
@@ -80 +91 @@
                 if (action == null)
                 {
+                        if (this.getScreen() == null) throw new NullPointerException("setScreen() has not been set on command '"
+                                        + getName() + "'");
+
                         StringBuffer jScript = new StringBuffer();
 
-                        //make sure the current window has a name (so popup can call back if necessary)
+                        // make sure the current window has a name (so popup can call back
+                        // if necessary)
                         jScript.append("if( window.name == '' ){ window.name = 'molgenis'+Math.random();}");
-                        
+
                         // default target screen is 'self'
                         jScript.append("document.forms." + this.getScreen().getName() + "_form." + FormModel.INPUT_TARGET
                                         + ".value='" + this.getScreen().getName() + "';");
-                        
-                        //default action handler is also 'self'
+
+                        // default action handler is also 'self'
                         jScript.append("document.forms." + this.getScreen().getName() + "_form." + FormModel.INPUT_ACTION
                                         + ".value='" + getName() + "';");
-                        
+
                         // in case of dialog make a popup
                         if (this.isDialog())
@@ -98 +113 @@
                                 // open a new screen named 'popup'
                                 jScript
-                                                .append("molgenis_window = window.open('','"+"molgenis_"+this.getName()+"','height=800,width=600,location=no,status=no,menubar=no,directories=no,toolbar=no,resizable=yes,scrollbars=yes');");
-                                
+                                                .append("molgenis_window = window.open('','"
+                                                                + "molgenis_"
+                                                                + this.getName()
+                                                                + "','height=800,width=600,location=no,status=no,menubar=no,directories=no,toolbar=no,resizable=yes,scrollbars=yes');");
+
                                 // make this new screen the target of this form
-                                jScript.append("document.forms." + this.getScreen().getName() + "_form.target='"+"molgenis_"+this.getName()+"';");
+                                jScript.append("document.forms." + this.getScreen().getName() + "_form.target='" + "molgenis_"
+                                                + this.getName() + "';");
 
                                 // set the 'show' parameter to 'popup' so the server knows to
                                 // show only this dialog
                                 jScript.append("document.forms." + this.getScreen().getName() + "_form." + FormModel.INPUT_SHOW
-                                                + ".value='" + ScreenModel.SHOW_DIALOG + "';");
+                                                + ".value='" + ScreenModel.Show.SHOW_DIALOG + "';");
                         }
 
@@ -112 +131 @@
                         else if (this.isDownload())
                         {
-                                //tell molgenis to download
+                                // tell molgenis to download
                                 jScript.append("document.forms." + this.getScreen().getName() + "_form." + FormModel.INPUT_SHOW
-                                                + ".value='" + ScreenModel.SHOW_DOWNLOAD + "';");
+                                                + ".value='" + ScreenModel.Show.SHOW_DOWNLOAD + "';");
                         }
-                        
-                        //default show inline
+
+                        // default show inline
                         else
                         {
                                 // make this this action target current window
                                 jScript.append("document.forms." + this.getScreen().getName() + "_form.target=window.name;");
-                                
+
                                 jScript.append("document.forms." + this.getScreen().getName() + "_form." + FormModel.INPUT_SHOW
-                                                + ".value='" + ScreenModel.SHOW_INLINE + "';");
+                                                + ".value='" + ScreenModel.Show.SHOW_MAIN + "';");
                         }
-                        
+
                         jScript.append("document.forms." + this.getScreen().getName() + "_form.submit();");
-                        
 
                         // make popup on front
@@ -146 +164 @@
          * @throws DatabaseException
          */
-        public List<HtmlInput> getInputs() throws DatabaseException
-        {
-                return null;
-        }
+        public abstract List<HtmlInput> getInputs() throws DatabaseException;
 
         // GETTERS AND SETTERS BELOW
@@ -167 +182 @@
         public String getLabel()
         {
-                return label;
+                if (label != null) return label;
+                return this.getName();
         }
 
@@ -213 +229 @@
 
         @Override
-        public FormModel<E> getScreen()
+        public ScreenModel getScreen()
         {
                 return this.screen;
@@ -219 +235 @@
 
         @Override
-        public void setScreen(FormModel<E> screen)
+        public FormModel<E> getFormScreen()
+        {
+                return (FormModel) this.screen;
+        }
+
+        @Override
+        public void setScreen(ScreenModel screen)
         {
                 this.screen = screen;
@@ -250 +272 @@
 
         @Override
-        public List<HtmlInput> getActions()
+        public abstract List<HtmlInput> getActions();
+
+        @Override
+        public Show handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException,
+                        DatabaseException, IOException
         {
                 // TODO Auto-generated method stub
+                return ScreenModel.Show.SHOW_MAIN;
+        }
+
+        @Override
+        public boolean isDownload()
+        {
+                return download;
+        }
+
+        @Override
+        public void setDownload(boolean download)
+        {
+                this.download = download;
+        }
+
+        @Override
+        public boolean isToolbar()
+        {
+                return toolbar;
+        }
+
+        @Override
+        public void setToolbar(boolean toolbar)
+        {
+                this.toolbar = toolbar;
+        }
+
+        /**
+         * Default view name = 'SimpleCommand'
+         */
+        public String getViewName()
+        {
+                return ScreenCommand.class.getSimpleName();
+        }
+
+        public String getViewTemplate()
+        {
                 return null;
         }
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws ParseException, DatabaseException,
-                        IOException
-        {
-                // TODO Auto-generated method stub
-                return false;
-        }
-
-        @Override
-        public boolean isDownload()
-        {
-                return download;
-        }
-
-        @Override
-        public void setDownload(boolean download)
-        {
-                this.download = download;
-        }
-        
-        @Override
-        public boolean isToolbar()
-        {
-                return toolbar;
-        }
-
-        @Override
-        public void setToolbar(boolean toolbar)
-        {
-                this.toolbar = toolbar;
-        }
-
-        /**
-         * Default view name = 'SimpleCommand'
-         */
-        public String getViewName()
-        {
-                return ScreenCommand.class.getSimpleName();
-        }
-
-        public String getViewTemplate()
-        {
-                return null;
-        }
-
-        @Override
-        public String getCustomHtmlHeaders() {
+        public String getCustomHtmlHeaders()
+        {
                 return "";
         }

molgenis/3.3/src/org/molgenis/framework/ui/commands/ViewEditViewCommand.java

@@ -5 +5 @@
 
 import java.io.PrintWriter;
+import java.util.List;
 
 import org.molgenis.framework.db.Database;
+import org.molgenis.framework.db.DatabaseException;
 import org.molgenis.framework.ui.FormModel;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.FormModel.Mode;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.Entity;
 import org.molgenis.util.Tuple;
@@ -22 +26 @@
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter out)
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter out)
         {
-                getScreen().setMode(Mode.EDIT_VIEW);
+                getFormScreen().setMode(Mode.EDIT_VIEW);
                 Integer offset = request.getInt(FormModel.INPUT_OFFSET);
-                if (offset != null) getScreen().getPager().setOffset(offset - 1);
-                return true;
+                if (offset != null) getFormScreen().getPager().setOffset(offset - 1);
+                return ScreenModel.Show.SHOW_MAIN;
         }
 
@@ -35 +39 @@
                 //show add button when not in recordview
                 //show add button if the screen is not readonly
-                return !this.getScreen().getMode().equals(Mode.EDIT_VIEW) 
-                && !this.getScreen().isReadonly() 
-                && this.getScreen().getRecordInputs().size() != 0
-                && !this.getScreen().getRecordInputs().get(0).isReadonly();
+                return !this.getFormScreen().getMode().equals(Mode.EDIT_VIEW) 
+                && !this.getFormScreen().isReadonly() 
+                && this.getFormScreen().getRecordInputs().size() != 0
+                && !this.getFormScreen().getRecordInputs().get(0).isReadonly();
+        }
+
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
         }
 }

molgenis/3.3/src/org/molgenis/framework/ui/commands/ViewListViewCommand.java

@@ -7 +7 @@
 import java.io.PrintWriter;
 import java.text.ParseException;
+import java.util.List;
 
 import org.molgenis.framework.db.Database;
 import org.molgenis.framework.db.DatabaseException;
 import org.molgenis.framework.ui.FormModel;
+import org.molgenis.framework.ui.ScreenModel;
 import org.molgenis.framework.ui.FormModel.Mode;
+import org.molgenis.framework.ui.html.HtmlInput;
 import org.molgenis.util.Entity;
 import org.molgenis.util.Tuple;
@@ -25 +28 @@
 
         @Override
-        public boolean handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws DatabaseException, ParseException,
+        public ScreenModel.Show handleRequest(Database db, Tuple request, PrintWriter downloadStream) throws DatabaseException, ParseException,
                         IOException
         {
                 logger.debug(this.getName());
 
-                getScreen().setMode(Mode.LIST_VIEW);
+                getFormScreen().setMode(Mode.LIST_VIEW);
                 Integer offset = request.getInt(FormModel.INPUT_OFFSET);
                 if (offset != null)
                 {
-                        getScreen().getPager().setOffset(offset - 1);
+                        getFormScreen().getPager().setOffset(offset - 1);
                 }
                 else
                 {
-                        getScreen().getPager().setOffset(getScreen().getOffset());
+                        getFormScreen().getPager().setOffset(getFormScreen().getOffset());
                 }
-                return true;
+                return ScreenModel.Show.SHOW_MAIN;
         }
 
@@ -47 +50 @@
         {
                 // hide when already in list view
-                return !getScreen().getMode().equals(Mode.LIST_VIEW);
+                return !getFormScreen().getMode().equals(Mode.LIST_VIEW);
+        }
+
+        @Override
+        public List<HtmlInput> getActions()
+        {
+                // TODO Auto-generated method stub
+                return null;
+        }
+
+        @Override
+        public List<HtmlInput> getInputs() throws DatabaseException
+        {
+                // TODO Auto-generated method stub
+                return null;
         }
 }

molgenis/3.3/src/org/molgenis/framework/ui/html/Form.java

@@ -17 +17 @@
         }
         
-        public void addAll(List<Input> inputs)
+        public void addAll(List<HtmlInput> inputs)
         {
                 for(Input i: inputs) this.add(i);

molgenis/3.3/src/org/molgenis/framework/ui/html/HtmlForm.java

@@ -10 +10 @@
 import org.molgenis.util.Tuple;
 
-public abstract class HtmlForm<E extends Entity>
+public class HtmlForm<E extends Entity>
 {
         /** The entity to be shown in this form*/
@@ -20 +20 @@
         /** A form may be used to add a new record. This may result in readonly fields, e.g. for autoid.*/
         private boolean newRecord = false;
+        /** Inputs */
+        private List<HtmlInput> inputs = new ArrayList<HtmlInput>();
+        
+        public HtmlForm()
+        {
+                
+        }
         
         public boolean isNewRecord()
@@ -48 +55 @@
         
         /**Create the inputs to be shown*/
-        public abstract Vector<HtmlInput> getInputs();
+        public List<HtmlInput> getInputs()
+        {
+                return this.inputs;
+        }
+        
+        public void setInputs(List<HtmlInput> inputs)
+        {
+                this.inputs = inputs;
+        }
 
         public E getEntity()