Changeset 3894

Timestamp:

Oct 20, 2010, 9:35:51 AM (13 years ago)

Author:

Gregory Vincic

Message:

Fixes #711. Use method fieldset.setOpen(false) to hide the fieldset.

Location:

trunk/client/servlet

Files:

• src/org/proteios/gui/form/Fieldset.java (modified) (1 diff)
• src/org/proteios/gui/web/GUIConverter.java (modified) (3 diffs)
• test/src/org/proteios/gui/form/NewUserFormTest.java (modified) (2 diffs)
• www/static/css/layout2.jsp (modified) (3 diffs)
• www/static/js/script.js (modified) (2 diffs)

trunk/client/servlet/src/org/proteios/gui/form/Fieldset.java

@@ -1 +1 @@
 /*
- $Id$
-
- Copyright (C) 2006, 2007 Gregory Vincic
-
- Files are copyright by their respective authors. The contributions to
- files where copyright is not explicitly stated can be traced with the
- source code revision system.
-
- This file is part of Proteios.
- Available at http://www.proteios.org/
-
- proteios-2.x is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- Proteios is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA  02111-1307, USA.
- */
+    $Id$
+    
+    Copyright (C) 2006, 2007, 2010 Gregory Vincic
+    
+    Files are copyright by their respective authors. The contributions to
+    files where copyright is not explicitly stated can be traced with the
+    source code revision system.
+    
+    This file is part of Proteios.
+    Available at http://www.proteios.org/
+    
+    proteios-2.x is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+    
+    Proteios is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA  02111-1307, USA.
+*/
 package org.proteios.gui.form;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.proteios.gui.GUIElement;
 import org.proteios.gui.Title;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
- * Groups a set of fields together
- * 
- * @author gregory
- */
+    Groups a set of fields together     
+*/
 public class Fieldset
-    extends GUIElement<Fieldset>
+extends GUIElement<Fieldset>
 {
-  
-  private List<GUIElement> fields = null;
-  private Title title = null;
+    private List<GUIElement> fields = null;
+    private Title title = null;
+    /*
+        Set the open flag to false to hide e.g. advanced fieldsets from the user.
+    */
+    private Boolean open = true;
 
+    public Fieldset()
+    {
+        this.title = new Title("");
+    }
+    
+    public Fieldset(String title)
+    {
+        this.title = new Title(title);
+    }
+    
+    public Title getTitle()
+    {
+        return this.title;
+    }
+    
+    /**
+        * Set the fieldset legens Title object.
+        * 
+        * @param legendTitle Title The legend Title to set.
+    */
+    public void setTitle(Title title)
+    {
+        this.title = title;
+    }
+    
+    public void setTitle(String title)
+    {
+        this.title.setTitle(title);
+    }
+    
+    public List<GUIElement> getFields()
+    {
+        if (fields == null)
+        return new ArrayList<GUIElement>(0);
+        return fields;
+    }
+    
+    public void setFields(List<GUIElement> fields)
+    {
+        this.fields = fields;
+    }
+    
+    public void add(GUIElement field)
+    {
+        if (fields == null)
+        {
+            this.fields = new ArrayList<GUIElement>();
+        }
+        if (field != null)
+        fields.add(field);
+    }
+    
+    public void add(int i, GUIElement field)
+    {
+        if (fields == null)
+        {
+            this.fields = new ArrayList<GUIElement>();
+        }
+        if (field != null)
+        fields.add(i, field);
+    }
+    
+    public int size()
+    {
+        if(this.fields == null) 
+        {
+            return 0;
+        }
+        return this.fields.size();
+    }
 
- public Fieldset()
- {
-  this.title = new Title("");
- }
+    public void setOpen(Boolean open) 
+    {
+        this.open = open;
+    }
 
- public Fieldset(String title)
- {
-  this.title = new Title(title);
- }  
-
-  public Title getTitle()
-  {
-    return this.title;
-  }
-
-
-  /**
-   * Set the fieldset legens Title object.
-   * 
-   * @param legendTitle Title The legend Title to set.
-   */
-  public void setTitle(Title title)
-  {
-    this.title = title;
-  }
-
-public void setTitle(String title)
-  {
-    this.title.setTitle(title);
-  }
-
-
-  public List<GUIElement> getFields()
-  {
-    if (fields == null)
-      return new ArrayList<GUIElement>(0);
-    return fields;
-  }
-
-
-  public void setFields(List<GUIElement> fields)
-  {
-    this.fields = fields;
-  }
-
-
-  public void add(GUIElement field)
-  {
-    if (fields == null)
-    {
-      this.fields = new ArrayList<GUIElement>();
-    }
-    if (field != null)
-      fields.add(field);
-  }
-
-
-  public void add(int i, GUIElement field)
-  {
-    if (fields == null)
-    {
-      this.fields = new ArrayList<GUIElement>();
-    }
-    if (field != null)
-      fields.add(i, field);
-  }
-
- public int size()
- {
-  if(this.fields == null) 
-  {
-   return 0;
-  }
-  return this.fields.size();
- }
+    public Boolean isOpen() 
+    {
+        return this.open;
+    }
 }

trunk/client/servlet/src/org/proteios/gui/web/GUIConverter.java

@@ -1 +1 @@
 /*
- $Id$
-
- Copyright (C) 2006 Gregory Vincic
- Copyright (C) 2007 Gregory Vincic, Olle Mansson
-
- Files are copyright by their respective authors. The contributions to
- files where copyright is not explicitly stated can be traced with the
- source code revision system.
-
- This file is part of Proteios.
- Available at http://www.proteios.org/
-
- Proteios-2.x is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- Proteios is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA  02111-1307, USA.
- */
+    $Id$
+    
+    Copyright (C) 2006 Gregory Vincic
+    Copyright (C) 2007 Gregory Vincic, Olle Mansson
+    
+    Files are copyright by their respective authors. The contributions to
+    files where copyright is not explicitly stated can be traced with the
+    source code revision system.
+    
+    This file is part of Proteios.
+    Available at http://www.proteios.org/
+    
+    Proteios-2.x is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+    
+    Proteios is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA  02111-1307, USA.
+*/
 package org.proteios.gui.web;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
 import org.proteios.AbstractLink;
 import org.proteios.ActionLink;
@@ -71 +81 @@
 import org.proteios.gui.table.Row;
 import org.proteios.gui.table.TreeRow;
-
 import se.lu.thep.waf.constraints.VString;
 import se.lu.thep.waf.dom.html.A;
@@ -98 +107 @@
 import se.lu.thep.waf.dom.html.Ul;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
+/**
+    * Converts org.proteios.gui.* GUIElements to Tag objects
+    * 
+    * @see HtmlFactory LayoutFactory
+    * @author gregory
+*/
+public class GUIConverter
+extends AbstractGUIConverter<Tag>
+{
+    private final String contextPath;
+    private HtmlFactory hf;
+    private HttpServletRequest request = null;
+    private final SimpleDateFormat formatter = new SimpleDateFormat(
+    "yyyy-MM-dd HH:mm:ss");
+    private String imagePath;
+    private Localizer locale = null;
+    private Properties iconSet = null;
+    /**
+        * This flag is used to tell converter methods not to generate it's own form
+        * tag. Used e.g. when converting the table configuration content so that
+        * the config fields are a part of the table form.
+    */
+    private Tag currentFormTag = null;
+    private String currentFormId = null;
+    private TypeUtil typeUtil = new TypeUtil();
+    
+    public HttpServletRequest getRequest()
+    {
+        return request;
+    }
+    
+    public void setRequest(HttpServletRequest request)
+    {
+        this.request = request;
+        hf.setRequest(request);
+    }
+    
+    public GUIConverter(String contextPath)
+    {
+        super();
+        this.contextPath = contextPath + "/app";
+        this.imagePath = contextPath + "/static/img/";
+        this.hf = new HtmlFactory(contextPath);
+    }
+    
+    private Random r = new Random();
+    
+    public Tag convert(Image img)
+    {
+        ActionLink viewAction;
+        String imgId, imgSrc, loadingImgSrc;
+        Tag div, script;
+        Img imgT;
+        Boolean useFrame;
+        // static source is used unless ViewAction is set
+        imgId = "img" + r.nextInt(10);
+        imgSrc = imagePath + img.getStaticSrc();
+        viewAction = img.getViewAction();
+        if (viewAction != null)
+        {
+            imgSrc = contextPath + "?action=" + img.getViewAction().toString();
+        }
+        loadingImgSrc = imagePath + "loading.gif";
+        useFrame = img.getFramed();
+        div = hf.newLayoutDiv();
+        if (useFrame)
+        {
+            div.addClass("imageContainer");
+            // If bot height and width are set use those
+            if (img.getHeight() > 0 && img.getWidth() > 0)
+            div
+            .setStyle("height : " + img.getHeight() + "px; width : " + img
+            .getWidth() + "px");
+        }
+        imgT = div.newImg().setId(imgId).setClass("image");
+        // First we show the loading img
+        imgT.setSrc(loadingImgSrc);
+        //
+        if (img.getImageMap() != null && img.getImageMap().getImageMapAreaList() != null)
+        {
+            String imageMapStr = "ImageMap" + imgId;
+            imgT.setUsemap("#" + imageMapStr);
+            // Create image map
+            Map map = new Map();
+            map.setParent(div);
+            div.add(map);
+            map.setName(imageMapStr);
+            List<ImageMapArea> imageMapAreaList = img.getImageMap().getImageMapAreaList();
+            for (int i = 0; i < imageMapAreaList.size(); i++)
+            {
+                // Get image map area data from image object
+                ImageMapArea imageMapArea = (ImageMapArea) imageMapAreaList .get(i);
+                int xTopLeft = imageMapArea.getXTopLeft();
+                int yTopLeft = imageMapArea.getYTopLeft();
+                int xBottomRight = imageMapArea.getXBottomRight();
+                int yBottomRight = imageMapArea.getYBottomRight();
+                String hrefStr = imageMapArea.getHrefStr();
+                String toolTipStr = imageMapArea.getToolTipStr();
+                String onMouseoverStr = null;
+                String onMouseoutStr = null;
+                if (toolTipStr != null && !toolTipStr.equals(""))
+                {
+                    onMouseoverStr = new String("showtip(this,event,'" + toolTipStr + "')");
+                    onMouseoutStr = new String("hidetip()");
+                }
+                // Create new image map area
+                Area area = new Area();
+                area.setParent(map);
+                map.add(area);
+                area.setShape("RECT");
+                area.setCoords(xTopLeft, yTopLeft, xBottomRight, yBottomRight);
+                if (hrefStr != null && !hrefStr.equals(""))
+                {
+                    area.setHref(hrefStr);
+                }
+                if (onMouseoverStr != null && !onMouseoverStr.equals(""))
+                {
+                    area.setOnMousover(onMouseoverStr);
+                }
+                if (onMouseoutStr != null && !onMouseoutStr.equals(""))
+                {
+                    area.setOnMousout(onMouseoutStr);
+                }
+            }
+        }
+        script = div.newScript();
+        script.newCData("var " + imgId + " = new Image();");
+        script.newCData(imgId + ".src = \"" + imgSrc + "\";");
+        script.newCData("getElement('" + imgId + "').src = " + imgId + ".src;");
+        return div;
+    }
+    
+    public Tag convert(IFrame obj)
+    {
+        Tag tag = hf.newIFrame(obj);
+        String src = contextPath + "?action=" + obj.getSrc().toString();
+        tag.setAttribute(new Attribute("src", src));
+        String id = this.nextId();
+        tag.setId(id);
+        tag
+        .setAttribute(new Attribute("onload", "resize_iframe('" + id + "')"));
+        return tag;
+    }
+    
+    public Tag convert(Listing list)
+    {
+        Div layout = hf.newLayoutDiv();
+        Div listing = layout.newDiv().setClass("listing");
+        String title = list.getTitle();
+        if (title != null)
+        {
+            listing.add(hf.newBar().addClass("title").add(
+            new CData(locale.get(title) + "&nbsp;")));
+        }
+        List<ListItem> items = list.getItems();
+        if (items.size() > 0)
+        {
+            Tag dl = new Dl();
+            for (ListItem item : items)
+            {
+                Tag dt = dl.newDt();
+                Tag dd = dl.newDd();
+                if (item.getDate() != null)
+                {
+                    String date = formatter.format(item.getDate());
+                    dt.newCData(date + " - ");
+                }
+                dt.newCData(item.getTitle());
+                dd.newCData(item.getContent());
+            }
+            listing.add(dl);
+        }
+        else
+        {
+            listing.newDiv().setClass("empty").newCData("Empty");
+        }
+        return layout;
+    }
+    
+    /**
+        * @param action
+        * @return goToLocation('action.toString()')
+    */
+    private String action2js(ActionLink action)
+    {
+        StringBuilder sb = new StringBuilder();
+        if (action != null)
+        {
+            String jsMethod = "rightGo";
+            sb.append(jsMethod + "('");
+            sb.append(action.toString());
+            sb.append("')");
+        }
+        return sb.toString();
+    }
+    
+    public Tag convert(org.proteios.gui.TreeMenu menu)
+    {
+        Tag layout = new Div().setId("menuh-container").newDiv().setId("menuh");
+        for (Node node : menu.getRoot().getChildNodes())
+        {
+            Tag top = new Ul();
+            top.add(convert(node));
+            layout.add(top);
+        }
+        return layout.getRoot();
+    }
+    
+    public Tag convert(org.proteios.gui.MainMenu menu)
+    {
+        Tag div, ul;
+        
+        div = hf.newLayoutDiv();
+        ul = convert((org.proteios.gui.TreeMenu) menu);
+        
+        div.add(ul);
+        return div;
+    }
+    
+    public String convert(ClosePopup button)
+    {
+        return "closeAllVisiblePopups()";
+    }
+    
+    public Tag<?> convert(ActionLink pageLink, String formId, boolean localize)
+    {
+        String js = action2js(pageLink, formId);
+        A tag = new A();
+        tag.setHref(js);
+        // Add the icon if any
+        String icon = (String) iconSet.get(pageLink.getLabel());
+        if (icon != null)
+        {
+            tag.newImg().setSrc(imagePath + icon);
+        }
+        String label = localize ? locale.get(pageLink.getLabel()) : pageLink
+        .getLabel();
+        tag.newCData(label);
+        return tag;
+    }
+    
+    /**
+        * Converts an ActionLink such that each parameter of the ActionLink is a
+        * call to the javascript method addField(formId, name, value) before adding
+        * submitFormAs(formId, actionId)
+        * 
+        * @param pageLink
+        * @param formId
+        * @return string of javascript code used in eg. href of a tags
+    */
+    private String action2js(ActionLink pageLink, String formId)
+    {
+        StringBuilder js = new StringBuilder();
+        js.append("javascript:");
+        List<Parameter> params = pageLink.getParameters();
+        if (params != null)
+        {
+            for (Parameter param : params)
+            {
+                js.append("addField(");
+                js.append("'");
+                js.append(formId);
+                js.append("','");
+                js.append(param.name);
+                js.append("','");
+                js.append(param.value);
+                js.append("');");
+            }
+        }
+        js.append("submitFormAs('");
+        js.append(formId);
+        js.append("','");
+        js.append(pageLink.getActionId());
+        js.append("');");
+        return js.toString();
+    }
+    
+    public Tag convert(Scroller scroller, String formId)
+    {
+        Tag scrollBar = hf.newBar().addClass("scroller");
+        // page links
+        List<ActionLink> pageLinks = scroller.getPageLinks();
+        for (int i = 0; i < pageLinks.size(); i++)
+        {
+            ActionLink pageLink = pageLinks.get(i);
+            if (pageLink != null)
+            {
+                if (!pageLink.isSelected() && !pageLink.isDisabled())
+                {
+                    // Link to back or forward page
+                    boolean localize = true;
+                    if (i > 1 && i < 7)
+                    {
+                        // Do not localize page numbers
+                        localize = false;
+                    }
+                    scrollBar.add(convert(pageLink, formId, false));
+                }
+                else
+                {
+                    if (pageLink.isDisabled())
+                    {
+                        // Current page, text label only
+                        scrollBar.newSpan().setClass("disabled").newCData(
+                        pageLink.getLabel() + "&nbsp;");
+                    }
+                    else
+                    {
+                        scrollBar.newSpan().setClass("selected").newCData(
+                        pageLink.getLabel() + "&nbsp;");
+                    }
+                }
+            }
+        }
+        // Total number of items
+        int total = scroller.getTotalCount();
+        scrollBar.newBr();
+        int from = scroller.getFrom();
+        int to = from + scroller.getMax();
+        if (to > total)
+        to = total;
+        from++; // As we start from 0
+        scrollBar.newCData("Showing " + from + "-" + to + " of " + total);
+        // Add rows/page field if table is controlled by ConfigureTableFactory2
+        ActionLink configureTableAction = scroller.getTable()
+        .getConfigureTableAction();
+        if (configureTableAction != null && configureTableAction.getActionId()
+        .equals("org.proteios.action.ConfigureTableFactory2"))
+        {
+            // Add number of rows per page field
+            scrollBar.newCData("&nbsp;&nbsp;&nbsp;Rows/page ");
+            scrollBar.newTh().newInput().setSize(3).setName(
+            Scroller.VMAXRESULT.getName()).setValue(
+            Integer.toString(scroller.getMax()));
+        }
+        // TODO gregory add Localizer to GUIConverter
+        scrollBar.add(new CData("&nbsp;"));
+        return scrollBar.getRoot();
+    }
+    
+    /**
+        * @param table to convert
+        * @return root tag
+    */
+    public Tag convert(org.proteios.gui.table.Table table)
+    {
+        // <DIV class="layout"...
+        Tag layout = hf.newLayoutDiv();
+        // <FORM ...
+        Scroller scroller = null;
+        Toolbar toolbar = null;
+        String formId = null;
+        boolean outerForm = false;
+        if (currentFormTag == null)
+        {
+            outerForm = true;
+            formId = "formOf" + table.getId();
+            currentFormId = formId;
+            currentFormTag = layout.newForm().setId(formId).setMethod("POST")
+            .setAction(contextPath);
+            // Add hidden submit button
+            currentFormTag.newInput().setType("submit").setClass("hidden");
+            // Add hidden action field and set the default action
+            toolbar = table.getToolbar();
+            if (toolbar != null)
+            {
+                Input field = currentFormTag.newInput()
+                .setId(formId + "action").setName("action").setType(
+                "hidden");
+                if (toolbar.getDefaultAction() != null)
+                {
+                    AbstractLink defaultLink = toolbar.getDefaultAction();
+                    if (defaultLink != null && ActionLink.class
+                    .isAssignableFrom(defaultLink.getClass()))
+                    {
+                        field
+                        .setValue(((ActionLink) defaultLink).getActionId());
+                    }
+                }
+                
+            }
+            scroller = table.getScroller();
+            List<TextField<?>> hiddenFields = table.getHiddenFields();
+            if (hiddenFields != null && hiddenFields.size() > 0)
+            {
+                for (TextField<?> f : hiddenFields)
+                {
+                    currentFormTag.add(convert(f));
+                }
+            }
+        }
+        else
+        {
+            formId = currentFormId;
+            toolbar = table.getToolbar();
+        }
+        // <DIV class="table" ...
+        Tag tableLayout = currentFormTag.newDiv().setClass("table");
+        // Table title
+        String title = table.getTitle();
+        String subtitle = table.getSubtitle();
+        Tag titleBar = hf.newBar();
+        ActionLink configureTableAction = table.getConfigureTableAction();
+        // Table configuration popup
+        if (title != null)
+        {
+            if (configureTableAction != null && configureTableAction
+            .getActionId().equals(
+            "org.proteios.action.ConfigureTableFactory2"))
+            {
+                // Add the icon only if there is a GUI to display
+                Img configIcon = new Img().setSrc(imagePath + "/columns.gif")
+                .setClass("tableConfigIcon");
+                String id = nextId();
+                A options = new A();
+                options.setStyle("float:right; font-size: 0.9em; text-decoration: none");
+                options.newCData("Table Options");
+                options.setHref("javascript:popup('" + id + "')");
+                configIcon.setOnClick("popup('" + id + "')");
+                // Insert the popup div inside the form tag
+                Div popupLayout = currentFormTag.newDiv().setClass(
+                "popupLayout").setId(id);
+                TitledWindow tw = new TitledWindow("TableOptions");
+                tw.setStatic(false);
+                Tag popContent = convert(tw);
+                popupLayout.add(popContent);
+                // Header
+                Tag tbl = popContent.newDiv().setClass("table").newDiv()
+                .setClass("tableContent").newTable().setCellPadding(1)
+                .setCellSpacing(0);
+                Tag trh = tbl.newTr();
+                trh.newTh().newCData(locale.get("Show"));
+                trh.newTh().newCData(locale.get("ColumnDisplayOrder"));
+                trh.newTh().newCData(locale.get("OrderBy"));
+                trh.newTh().newCData(locale.get("ColumnSortPriority"));
+                trh.newTh().newCData(locale.get("Column"));
+                // Toolbar
+                titleBar.add(configIcon);
+                titleBar.add(options);
+                // Table configuration updated flag set to "true"
+                Input tableConfigurationUpdatedField = trh.newInput().
+                setName("tableConfigurationUpdated").setType("hidden");
+                tableConfigurationUpdatedField.setValue("true");
+                // Get number of potential sort columns
+                int nSortColumns = 0;
+                for (Column col : table.getHeader())
+                {
+                    AttributeDefinition ad = col.getAttributeDefinition();
+                    if (ad != null)
+                    {
+                        if (col.getDisplayFilter())
+                        {
+                            nSortColumns++;
+                        }
+                    }
+                }
+                // Add column selection here
+                boolean firstColumnIsIdColumn = false; // Used below to indicate if 'Id' is part of the header
+                int nColumns = table.getHeader().size();
+                for (Column col : table.getHeader())
+                {
+                    AttributeDefinition ad = col.getAttributeDefinition();
+                    if (ad != null)
+                    {
+                        Tr tr = tbl.newTr();
+                        // Show
+                        Input inputTag = tr.newTd().newInput().setType(
+                        "checkbox").setName("show" + ad.getKey());
+                        if (col.isVisible())
+                        inputTag.setAttribute(new Attribute("checked",
+                        "checked"));
+                        // Column display order select box
+                        Integer colDisplayOrder = col.getDisplayOrder();
+                        
+                        if (ad.getKey().equals("Id"))
+                        {
+                            // Disable display order select box for "Id" column
+                            tr.newTd().newCData("" + colDisplayOrder + "&nbsp;");
+                            firstColumnIsIdColumn = true;
+                        }
+                        else
+                        {
+                            // Add display order select box for other columns
+                            Tag displayOrderSelectBox = new Select().setName("displayOrder" + ad.getKey());
+                            for (int i=0; i < nColumns; i++)
+                            {
+                                int displayOrderValue = i + 1;
+                                // If first column is "Id" column, reserve this position
+                                if (!firstColumnIsIdColumn || displayOrderValue > 1)
+                                {
+                                    String displayOrderValueStr = "" + displayOrderValue;
+                                    Option displayOrderOption = displayOrderSelectBox.newOption().setValue(displayOrderValueStr);
+                                    displayOrderOption.newCData(displayOrderValueStr);
+                                    if (colDisplayOrder != null && colDisplayOrder == displayOrderValue)
+                                    {
+                                        displayOrderOption.select();
+                                    }
+                                }
+                            }
+                            tr.newTd().add(displayOrderSelectBox);
+                        }
+                                    
+                        // Order by
+                        if (col.getDisplayFilter())
+                        {
+                            Tag s = new Select().setName("orderBy" + ad
+                            .getKey());
+                            Option def = s.newOption().setValue("");
+                            def.newCData("&nbsp;");
+                            Option asc = s.newOption().setValue("asc");
+                            asc.newCData("asc");
+                            Option desc = s.newOption().setValue("desc");
+                            desc.newCData("desc");
+                            if (col.getOrder() == null)
+                            {
+                                def.select();
+                            }
+                            else if (col.getOrder().equals(SortOrder.ASC))
+                            {
+                                asc.select();
+                            }
+                            else if (col.getOrder().equals(SortOrder.DESC))
+                            {
+                                desc.select();
+                            }
+                            tr.newTd().add(s);
+                        }
+                        else
+                        {
+                            tr.newTd().newCData("&nbsp;");
+                        }
+                        // Column sort priority
+                        if (col.getDisplayFilter())
+                        {
+                            // Sort priority select box
+                            Tag s = new Select().setName("sortPriority" + ad
+                            .getKey());
+                            Option def = s.newOption().setValue("");
+                            def.newCData("&nbsp;");
+                            Integer colSortPriority = col.getSortPriority();
+                            if (colSortPriority == null)
+                            {
+                                def.select();
+                            }
+                            for (int i=0; i < nSortColumns; i++)
+                            {
+                                int sortPriorityValue = i + 1;
+                                String sortPriorityValueStr = "" + sortPriorityValue;
+                                Option sortPriorityOption = s.newOption().setValue(sortPriorityValueStr);
+                                sortPriorityOption.newCData(sortPriorityValueStr);
+                                if (colSortPriority != null && colSortPriority == sortPriorityValue)
+                                {
+                                    sortPriorityOption.select();
+                                }
+                            }
+                            tr.newTd().add(s);
+                        }
+                        else
+                        {
+                            tr.newTd().newCData("&nbsp;");
+                        }
+                        // Column name
+                        tr.newTd().setAttribute(new Attribute("width", "100%"))
+                        .newCData(locale.get(col.getValue()));
+                    }
+                }
+                Tag popToolbar = popContent.newDiv().setClass("toolbar");
+                Tag ul = popToolbar.newUl();
+                ul
+                .newLi()
+                .setOnClick(
+                "submitFormAs('" + formId + "','org.proteios.action.ConfigureTableFactory2')")
+                .newCData(locale.get("Apply"));
+            }
+        }
+        // End table configuration
+        if (title != null)
+        {
+            tableLayout.add(titleBar.addClass("title").add(
+            new CData(locale.get(title) + "&nbsp;")));
+            if (subtitle != null)
+            {
+                titleBar.newCData(" - ");
+                titleBar.newSpan().setClass("subtitle").newCData(subtitle);
+            }
+        }
+        // <DIV>
+        Tag tableContent = tableLayout.newDiv().setClass("tableContent");
+        // <TABLE ...
+        Tag tbl = new Table().setId(table.getId()).setCellSpacing(0)
+        .setCellPadding(1).setAttribute(new Attribute("border", "0"))
+        .setAttribute(new Attribute("width", "100%"));
+        tableContent.add(tbl);
+        Tr header = tbl.newTr().setClass("header");
+        Tr filter = tbl.newTr().setClass("filter").addClass("header");
+        Iterator<Column> cols = table.getHeader().iterator();
+        int colspan = 0;
+        boolean useRowAction = true;
+        Attribute selected = new Attribute("selected", "selected");
+        while (cols.hasNext())
+        {
+            colspan++;
+            Column c = cols.next();
+            if (c.isVisible())
+            {
+                if (c.getAction() != null)
+                useRowAction = false;
+                Tag col = convert(c, table);
+                String operator = "";
+                String value = "";
+                Filter f = c.getFilter();
+                if (c.getDisplayFilter())
+                {
+                    if (f != null)
+                    {
+                        operator = f.getOperator().getSymbol();
+                        value = f.getValue().toString();
+                    }
+                    AttributeDefinition ad = c.getAttributeDefinition();
+                    if (ad != null)
+                    {
+                        Class<?> valueType = ad.getAttributeType();
+                        String name = "where" + ad.getKey();
+                        String inputValue = operator + value;
+                        if (operator.equals(Operator.LIKE.getSymbol()))
+                        inputValue = Operator.EQ.getSymbol() + value;
+                        if (typeUtil.isBoolean(valueType))
+                        {
+                            Tag select = filter.newTh().newSelect().setName(
+                            name);
+                            select.newOption().newCData("");
+                            Tag yesOption = select.newOption()
+                            .setValue("=true");
+                            Tag noOption = select.newOption()
+                            .setValue("=false");
+                            if (inputValue.equals("=true"))
+                            yesOption.setAttribute(selected);
+                            else if (inputValue.equals("=false"))
+                            noOption.setAttribute(selected);
+                            yesOption.newCData("yes");
+                            noOption.newCData("no");
+                        }
+                        else if (valueType.isEnum())
+                        {
+                            Tag select = filter.newTh().newSelect().setName(
+                            name);
+                            select.newOption().newCData("");
+                            for (Object o : valueType.getEnumConstants())
+                            {
+                                try
+                                {
+                                    Method valueGetter = o.getClass()
+                                    .getMethod("getValue");
+                                    String enumValue = valueGetter.invoke(o
+                                    ).toString();
+                                    String label = o.toString();
+                                    Tag option = select.newOption().setValue(
+                                    enumValue);
+                                    option.newCData(label);
+                                    if (value.equals(enumValue))
+                                    {
+                                        option.setAttribute(selected);
+                                    }
+                                }
+                                catch (SecurityException e)
+                                {
+                                    e.printStackTrace();
+                                }
+                                catch (NoSuchMethodException e)
+                                {
+                                    e.printStackTrace();
+                                }
+                                catch (IllegalArgumentException e)
+                                {
+                                    e.printStackTrace();
+                                }
+                                catch (IllegalAccessException e)
+                                {
+                                    e.printStackTrace();
+                                }
+                                catch (InvocationTargetException e)
+                                {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                        else
+                        {
+                            filter.newTh().newInput().setClass("filter")
+                            .setSize(7).setName(name).setValue(
+                            inputValue.replace('%', '*'));
+                        }
+                    }
+                }
+                else
+                {
+                    filter.newTh().newCData("&nbsp;");
+                }
+                if (!cols.hasNext())
+                col.addClass("lastCol");
+                // Add optional header action, e.g. for sorting
+                AbstractLink link = c.getHeaderAction();
+                if (link instanceof ActionLink)
+                {
+                    ActionLink headerAction = (ActionLink) link;
+                    if (headerAction != null)
+                    {
+                        ActionLink hAction = new ActionLink(headerAction
+                        .getLabel(), headerAction.getActionId());
+                        List<Parameter> parameters = headerAction
+                        .getParameters();
+                        if (parameters != null)
+                        {
+                            // Add already defined parameters
+                            for (Parameter param : parameters)
+                            {
+                                hAction.addParameter(param);
+                            }
+                        }
+                        col.setOnClick(action2js(hAction, formId));
+                        col.setClass("link");
+                    }
+                }
+                header.add(col);
+            }
+        }
+        // Convert rows
+        Iterator<Row> rows = table.getRows().iterator();
+        boolean noRows = true;
+        while (rows.hasNext())
+        {
+            noRows = false;
+            Row row = rows.next();
+            Tr tr = null;
+            tr = convert(row);
+            tbl.add(tr);
+            if (!rows.hasNext())
+            {
+                /*
+                    * If last row is filter row, set noRows flag to display "Empty"
+                    * message for data content.
+                */
+                if (row.getId().equals("-1"))
+                {
+                    noRows = true;
+                }
+                else
+                {
+                    tr.addClass("lastRow");
+                }
+            }
+            if (useRowAction)
+            {
+                ActionLink rowAction = row.getActionLink();
+                if (rowAction != null)
+                {
+                    tr.setOnClick(action2js(rowAction));
+                    tr.addClass("hand");
+                }
+                String jsAction = row.getJsAction();
+                if (jsAction != null)
+                tr.setOnClick(jsAction);
+            }
+            if (row.isRemoved())
+            tr.addClass("removed");
+        }
+        if (noRows)
+        {
+            tbl.newTr().addClass("lastRow").newTd().addClass("lastCol")
+            .setAttribute(new Attribute("colspan", colspan)).newCData(
+            "Empty");
+        }
+        if (scroller != null)
+        tableLayout.add(convert(scroller, currentFormId));
+        if (toolbar != null)
+        currentFormTag.add(convert(toolbar, currentFormId));
+        layout.newScript().newCData("initTable('" + table.getId() + "');");
+        if (outerForm)
+        {
+            // Clear the current form tag so that subsequent converters do not
+            // use this form
+            currentFormTag = null;
+            currentFormId = null;
+        }
+        return layout.getRoot();
+    }
+    
+    public Tag convert(org.proteios.gui.table.FolderTable table)
+    {
+        String formId = "tableForm" + table.getId();
+        Tag layout = hf.newLayoutDiv();
+        Tag form = layout.newForm().setId(formId).setMethod("POST").setAction(
+        contextPath);
+        Toolbar tb = table.getToolbar();
+        if (tb != null)
+        {
+            Input field = form.newInput().setId(formId + "action").setName(
+            "action").setType("hidden");
+            if (tb.getDefaultAction() != null)
+            field.setValue(((ActionLink) tb.getDefaultAction())
+            .getActionId());
+        }
+        Tag tblDiv = form.newDiv().setClass("table");
+        tblDiv.add(hf.newBar().addClass("title").add(
+        new CData(table.getTitle())));
+        Tag tbl = tblDiv.newTable().setId(table.getId()).setCellSpacing(0)
+        .setCellPadding(1).setAttribute(new Attribute("border", "0"));
+        Tr header = tbl.newTr().setClass("header");
+        Iterator<Column> cols = table.getHeader().iterator();
+        while (cols.hasNext())
+        {
+            Tag col = convert(cols.next());
+            header.add(col);
+            if (!cols.hasNext())
+            col.addClass("lastCol");
+        }
+        Iterator<TreeRow> rows = table.getRows().iterator();
+        while (rows.hasNext())
+        {
+            TreeRow row = rows.next();
+            Tr tr = null;
+            // Convert row
+            tr = convert(row);
+            tbl.add(tr);
+            if (!rows.hasNext())
+            tr.addClass("lastRow");
+        }
+        if (tb != null)
+        form.add(convert(tb, formId));
+        tblDiv.newScript()
+        .newCData(
+        "initTreeTable('" + table.getId() + "', " + table
+        .getFoldColumn() + ");");
+        tblDiv.newScript().newCData("initTable('" + table.getId() + "');");
+        return layout.getRoot();
+    }
+    
+    public Tr convert(Row row)
+    {
+        Tr tr = new Tr().setId(row.getId());
+        Set<String> tags = row.getTags();
+        if(tags != null && tags.contains("shared"))
+        {
+            tr.addClass("shared");      
+        }
+        Iterator<Cell<?>> cells = row.getCells().iterator();
+        while (cells.hasNext())
+        {
+            Tag td = convert(cells.next());
+            tr.add(td);
+            if (!cells.hasNext())
+            td.addClass("lastCol");
+        }
+        return tr;
+    }
+    
+    public Tr convert(TreeRow row)
+    {
+        Tr tr = new Tr().setId(row.getId()).setClass("L" + row.getLevel());
+        ActionLink rowAction = row.getActionLink();
+        if (rowAction != null)
+        tr.setOnClick(action2js(rowAction));
+        String jsAction = row.getJsAction();
+        if (jsAction != null)
+        tr.setOnClick(jsAction);
+        Iterator<Cell<?>> cells = row.getCells().iterator();
+        boolean first = true;
+        while (cells.hasNext())
+        {
+            Cell<?> cell = cells.next();
+            Tag td = convert(cell);
+            if (first)
+            {
+                td.addClass(row.getIcon());
+                first = false;
+            }
+            tr.add(td);
+            if (!cells.hasNext())
+            td.addClass("lastCol");
+        }
+        return tr;
+    }
+    
+    public Tag convert(Separator sep)
+    {
+        return new Hr();
+    }
+    
+    public <D extends Object> Tag convert(Cell<D> cell)
+    {
+        D value = cell.getValue();
+        if (value instanceof Checkbox)
+        {
+            Tag content = convert((Checkbox) value, false);
+            return new Td().add(content);
+        }
+        else if (value instanceof TextField)
+        {
+            TextField f = (TextField) value;
+            Input in = new Input().setName(f.getId()).setSize(10);
+            Object fvalue = f.getValue();
+            if (fvalue instanceof String)
+            {
+                in.setValue((String) fvalue);
+            }
+            else
+            {
+                in.setValue(fvalue.toString());
+            }
+            return new Td().add(in);
+        }
+        String strValue = "";
+        if (value instanceof Date)
+        {
+            // if hh:mm:ss is 00:00:00 then only display the date
+            strValue = formatter.format(cell.getValue());
+            strValue = strValue.replace(" 00:00:00", "");
+        }
+        else if (value instanceof Boolean)
+        {
+            strValue = ((Boolean) value) ? "yes" : "no";
+        }
+        else if (value != null)
+        {
+            strValue = String.valueOf(value);
+        }
+        // Fixes empty td tags displaying border
+        strValue = strValue + "&nbsp;";
+        Td td = new Td().add(new CData(strValue));
+        if (cell.isWrap())
+        td.addClass("nowrap");
+        // Action for this cell
+        AbstractLink cellAction = cell.getActionLink();
+        if (cellAction instanceof ActionLink)
+        {
+            if (cellAction != null)
+            {
+                td.setOnClick(action2js((ActionLink) cellAction));
+                td.setClass("link");
+            }
+            String jsAction = cell.getJsAction();
+            if (jsAction != null)
+            {
+                td.setOnClick(jsAction);
+                td.setClass("link");
+            }
+        }
+        else if (cellAction instanceof CrossLink)
+        {
+            CrossLink link = (CrossLink) cellAction;
+            ActionLink action = (ActionLink) link.getAction();
+            GUIElement gui = link.getGui();
+            if (gui instanceof org.proteios.gui.table.Table)
+            {
+                org.proteios.gui.table.Table table = (org.proteios.gui.table.Table) gui;
+                String formId = "formOf" + table.getId();
+                td.setOnClick(action2js(action, formId));
+                td.setClass("link");
+            }
+        }
+        return td;
+    }
+    
+    public Tag convert(Column col)
+    {
+        Th th = new Th();
+        if (col.isBigText())
+        th.setAttribute(new Attribute("width", "100%"));
+        th.add(new CData(locale.get(col.getValue()) + "&nbsp;"));
+        return th;
+    }
+    
+    public Tag convert(Column col, org.proteios.gui.table.Table table)
+    {
+        Th th = new Th();
+        if (col.isBigText())
+        {
+            th.setAttribute(new Attribute("width", "100%"));
+        }
+        if (col.isAsCheckBox())
+        {
+            Img icon = new Img();
+            icon.setSrc(imagePath + "/checkall.gif");
+            th.add(icon);
+            th.setOnClick("checkAllRowsInTable('formOf" + table.getId() + "')");
+        }
+        else
+        {
+            th.add(new CData(locale.get(col.getValue()) + "&nbsp;"));
+        }
+        return th;
+    }
+    
+    public Tag convert(Text txt)
+    {
+        Tag layout = hf.newTextArea();
+        Tag cdata = new CData(txt.getContent());
+        layout.add(cdata);
+        return layout;
+    }
+    
+    public Tag convert(TitledWindow win)
+    {
+        Tag window = new Div().setClass("titledWindow");
+        Tag title = new Div().addClass("title");
+        if (!win.isStatic())
+        {
+            window.addClass("popup");
+            window.newScript().newCData(
+            "Drag.init(getElement('" + getLastId() + "'));");
+            String id = getLastId();
+            title.newImg().setSrc(imagePath + (String) iconSet.get("Close"))
+            .setClass("close").setOnClick("closePopup('" + id + "')");
+        }
+        if (win.getTitle() != null)
+        {
+            title.add(new CData(
+            locale.get(win.getTitle().getTitle()) + "&nbsp;"));
+            String subtitle = win.getTitle().getSubtitle();
+            if (subtitle != null)
+            {
+                title.newCData(" - ");
+                title.newSpan().setClass("subtitle").newCData(subtitle);
+            }
+        }
+        window.add(title.getRoot());
+        GUIElement<?> contentG = win.getContent();
+        if (contentG != null)
+        {
+            // This is really not well designed but is necessary if the contentG
+            // is a table as the table converter puts the table inside any
+            // existing currentFormTag
+            Tag tmp = currentFormTag;
+            currentFormTag = window;
+            Tag content = contentG.convert(this);
+            currentFormTag.add(content.getRoot());
+            currentFormTag = tmp;
+        }
+        Toolbar tb = win.getToolbar();
+        if (tb != null)
+        window.add(convert(tb));
+        return window.getRoot();
+    }
+    
+    @SuppressWarnings("unused")
+    public Tag convert(Space space)
+    {
+        return new Div().setClass("space");
+    }
+    
+    public Tag convert(Message msg)
+    {
+        Tag layout = hf.newLayoutDiv().newDiv().setId("message");
+        layout.newCData(msg.getMessage());
+        return layout.getRoot();
+    }
+    
+    int idCounter = 0;
+    String lastId = "";
+    
+    public String nextId()
+    {
+        idCounter++;
+        lastId = "id" + idCounter;
+        return lastId;
+    }
+    
+    public String getLastId()
+    {
+        return lastId;
+    }
+    
+    public Tag convert(org.proteios.gui.Error err)
+    {
+        Tag layout = hf.newLayoutDiv().newDiv().setId("error");
+        layout.newCData(err.getError());
+        return layout.getRoot();
+    }
+    
+    public Tag convert(org.proteios.gui.form.Form w)
+    {
+        Tag layout;
+        boolean clearForm;
+        Toolbar tb;
+        Form form;
+        Input field;
+        AbstractLink defaultAction;
+        
+        layout = hf.newLayoutDiv();
+        clearForm = false;
+        if (currentFormTag == null)
+        {
+            clearForm = true;
+            currentFormTag = layout.newDiv().setClass("form").newForm().setId(
+            w.getId()).setMethod("POST").setAction(contextPath);
+            currentFormId = w.getId();
+            currentFormTag.add(new Input().setType("submit").setStyle(
+            "display: none"));
+        }
+        tb = w.getToolbar();
+        // This might cause a failure if the currentFormTag is not a Form
+        form = (Form) currentFormTag;
+        if (tb != null)
+        {
+            field = form.newInput().setId(w.getId() + "action").setName(
+            "action").setType("hidden");
+            if (tb.getDefaultAction() != null)
+            {
+                defaultAction = tb.getDefaultAction();
+                if (defaultAction instanceof ActionLink)
+                field.setValue(((ActionLink) defaultAction).getActionId());
+            }
+        }
+        List<org.proteios.gui.form.Fieldset> fieldsets = w.getFieldsets();
+        if (fieldsets != null)
+        {
+            for (org.proteios.gui.form.Fieldset fs : fieldsets)
+            {
+                Tag fieldset = convertFieldset(fs, form);
+                form.add(fieldset);
+            }
+        }
+        // Toolbar
+        if (tb != null)
+        layout.getRoot().add(convert(tb));
+        if (clearForm)
+        {
+            currentFormTag = null;
+            currentFormId = null;
+        }
+        return layout.getRoot();
+    }
+    
+    public Tag convert(org.proteios.gui.form.Fieldset fs)
+    {
+        return convertFieldset(fs, null);
+    }
+    
+    private int fieldsetId = 0;
+    private int nextFieldsetId() { fieldsetId++; return fieldsetId; }
 
-import javax.servlet.http.HttpServletRequest;
+    private Tag convertFieldset(org.proteios.gui.form.Fieldset fs, Form form)
+    {
+        Fieldset fieldset;
+        Tag legend, title, fields, table, row, helpC, input, btn;       
+        String subtitle;
+        org.proteios.gui.form.Field field;
+        String id = "fs" + nextFieldsetId();
+      String btnId = "btn" + id;
+        fieldset = new Fieldset();
+        // Fieldset legend
+        legend = fieldset.newDiv().setClass("legend");
+        title = new Div().addClass("title");
+      legend.setOnClick("toggleFieldset('" + id + "')");    
+    btn = new Div();
+        btn.addClass("toggle");
+    btn.setId(btnId);
+    legend.add(btn);
+    btn.newCData( fs.isOpen() ? "-" : "+");
 
-/**
- * Converts org.proteios.gui.* GUIElements to Tag objects
- * 
- * @see HtmlFactory LayoutFactory
- * @author gregory
- */
-public class GUIConverter
-    extends AbstractGUIConverter<Tag>
-{
-  private final String contextPath;
-  private HtmlFactory hf;
-  private HttpServletRequest request = null;
-  private final SimpleDateFormat formatter = new SimpleDateFormat(
-    "yyyy-MM-dd HH:mm:ss");
-  private String imagePath;
-  private Localizer locale = null;
-  private Properties iconSet = null;
-  /**
-   * This flag is used to tell converter methods not to generate it's own form
-   * tag. Used e.g. when converting the table configuration content so that
-   * the config fields are a part of the table form.
-   */
-  private Tag currentFormTag = null;
-  private String currentFormId = null;
-  private TypeUtil typeUtil = new TypeUtil();
-
-
-  public HttpServletRequest getRequest()
-  {
-    return request;
-  }
-
-
-  public void setRequest(HttpServletRequest request)
-  {
-    this.request = request;
-    hf.setRequest(request);
-  }
-
-
-  public GUIConverter(String contextPath)
-  {
-    super();
-    this.contextPath = contextPath + "/app";
-    this.imagePath = contextPath + "/static/img/";
-    this.hf = new HtmlFactory(contextPath);
-  }
-
-  private Random r = new Random();
-
-
-  public Tag convert(Image img)
-  {
-    ActionLink viewAction;
-    String imgId, imgSrc, loadingImgSrc;
-    Tag div, script;
-    Img imgT;
-    Boolean useFrame;
-    // static source is used unless ViewAction is set
-    imgId = "img" + r.nextInt(10);
-    imgSrc = imagePath + img.getStaticSrc();
-    viewAction = img.getViewAction();
-    if (viewAction != null)
-    {
-      imgSrc = contextPath + "?action=" + img.getViewAction().toString();
-    }
-    loadingImgSrc = imagePath + "loading.gif";
-    useFrame = img.getFramed();
-    div = hf.newLayoutDiv();
-    if (useFrame)
-    {
-      div.addClass("imageContainer");
-      // If bot height and width are set use those
-      if (img.getHeight() > 0 && img.getWidth() > 0)
-        div
-          .setStyle("height : " + img.getHeight() + "px; width : " + img
-            .getWidth() + "px");
-    }
-    imgT = div.newImg().setId(imgId).setClass("image");
-    // First we show the loading img
-    imgT.setSrc(loadingImgSrc);
-    //
-    if (img.getImageMap() != null && img.getImageMap().getImageMapAreaList() != null)
-    {
-      String imageMapStr = "ImageMap" + imgId;
-      imgT.setUsemap("#" + imageMapStr);
-      // Create image map
-      Map map = new Map();
-      map.setParent(div);
-      div.add(map);
-      map.setName(imageMapStr);
-      List<ImageMapArea> imageMapAreaList = img.getImageMap().getImageMapAreaList();
-      for (int i = 0; i < imageMapAreaList.size(); i++)
-      {
-        // Get image map area data from image object
-        ImageMapArea imageMapArea = (ImageMapArea) imageMapAreaList .get(i);
-        int xTopLeft = imageMapArea.getXTopLeft();
-        int yTopLeft = imageMapArea.getYTopLeft();
-        int xBottomRight = imageMapArea.getXBottomRight();
-        int yBottomRight = imageMapArea.getYBottomRight();
-        String hrefStr = imageMapArea.getHrefStr();
-        String toolTipStr = imageMapArea.getToolTipStr();
-        String onMouseoverStr = null;
-        String onMouseoutStr = null;
-        if (toolTipStr != null && !toolTipStr.equals(""))
-        {
-          onMouseoverStr = new String("showtip(this,event,'" + toolTipStr + "')");
-          onMouseoutStr = new String("hidetip()");
-        }
-        // Create new image map area
-        Area area = new Area();
-        area.setParent(map);
-        map.add(area);
-        area.setShape("RECT");
-        area.setCoords(xTopLeft, yTopLeft, xBottomRight, yBottomRight);
-        if (hrefStr != null && !hrefStr.equals(""))
-        {
-          area.setHref(hrefStr);
-        }
-        if (onMouseoverStr != null && !onMouseoverStr.equals(""))
-        {
-          area.setOnMousover(onMouseoverStr);
-        }
-        if (onMouseoutStr != null && !onMouseoutStr.equals(""))
-        {
-          area.setOnMousout(onMouseoutStr);
-        }
-      }
-    }
-    script = div.newScript();
-    script.newCData("var " + imgId + " = new Image();");
-    script.newCData(imgId + ".src = \"" + imgSrc + "\";");
-    script.newCData("getElement('" + imgId + "').src = " + imgId + ".src;");
-    return div;
-  }
-
-
-  public Tag convert(IFrame obj)
-  {
-    Tag tag = hf.newIFrame(obj);
-    String src = contextPath + "?action=" + obj.getSrc().toString();
-    tag.setAttribute(new Attribute("src", src));
-    String id = this.nextId();
-    tag.setId(id);
-    tag
-      .setAttribute(new Attribute("onload", "resize_iframe('" + id + "')"));
-    return tag;
-  }
-
-
-  public Tag convert(Listing list)
-  {
-    Div layout = hf.newLayoutDiv();
-    Div listing = layout.newDiv().setClass("listing");
-    String title = list.getTitle();
-    if (title != null)
-    {
-      listing.add(hf.newBar().addClass("title").add(
-        new CData(locale.get(title) + "&nbsp;")));
-    }
-    List<ListItem> items = list.getItems();
-    if (items.size() > 0)
-    {
-      Tag dl = new Dl();
-      for (ListItem item : items)
-      {
-        Tag dt = dl.newDt();
-        Tag dd = dl.newDd();
-        if (item.getDate() != null)
-        {
-          String date = formatter.format(item.getDate());
-          dt.newCData(date + " - ");
-        }
-        dt.newCData(item.getTitle());
-        dd.newCData(item.getContent());
-      }
-      listing.add(dl);
-    }
-    else
-    {
-      listing.newDiv().setClass("empty").newCData("Empty");
-    }
-    return layout;
-  }
-
-
-  /**
-   * @param action
-   * @return goToLocation('action.toString()')
-   */
-  private String action2js(ActionLink action)
-  {
-    StringBuilder sb = new StringBuilder();
-    if (action != null)
-    {
-      String jsMethod = "rightGo";
-      sb.append(jsMethod + "('");
-      sb.append(action.toString());
-      sb.append("')");
-    }
-    return sb.toString();
-  }
-
-
-  public Tag convert(org.proteios.gui.TreeMenu menu)
-  {
-    Tag layout = new Div().setId("menuh-container").newDiv().setId("menuh");
-    for (Node node : menu.getRoot().getChildNodes())
-    {
-      Tag top = new Ul();
-      top.add(convert(node));
-      layout.add(top);
-    }
-    return layout.getRoot();
-  }
-
-
-  public Tag convert(org.proteios.gui.MainMenu menu)
-  {
-    Tag div, ul;
-
-    div = hf.newLayoutDiv();
-    ul = convert((org.proteios.gui.TreeMenu) menu);
-
-    div.add(ul);
-    return div;
-  }
-
-
-  public String convert(ClosePopup button)
-  {
-    return "closeAllVisiblePopups()";
-  }
-
-
-  public Tag<?> convert(ActionLink pageLink, String formId, boolean localize)
-  {
-    String js = action2js(pageLink, formId);
-    A tag = new A();
-    tag.setHref(js);
-    // Add the icon if any
-    String icon = (String) iconSet.get(pageLink.getLabel());
-    if (icon != null)
-    {
-      tag.newImg().setSrc(imagePath + icon);
-    }
-    String label = localize ? locale.get(pageLink.getLabel()) : pageLink
-      .getLabel();
-    tag.newCData(label);
-    return tag;
-  }
-
-
-  /**
-   * Converts an ActionLink such that each parameter of the ActionLink is a
-   * call to the javascript method addField(formId, name, value) before adding
-   * submitFormAs(formId, actionId)
-   * 
-   * @param pageLink
-   * @param formId
-   * @return string of javascript code used in eg. href of a tags
-   */
-  private String action2js(ActionLink pageLink, String formId)
-  {
-    StringBuilder js = new StringBuilder();
-    js.append("javascript:");
-    List<Parameter> params = pageLink.getParameters();
-    if (params != null)
-    {
-      for (Parameter param : params)
-      {
-        js.append("addField(");
-        js.append("'");
-        js.append(formId);
-        js.append("','");
-        js.append(param.name);
-        js.append("','");
-        js.append(param.value);
-        js.append("');");
-      }
-    }
-    js.append("submitFormAs('");
-    js.append(formId);
-    js.append("','");
-    js.append(pageLink.getActionId());
-    js.append("');");
-    return js.toString();
-  }
-
-
-  public Tag convert(Scroller scroller, String formId)
-  {
-    Tag scrollBar = hf.newBar().addClass("scroller");
-    // page links
-    List<ActionLink> pageLinks = scroller.getPageLinks();
-    for (int i = 0; i < pageLinks.size(); i++)
-    {
-      ActionLink pageLink = pageLinks.get(i);
-      if (pageLink != null)
-      {
-        if (!pageLink.isSelected() && !pageLink.isDisabled())
-        {
-          // Link to back or forward page
-          boolean localize = true;
-          if (i > 1 && i < 7)
-          {
-            // Do not localize page numbers
-            localize = false;
-          }
-          scrollBar.add(convert(pageLink, formId, false));
-        }
-        else
-        {
-          if (pageLink.isDisabled())
-          {
-            // Current page, text label only
-            scrollBar.newSpan().setClass("disabled").newCData(
-              pageLink.getLabel() + "&nbsp;");
-          }
-          else
-          {
-            scrollBar.newSpan().setClass("selected").newCData(
-              pageLink.getLabel() + "&nbsp;");
-          }
-        }
-      }
-    }
-    // Total number of items
-    int total = scroller.getTotalCount();
-    scrollBar.newBr();
-    int from = scroller.getFrom();
-    int to = from + scroller.getMax();
-    if (to > total)
-      to = total;
-    from++; // As we start from 0
-    scrollBar.newCData("Showing " + from + "-" + to + " of " + total);
-    // Add rows/page field if table is controlled by ConfigureTableFactory2
-    ActionLink configureTableAction = scroller.getTable()
-      .getConfigureTableAction();
-    if (configureTableAction != null && configureTableAction.getActionId()
-      .equals("org.proteios.action.ConfigureTableFactory2"))
-    {
-      // Add number of rows per page field
-      scrollBar.newCData("&nbsp;&nbsp;&nbsp;Rows/page ");
-      scrollBar.newTh().newInput().setSize(3).setName(
-        Scroller.VMAXRESULT.getName()).setValue(
-        Integer.toString(scroller.getMax()));
-    }
-    // TODO gregory add Localizer to GUIConverter
-    scrollBar.add(new CData("&nbsp;"));
-    return scrollBar.getRoot();
-  }
-
-
-  /**
-   * @param table to convert
-   * @return root tag
-   */
-  public Tag convert(org.proteios.gui.table.Table table)
-  {
-    // <DIV class="layout"...
-    Tag layout = hf.newLayoutDiv();
-    // <FORM ...
-    Scroller scroller = null;
-    Toolbar toolbar = null;
-    String formId = null;
-    boolean outerForm = false;
-    if (currentFormTag == null)
-    {
-      outerForm = true;
-      formId = "formOf" + table.getId();
-      currentFormId = formId;
-      currentFormTag = layout.newForm().setId(formId).setMethod("POST")
-        .setAction(contextPath);
-      // Add hidden submit button
-      currentFormTag.newInput().setType("submit").setClass("hidden");
-      // Add hidden action field and set the default action
-      toolbar = table.getToolbar();
-      if (toolbar != null)
-      {
-        Input field = currentFormTag.newInput()
-          .setId(formId + "action").setName("action").setType(
-            "hidden");
-        if (toolbar.getDefaultAction() != null)
-        {
-          AbstractLink defaultLink = toolbar.getDefaultAction();
-          if (defaultLink != null && ActionLink.class
-            .isAssignableFrom(defaultLink.getClass()))
-          {
-            field
-              .setValue(((ActionLink) defaultLink).getActionId());
-          }
-        }
-
-      }
-      scroller = table.getScroller();
-      List<TextField<?>> hiddenFields = table.getHiddenFields();
-      if (hiddenFields != null && hiddenFields.size() > 0)
-      {
-        for (TextField<?> f : hiddenFields)
-        {
-          currentFormTag.add(convert(f));
-        }
-      }
-    }
-    else
-    {
-      formId = currentFormId;
-      toolbar = table.getToolbar();
-    }
-    // <DIV class="table" ...
-    Tag tableLayout = currentFormTag.newDiv().setClass("table");
-    // Table title
-    String title = table.getTitle();
-    String subtitle = table.getSubtitle();
-    Tag titleBar = hf.newBar();
-    ActionLink configureTableAction = table.getConfigureTableAction();
-    // Table configuration popup
-    if (title != null)
-    {
-      if (configureTableAction != null && configureTableAction
-        .getActionId().equals(
-          "org.proteios.action.ConfigureTableFactory2"))
-      {
-        // Add the icon only if there is a GUI to display
-        Img configIcon = new Img().setSrc(imagePath + "/columns.gif")
-          .setClass("tableConfigIcon");
-        String id = nextId();
-    A options = new A();
-    options.setStyle("float:right; font-size: 0.9em; text-decoration: none");
-    options.newCData("Table Options");
-    options.setHref("javascript:popup('" + id + "')");
-        configIcon.setOnClick("popup('" + id + "')");
-        // Insert the popup div inside the form tag
-        Div popupLayout = currentFormTag.newDiv().setClass(
-          "popupLayout").setId(id);
-        TitledWindow tw = new TitledWindow("TableOptions");
-        tw.setStatic(false);
-        Tag popContent = convert(tw);
-        popupLayout.add(popContent);
-        // Header
-        Tag tbl = popContent.newDiv().setClass("table").newDiv()
-          .setClass("tableContent").newTable().setCellPadding(1)
-          .setCellSpacing(0);
-        Tag trh = tbl.newTr();
-        trh.newTh().newCData(locale.get("Show"));
-        trh.newTh().newCData(locale.get("ColumnDisplayOrder"));
-        trh.newTh().newCData(locale.get("OrderBy"));
-        trh.newTh().newCData(locale.get("ColumnSortPriority"));
-        trh.newTh().newCData(locale.get("Column"));
-        // Toolbar
-        titleBar.add(configIcon);
-        titleBar.add(options);
-        // Table configuration updated flag set to "true"
-        Input tableConfigurationUpdatedField = trh.newInput().
-          setName("tableConfigurationUpdated").setType("hidden");
-        tableConfigurationUpdatedField.setValue("true");
-        // Get number of potential sort columns
-        int nSortColumns = 0;
-        for (Column col : table.getHeader())
-        {
-          AttributeDefinition ad = col.getAttributeDefinition();
-          if (ad != null)
-          {
-            if (col.getDisplayFilter())
-            {
-              nSortColumns++;
-            }
-          }
-        }
-        // Add column selection here
-    boolean firstColumnIsIdColumn = false; // Used below to indicate if 'Id' is part of the header
-      int nColumns = table.getHeader().size();
-        for (Column col : table.getHeader())
-        {
-          AttributeDefinition ad = col.getAttributeDefinition();
-          if (ad != null)
-          {
-            Tr tr = tbl.newTr();
-            // Show
-            Input inputTag = tr.newTd().newInput().setType(
-              "checkbox").setName("show" + ad.getKey());
-            if (col.isVisible())
-              inputTag.setAttribute(new Attribute("checked",
-                "checked"));
-            // Column display order select box
-            Integer colDisplayOrder = col.getDisplayOrder();
-
-      if (ad.getKey().equals("Id"))
-            {
-              // Disable display order select box for "Id" column
-              tr.newTd().newCData("" + colDisplayOrder + "&nbsp;");
-       firstColumnIsIdColumn = true;
-            }
-            else
-            {
-              // Add display order select box for other columns
-       Tag displayOrderSelectBox = new Select().setName("displayOrder" + ad.getKey());
-       for (int i=0; i < nColumns; i++)
-             {
-                int displayOrderValue = i + 1;
-                // If first column is "Id" column, reserve this position
-                if (!firstColumnIsIdColumn || displayOrderValue > 1)
-                {
-                  String displayOrderValueStr = "" + displayOrderValue;
-                  Option displayOrderOption = displayOrderSelectBox.newOption().setValue(displayOrderValueStr);
-                  displayOrderOption.newCData(displayOrderValueStr);
-                  if (colDisplayOrder != null && colDisplayOrder == displayOrderValue)
-                  {
-                    displayOrderOption.select();
-                  }
-                }
-             }
-              tr.newTd().add(displayOrderSelectBox);
-            }
-            
-            
-            // Order by
-            if (col.getDisplayFilter())
-            {
-              Tag s = new Select().setName("orderBy" + ad
-                .getKey());
-              Option def = s.newOption().setValue("");
-              def.newCData("&nbsp;");
-              Option asc = s.newOption().setValue("asc");
-              asc.newCData("asc");
-              Option desc = s.newOption().setValue("desc");
-              desc.newCData("desc");
-              if (col.getOrder() == null)
-              {
-                def.select();
-              }
-              else if (col.getOrder().equals(SortOrder.ASC))
-              {
-                asc.select();
-              }
-              else if (col.getOrder().equals(SortOrder.DESC))
-              {
-                desc.select();
-              }
-              tr.newTd().add(s);
-            }
-            else
-            {
-              tr.newTd().newCData("&nbsp;");
-            }
-            // Column sort priority
-            if (col.getDisplayFilter())
-            {
-              // Sort priority select box
-              Tag s = new Select().setName("sortPriority" + ad
-                .getKey());
-              Option def = s.newOption().setValue("");
-              def.newCData("&nbsp;");
-              Integer colSortPriority = col.getSortPriority();
-              if (colSortPriority == null)
-              {
-                def.select();
-              }
-              for (int i=0; i < nSortColumns; i++)
-              {
-                int sortPriorityValue = i + 1;
-                String sortPriorityValueStr = "" + sortPriorityValue;
-                Option sortPriorityOption = s.newOption().setValue(sortPriorityValueStr);
-                sortPriorityOption.newCData(sortPriorityValueStr);
-                if (colSortPriority != null && colSortPriority == sortPriorityValue)
-                {
-                  sortPriorityOption.select();
-                }
-              }
-              tr.newTd().add(s);
-            }
-            else
-            {
-              tr.newTd().newCData("&nbsp;");
-            }
-            // Column name
-            tr.newTd().setAttribute(new Attribute("width", "100%"))
-              .newCData(locale.get(col.getValue()));
-          }
-        }
-        Tag popToolbar = popContent.newDiv().setClass("toolbar");
-        Tag ul = popToolbar.newUl();
-        ul
-          .newLi()
-          .setOnClick(
-            "submitFormAs('" + formId + "','org.proteios.action.ConfigureTableFactory2')")
-          .newCData(locale.get("Apply"));
-      }
-    }
-    // End table configuration
-    if (title != null)
-    {
-      tableLayout.add(titleBar.addClass("title").add(
-        new CData(locale.get(title) + "&nbsp;")));
-      if (subtitle != null)
-      {
-        titleBar.newCData(" - ");
-        titleBar.newSpan().setClass("subtitle").newCData(subtitle);
-      }
-    }
-    // <DIV>
-    Tag tableContent = tableLayout.newDiv().setClass("tableContent");
-    // <TABLE ...
-    Tag tbl = new Table().setId(table.getId()).setCellSpacing(0)
-      .setCellPadding(1).setAttribute(new Attribute("border", "0"))
-      .setAttribute(new Attribute("width", "100%"));
-    tableContent.add(tbl);
-    Tr header = tbl.newTr().setClass("header");
-    Tr filter = tbl.newTr().setClass("filter").addClass("header");
-    Iterator<Column> cols = table.getHeader().iterator();
-    int colspan = 0;
-    boolean useRowAction = true;
-    Attribute selected = new Attribute("selected", "selected");
-    while (cols.hasNext())
-    {
-      colspan++;
-      Column c = cols.next();
-      if (c.isVisible())
-      {
-        if (c.getAction() != null)
-          useRowAction = false;
-        Tag col = convert(c, table);
-        String operator = "";
-        String value = "";
-        Filter f = c.getFilter();
-        if (c.getDisplayFilter())
-        {
-          if (f != null)
-          {
-            operator = f.getOperator().getSymbol();
-            value = f.getValue().toString();
-          }
-          AttributeDefinition ad = c.getAttributeDefinition();
-          if (ad != null)
-          {
-            Class<?> valueType = ad.getAttributeType();
-            String name = "where" + ad.getKey();
-            String inputValue = operator + value;
-            if (operator.equals(Operator.LIKE.getSymbol()))
-              inputValue = Operator.EQ.getSymbol() + value;
-            if (typeUtil.isBoolean(valueType))
-            {
-              Tag select = filter.newTh().newSelect().setName(
-                name);
-              select.newOption().newCData("");
-              Tag yesOption = select.newOption()
-                .setValue("=true");
-              Tag noOption = select.newOption()
-                .setValue("=false");
-              if (inputValue.equals("=true"))
-                yesOption.setAttribute(selected);
-              else if (inputValue.equals("=false"))
-                noOption.setAttribute(selected);
-              yesOption.newCData("yes");
-              noOption.newCData("no");
-            }
-            else if (valueType.isEnum())
-            {
-              Tag select = filter.newTh().newSelect().setName(
-                name);
-              select.newOption().newCData("");
-              for (Object o : valueType.getEnumConstants())
-              {
-                try
-                {
-                  Method valueGetter = o.getClass()
-                    .getMethod("getValue");
-                  String enumValue = valueGetter.invoke(o
-                    ).toString();
-                  String label = o.toString();
-                  Tag option = select.newOption().setValue(
-                    enumValue);
-                  option.newCData(label);
-                  if (value.equals(enumValue))
-                  {
-                    option.setAttribute(selected);
-                  }
-                }
-                catch (SecurityException e)
-                {
-                  e.printStackTrace();
-                }
-                catch (NoSuchMethodException e)
-                {
-                  e.printStackTrace();
-                }
-                catch (IllegalArgumentException e)
-                {
-                  e.printStackTrace();
-                }
-                catch (IllegalAccessException e)
-                {
-                  e.printStackTrace();
-                }
-                catch (InvocationTargetException e)
-                {
-                  e.printStackTrace();
-                }
-              }
-            }
-            else
-            {
-              filter.newTh().newInput().setClass("filter")
-                .setSize(7).setName(name).setValue(
-                  inputValue.replace('%', '*'));
-            }
-          }
-        }
-        else
-        {
-          filter.newTh().newCData("&nbsp;");
-        }
-        if (!cols.hasNext())
-          col.addClass("lastCol");
-        // Add optional header action, e.g. for sorting
-        AbstractLink link = c.getHeaderAction();
-        if (link instanceof ActionLink)
-        {
-          ActionLink headerAction = (ActionLink) link;
-          if (headerAction != null)
-          {
-            ActionLink hAction = new ActionLink(headerAction
-              .getLabel(), headerAction.getActionId());
-            List<Parameter> parameters = headerAction
-              .getParameters();
-            if (parameters != null)
-            {
-              // Add already defined parameters
-              for (Parameter param : parameters)
-              {
-                hAction.addParameter(param);
-              }
-            }
-            col.setOnClick(action2js(hAction, formId));
-            col.setClass("link");
-          }
-        }
-        header.add(col);
-      }
-    }
-    // Convert rows
-    Iterator<Row> rows = table.getRows().iterator();
-    boolean noRows = true;
-    while (rows.hasNext())
-    {
-      noRows = false;
-      Row row = rows.next();
-      Tr tr = null;
-      tr = convert(row);
-      tbl.add(tr);
-      if (!rows.hasNext())
-      {
-        /*
-         * If last row is filter row, set noRows flag to display "Empty"
-         * message for data content.
-         */
-        if (row.getId().equals("-1"))
-        {
-          noRows = true;
-        }
-        else
-        {
-          tr.addClass("lastRow");
-        }
-      }
-      if (useRowAction)
-      {
-        ActionLink rowAction = row.getActionLink();
-        if (rowAction != null)
-        {
-          tr.setOnClick(action2js(rowAction));
-          tr.addClass("hand");
-        }
-        String jsAction = row.getJsAction();
-        if (jsAction != null)
-          tr.setOnClick(jsAction);
-      }
-      if (row.isRemoved())
-        tr.addClass("removed");
-    }
-    if (noRows)
-    {
-      tbl.newTr().addClass("lastRow").newTd().addClass("lastCol")
-        .setAttribute(new Attribute("colspan", colspan)).newCData(
-          "Empty");
-    }
-    if (scroller != null)
-      tableLayout.add(convert(scroller, currentFormId));
-    if (toolbar != null)
-      currentFormTag.add(convert(toolbar, currentFormId));
-    layout.newScript().newCData("initTable('" + table.getId() + "');");
-    if (outerForm)
-    {
-      // Clear the current form tag so that subsequent converters do not
-      // use this form
-      currentFormTag = null;
-      currentFormId = null;
-    }
-    return layout.getRoot();
-  }
-
-
-  public Tag convert(org.proteios.gui.table.FolderTable table)
-  {
-    String formId = "tableForm" + table.getId();
-    Tag layout = hf.newLayoutDiv();
-    Tag form = layout.newForm().setId(formId).setMethod("POST").setAction(
-      contextPath);
-    Toolbar tb = table.getToolbar();
-    if (tb != null)
-    {
-      Input field = form.newInput().setId(formId + "action").setName(
-        "action").setType("hidden");
-      if (tb.getDefaultAction() != null)
-        field.setValue(((ActionLink) tb.getDefaultAction())
-          .getActionId());
-    }
-    Tag tblDiv = form.newDiv().setClass("table");
-    tblDiv.add(hf.newBar().addClass("title").add(
-      new CData(table.getTitle())));
-    Tag tbl = tblDiv.newTable().setId(table.getId()).setCellSpacing(0)
-      .setCellPadding(1).setAttribute(new Attribute("border", "0"));
-    Tr header = tbl.newTr().setClass("header");
-    Iterator<Column> cols = table.getHeader().iterator();
-    while (cols.hasNext())
-    {
-      Tag col = convert(cols.next());
-      header.add(col);
-      if (!cols.hasNext())
-        col.addClass("lastCol");
-    }
-    Iterator<TreeRow> rows = table.getRows().iterator();
-    while (rows.hasNext())
-    {
-      TreeRow row = rows.next();
-      Tr tr = null;
-      // Convert row
-      tr = convert(row);
-      tbl.add(tr);
-      if (!rows.hasNext())
-        tr.addClass("lastRow");
-    }
-    if (tb != null)
-      form.add(convert(tb, formId));
-    tblDiv.newScript()
-      .newCData(
-        "initTreeTable('" + table.getId() + "', " + table
-          .getFoldColumn() + ");");
-    tblDiv.newScript().newCData("initTable('" + table.getId() + "');");
-    return layout.getRoot();
-  }
-
-
-  public Tr convert(Row row)
-  {
-    Tr tr = new Tr().setId(row.getId());
-    Set<String> tags = row.getTags();
-    if(tags != null && tags.contains("shared"))
-    {
-      tr.addClass("shared");      
-    }
-    Iterator<Cell<?>> cells = row.getCells().iterator();
-    while (cells.hasNext())
-    {
-      Tag td = convert(cells.next());
-      tr.add(td);
-      if (!cells.hasNext())
-        td.addClass("lastCol");
-    }
-    return tr;
-  }
-
-
-  public Tr convert(TreeRow row)
-  {
-    Tr tr = new Tr().setId(row.getId()).setClass("L" + row.getLevel());
-    ActionLink rowAction = row.getActionLink();
-    if (rowAction != null)
-      tr.setOnClick(action2js(rowAction));
-    String jsAction = row.getJsAction();
-    if (jsAction != null)
-      tr.setOnClick(jsAction);
-    Iterator<Cell<?>> cells = row.getCells().iterator();
-    boolean first = true;
-    while (cells.hasNext())
-    {
-      Cell<?> cell = cells.next();
-      Tag td = convert(cell);
-      if (first)
-      {
-        td.addClass(row.getIcon());
-        first = false;
-      }
-      tr.add(td);
-      if (!cells.hasNext())
-        td.addClass("lastCol");
-    }
-    return tr;
-  }
-
-
-  public Tag convert(Separator sep)
-  {
-    return new Hr();
-  }
-
-
-  public <D extends Object> Tag convert(Cell<D> cell)
-  {
-    D value = cell.getValue();
-    if (value instanceof Checkbox)
-    {
-      Tag content = convert((Checkbox) value, false);
-      return new Td().add(content);
-    }
-    else if (value instanceof TextField)
-    {
-      TextField f = (TextField) value;
-      Input in = new Input().setName(f.getId()).setSize(10);
-      Object fvalue = f.getValue();
-      if (fvalue instanceof String)
-      {
-        in.setValue((String) fvalue);
-      }
-      else
-      {
-        in.setValue(fvalue.toString());
-      }
-      return new Td().add(in);
-    }
-    String strValue = "";
-    if (value instanceof Date)
-    {
-      // if hh:mm:ss is 00:00:00 then only display the date
-      strValue = formatter.format(cell.getValue());
-      strValue = strValue.replace(" 00:00:00", "");
-    }
-    else if (value instanceof Boolean)
-    {
-      strValue = ((Boolean) value) ? "yes" : "no";
-    }
-    else if (value != null)
-    {
-      strValue = String.valueOf(value);
-    }
-    // Fixes empty td tags displaying border
-    strValue = strValue + "&nbsp;";
-    Td td = new Td().add(new CData(strValue));
-    if (cell.isWrap())
-      td.addClass("nowrap");
-    // Action for this cell
-    AbstractLink cellAction = cell.getActionLink();
-    if (cellAction instanceof ActionLink)
-    {
-      if (cellAction != null)
-      {
-        td.setOnClick(action2js((ActionLink) cellAction));
-        td.setClass("link");
-      }
-      String jsAction = cell.getJsAction();
-      if (jsAction != null)
-      {
-        td.setOnClick(jsAction);
-        td.setClass("link");
-      }
-    }
-    else if (cellAction instanceof CrossLink)
-    {
-      CrossLink link = (CrossLink) cellAction;
-      ActionLink action = (ActionLink) link.getAction();
-      GUIElement gui = link.getGui();
-      if (gui instanceof org.proteios.gui.table.Table)
-      {
-        org.proteios.gui.table.Table table = (org.proteios.gui.table.Table) gui;
-        String formId = "formOf" + table.getId();
-        td.setOnClick(action2js(action, formId));
-        td.setClass("link");
-      }
-    }
-    return td;
-  }
-
-
-  public Tag convert(Column col)
-  {
-    Th th = new Th();
-    if (col.isBigText())
-      th.setAttribute(new Attribute("width", "100%"));
-    th.add(new CData(locale.get(col.getValue()) + "&nbsp;"));
-    return th;
-  }
-
-
-  public Tag convert(Column col, org.proteios.gui.table.Table table)
-  {
-    Th th = new Th();
-    if (col.isBigText())
-    {
-      th.setAttribute(new Attribute("width", "100%"));
-    }
-    if (col.isAsCheckBox())
-    {
-      Img icon = new Img();
-      icon.setSrc(imagePath + "/checkall.gif");
-      th.add(icon);
-      th.setOnClick("checkAllRowsInTable('formOf" + table.getId() + "')");
-    }
-    else
-    {
-      th.add(new CData(locale.get(col.getValue()) + "&nbsp;"));
-    }
-    return th;
-  }
-
-
-  public Tag convert(Text txt)
-  {
-    Tag layout = hf.newTextArea();
-    Tag cdata = new CData(txt.getContent());
-    layout.add(cdata);
-    return layout;
-  }
-
-
-  public Tag convert(TitledWindow win)
-  {
-    Tag window = new Div().setClass("titledWindow");
-    Tag title = new Div().addClass("title");
-    if (!win.isStatic())
-    {
-      window.addClass("popup");
-      window.newScript().newCData(
-        "Drag.init(getElement('" + getLastId() + "'));");
-      String id = getLastId();
-      title.newImg().setSrc(imagePath + (String) iconSet.get("Close"))
-        .setClass("close").setOnClick("closePopup('" + id + "')");
-    }
-    if (win.getTitle() != null)
-    {
-      title.add(new CData(
-        locale.get(win.getTitle().getTitle()) + "&nbsp;"));
-      String subtitle = win.getTitle().getSubtitle();
-      if (subtitle != null)
-      {
-        title.newCData(" - ");
-        title.newSpan().setClass("subtitle").newCData(subtitle);
-      }
-    }
-    window.add(title.getRoot());
-    GUIElement<?> contentG = win.getContent();
-    if (contentG != null)
-    {
-      // This is really not well designed but is necessary if the contentG
-      // is a table as the table converter puts the table inside any
-      // existing currentFormTag
-      Tag tmp = currentFormTag;
-      currentFormTag = window;
-      Tag content = contentG.convert(this);
-      currentFormTag.add(content.getRoot());
-      currentFormTag = tmp;
-    }
-    Toolbar tb = win.getToolbar();
-    if (tb != null)
-      window.add(convert(tb));
-    return window.getRoot();
-  }
-
-
-  @SuppressWarnings("unused")
-  public Tag convert(Space space)
-  {
-    return new Div().setClass("space");
-  }
-
-
-  public Tag convert(Message msg)
-  {
-    Tag layout = hf.newLayoutDiv().newDiv().setId("message");
-    layout.newCData(msg.getMessage());
-    return layout.getRoot();
-  }
-
-  int idCounter = 0;
-  String lastId = "";
-
-
-  public String nextId()
-  {
-    idCounter++;
-    lastId = "id" + idCounter;
-    return lastId;
-  }
-
-
-  public String getLastId()
-  {
-    return lastId;
-  }
-
-
-  public Tag convert(org.proteios.gui.Error err)
-  {
-    Tag layout = hf.newLayoutDiv().newDiv().setId("error");
-    layout.newCData(err.getError());
-    return layout.getRoot();
-  }
-
-
-  public Tag convert(org.proteios.gui.form.Form w)
-  {
-  Tag layout;
-  boolean clearForm;
-  Toolbar tb;
-  Form form;
-  Input field;
-  AbstractLink defaultAction;
-
-    layout = hf.newLayoutDiv();
-    clearForm = false;
-    if (currentFormTag == null)
-    {
-      clearForm = true;
-      currentFormTag = layout.newDiv().setClass("form").newForm().setId(
-        w.getId()).setMethod("POST").setAction(contextPath);
-      currentFormId = w.getId();
-      currentFormTag.add(new Input().setType("submit").setStyle(
-        "display: none"));
-    }
-    tb = w.getToolbar();
-    // This might cause a failure if the currentFormTag is not a Form
-    form = (Form) currentFormTag;
-    if (tb != null)
-    {
-      field = form.newInput().setId(w.getId() + "action").setName(
-        "action").setType("hidden");
-      if (tb.getDefaultAction() != null)
-      {
-        defaultAction = tb.getDefaultAction();
-        if (defaultAction instanceof ActionLink)
-          field.setValue(((ActionLink) defaultAction).getActionId());
-      }
-    }
-    List<org.proteios.gui.form.Fieldset> fieldsets = w.getFieldsets();
-    if (fieldsets != null)
-    {
-      for (org.proteios.gui.form.Fieldset fs : fieldsets)
-      {
-        Tag fieldset = convertFieldset(fs, form);
-        form.add(fieldset);
-      }
-    }
-    // Toolbar
-    if (tb != null)
-      layout.getRoot().add(convert(tb));
-    if (clearForm)
-    {
-      currentFormTag = null;
-      currentFormId = null;
-    }
-    return layout.getRoot();
-  }
-
-
-  public Tag convert(org.proteios.gui.form.Fieldset fs)
-  {
-    return convertFieldset(fs, null);
-  }
-
-
-  private Tag convertFieldset(org.proteios.gui.form.Fieldset fs, Form form)
-  {
-    Fieldset fieldset;
-  Tag legend, title, fields, table, row, helpC, input;
-  String subtitle;
-  org.proteios.gui.form.Field field;
-
-  fieldset = new Fieldset();
-    // Fieldset legend
-    legend = fieldset.newDiv().setClass("legend");
-    title = new Div().addClass("title");
-    if (fs.getTitle()!= null)
-    {
-      title.add(new CData(
-        locale.get(fs.getTitle().getTitle()) + "&nbsp;"));
-      subtitle = fs.getTitle().getSubtitle();
-      if (subtitle != null)
-      {
-        title.newCData(" - ");
-        title.newSpan().setClass("subtitle").newCData(subtitle);
-      }
-    }
-    legend.add(title.getRoot());
-
-    fields = fieldset.newDiv().setClass("fields");
-  table = fields.newTable();
-    for (org.proteios.gui.GUIElement f : fs.getFields())
-    {
-   row = table.newTr();
-   // Label cell
-   if(f instanceof org.proteios.gui.form.Field)
-   {
-    field = (org.proteios.gui.form.Field) f;
-    row.newTd().addClass("label").newCData(locale.get(field.getLabel()));
-    input = null;
-    // Field cell
-      if (f instanceof TextField)
-      {
-     input = convert((TextField<?>) f);
-     if(((TextField<?>)field).isHidden())
-     {
-      row.addClass("hidden");
-     }
-      } 
-    else if (f instanceof PasswordField)
-      {
-        input = convert((PasswordField) f);
-      }
-      else if (f instanceof FileField)
-      {
-        if (form != null)
-      {
-          form.setMultipart();
-     }
-        input = convert((FileField) f);
-      }
-      else if (f instanceof TextArea)
-      {
-        input = convert((TextArea) f);
-      }
-      else if (f instanceof org.proteios.gui.form.Select)
-      {
-        input = convert((org.proteios.gui.form.Select) f);
-      }
-      else if (f instanceof org.proteios.gui.form.Checkbox)
-      {
-        input = convert((org.proteios.gui.form.Checkbox) f, false);
-      }
-    
-      if (field.getParam().isRequired() || 
-        (field.getParam() instanceof VString && ((VString) field.getParam()).getMinCharacterLength() > 0))
-      {
-      input.addClass("required");
-    }
-    if(input != null)
-    {
-     row.newTd().add(input);
-    }
-
-    // Help and error field
-    helpC = row.newTd();
-    helpC.newDiv().addClass("error").add(hf.getFieldError(field));
-    helpC.newDiv().addClass("help").newCData(field.getHelp());
-   }
-      if (f instanceof org.proteios.gui.table.Table)
-      {
-        row.newTd().add(convert((org.proteios.gui.table.Table) f));
-      }
-   
-    }
-    return fieldset;
-  }
-
-
-  private Tag convert(FileField f)
-  {
-    Input in = new Input().setId(f.getId()).setName(f.getId()).setType(
-      "file");
-    if (f.getValue() != null)
-      in.setValue(f.getValue().toString());
-    if (f.isDisabled())
-      in.disable();
-    return in;
-  }
-
-
-
-  public Tag convert(org.proteios.gui.form.Select<?> select)
-  {
-    Tag field = new CData("");
-    Select selectTag = field.newSelect().setId(select.getId()).setName(
-      select.getName());
-    // Use multiple selection box if isMultiple() == true
-    if (select.isMultiple() != null && select.isMultiple())
-    {
-      selectTag.setAttribute(new Attribute("multiple", ""));
-    }
-    // Set number of visible items if getSize() != null
-    if (select.getSize() != null)
-    {
-      selectTag.setAttribute(new Attribute("size", select.getSize()
-        .toString()));
-    }
-    if (select.isDisabled())
-    {
-      selectTag.setAttribute(new Attribute("disabled", "disabled"));
-      selectTag.addClass("disable");
-      Input hiddenF = field.newInput().setId(select.getId()).setName(
-        select.getName()).setType("hidden");
-      List<org.proteios.gui.form.Option> options = select.getOptions();
-      for (org.proteios.gui.form.Option o : options)
-      {
-        if (o.isSelected())
-        {
-          hiddenF.setValue(o.getValue());
-          break;
-        }
-      }
-    }
-    selectTag.setOnChange("setNameField(this)");
-    String indentString = "";
-    int indent = 0;
-    for (Iterator iter = select.getOptions().iterator(); iter.hasNext();)
-    {
-      org.proteios.gui.form.Option option = (org.proteios.gui.form.Option) iter
-        .next();
-      if (option.getIndent() > indent)
-      {
-        indentString = indentString.concat("&nbsp;");
-        indent++;
-      }
-      else if (option.getIndent() < indent)
-      {
-        indent--;
-        indentString.substring(0, indent);
-      }
-      Option optionTag = selectTag.newOption()
-        .setValue(option.getValue());
-      optionTag.newCData(indentString + option.getContent());
-      if (option.isSelected())
-        optionTag.select();
-    }
-    return field;
-  }
-
-
-  public Tag convert(ColumnContainer container)
-  {
-    Tag layout = hf.newLayoutDiv();
-    Tag tbl = layout.newTable()
-      .setAttribute(new Attribute("width", "100%")).setClass("grid")
-      .setCellPadding(0).setCellSpacing(0);
-    Tr tr = tbl.newTr();
-    Iterator<GUIElement<?>> iter = container.getElements().iterator();
-    int width = 100 / container.size();
-    while (iter.hasNext())
-    {
-      GUIElement<?> e = iter.next();
-      if (e != null)
-      {
-        Td td = tr.newTd().setAttribute(
-          new Attribute("width", width + "%")).add(e.convert(this));
-        if (!iter.hasNext()) 
-    {
-          td.addClass("last");
-    }
-      }
-    }
-    return layout;
-  }
-
- public Tag convert(org.proteios.gui.Empty empty)
- {
-   return new Span().newCData("&nbsp;");
- }
-
-  public Tag convert(RowContainer container)
-  {
-    Tag span = new Span();
-    Iterator<GUIElement<?>> iter = container.getElements().iterator();
-    boolean first = true;
-    while (iter.hasNext())
-    {
-      GUIElement<?> e = iter.next();
-      if (e != null)
-      {
-        Tag layout = hf.newLayoutDiv();
-        if (first)
-        {
-          layout.addClass("first");
-          first = false;
-        }
-        layout.add(e.convert(this));
-        span.add(layout);
-      }
-    }
-    return span;
-  }
-
-  private int treeLevel = 0;
-
-
-  public Tag convert(Node node)
-  {
-    Tag li = new Li();
-    ActionLink a = node.getActionLink();
-    Tag href = li.newA().setHref("javascript:var nothing=0;");
-    if (treeLevel == 0)
-      href.setClass("top_parent");
-    // Get node label with or without localization
-    String label = node.getLabel();
-    if (node.isLocalizationUsed())
-    {
-      label = locale.get(node.getLabel());
-    }
-    if (a != null)
-    {
-      // To enable selenium ide testing all clickable items should
-      // have an id
-      String nodeId = node.getId();
-      href.setId(nodeId);
-      // Add optional icon image
-      String icon = fetchSelectionIconPath(a.isSelected());
-      if (icon != null)
-      {
-        Img img = href.newImg();
-        img.setSrc(imagePath + icon);
-        img.setStyle("border: none;");
-        // Set size for "blankbutton.gif" 1x16 pixels spacer image
-        if (icon.equals("icons/blankbutton.gif"))
-        {
-          // Set spacer size to 10x14 pixels
-          img.setAttribute(new Attribute("width", "10"));
-          img.setAttribute(new Attribute("height", "14"));
-        }
-      }
-      if (a.isDisabled())
-      {
-        href.addClass("disabled");
-        if (label.equals(""))
-        {
-          href.newCData("<hr/>");
-          href.addClass("separator");
-        }
-      }
-      else
-      {
-        href.setOnClick("rightGo('" + a.toString() + "')");
-      }
-    }
-    href.newCData(label);
-    if (node.getChildNodes() != null)
-    {
-      if (treeLevel >= 1)
-        href.addClass("parent");
-      Ul next = li.newUl();
-      treeLevel++;
-      Iterator<Node> children = node.getChildNodes().iterator();
-      boolean first = true;
-      while (children.hasNext())
-      {
-        Node child = children.next();
-        Tag childLi = convert(child);
-        Tag childHref = (Tag) childLi.getElements().get(0);
-        if (first)
-        {
-          childHref.addClass("first");
-        }
-        if (!children.hasNext())
-        {
-          childHref.addClass("last");
-        }
-
-        if (first)
-          first = false;
-        next.add(childLi);
-      }
-      treeLevel--;
-    }
-    return li;
-  }
-
-
-  /**
-   * Convenience method for getting path to a bullet/spacer image file marking
-   * selected or unselected menu items. If the input selection flag is null,
-   * null is also returned, indicating that no icon should be used.
-   * 
-   * @param selected Boolean A flag indicating if the menu item is selected
-   *        (null = no icon).
-   * @return String A path string to a bullet/spacer image file.
-   */
-  private String fetchSelectionIconPath(Boolean selected)
-  {
-    String iconPath = null;
-    if (selected != null)
-    {
-      if (selected)
-      {
-        // If item is selected, start with a bullet
-        iconPath = "icons/checkedmenu.gif";
-      }
-      else
-      {
-        // Reserve blank space equal to bullet size for non-selected
-        // items
-        iconPath = "icons/blankbutton.gif";
-      }
-    }
-    return iconPath;
-  }
-
-
-  /**
-   * Converts a toolbar so that button clicks post the form referenced by
-   * parameter formId
-   * 
-   * @param toolbar
-   * @param formId
-   */
-  private Tag convert(Toolbar toolbar, String formId)
-  {
-    if (toolbar != null)
-    {
-      Div layout = new Div().setClass("toolbar");
-      Ul ul = layout.newUl();
-      for (AbstractLink link : toolbar.list())
-      {
-        Tag li = ul.newLi();
-        if (link.isDisabled())
-        {
-          li.addClass("disabled");
-          li.newCData(locale.get(link.getLabel()));
-        }
-        else
-        {
-          Tag a = null;
-          if (link instanceof ActionLink)
-          {
-            a = convert((ActionLink) link, formId, true);
-            li.add(a);
-          }
-          else if (link instanceof PopupLink)
-          {
-            PopupLink pop = (PopupLink) link;
-            /*
-             * This id works only if the labels do not have any
-             * spaces, they should not have spaces as they are keys
-             * for localization. If there is a better way to
-             * generate the id please fix it. But remember that the
-             * id must be the same always so test procedures can
-             * identify the link.
-             */
-            String id = nextId();
-            String icon = (String) iconSet.get(link.getLabel());
-            if (icon != null)
-            {
-              li.newImg().setSrc(imagePath + icon);
-            }
-                li.setOnClick("popup('" + id + "')").newCData(
-              locale.get(pop.getLabel()));
-            if (currentFormTag != null)
-            {
-              Tag tmp = currentFormTag;
-              Div content = currentFormTag.newDiv().setId(id)
-                .setClass("popupLayout");
-              GUIElement<?> popContent = pop.getContent();
-              currentFormTag = content;
-              if (popContent != null)
-              {
-                content.add(popContent.convert(this));
-              }
-              currentFormTag = tmp;
-            }
-          }
-        }
-      }
-      return layout.getRoot();
-    }
-    return new CData("");
-  }
-
-
-  public Tag convert(org.proteios.gui.TabSet set)
-  {
-    Tag layout = hf.newLayoutDiv();
-    Tag div = layout.newDiv().setClass("tabs");
-    Tag ul = div.newUl().setClass("tabList");
-    List<Tab> tabs = set.getTabs();
-    Tab selectedTab = null;
-    for (org.proteios.gui.Tab tab : tabs)
-    {
-      ul.add(convert(tab, false));
-      if (tab.isSelected())
-        selectedTab = tab;
-    }
-    for (org.proteios.gui.Tab tab : tabs)
-    {
-      layout.add(convert(tab, true));
-    }
-    if (selectedTab == null)
-    {
-      selectedTab = tabs.get(0);
-      selectedTab.setSelected(true);
-    }
-    layout
-      .newCData("<script>showTab('" + selectedTab.getId() + "');</script>");
-    return layout;
-  }
-
-
-  private Tag convert(org.proteios.gui.Tab tab, boolean convertTabContent)
-  {
-    String contentId = "contentOf" + tab.getId();
-    if (convertTabContent)
-    {
-      Div content = new Div().setClass("tabContent").setId(contentId);
-      GUIElement<?> tabContent = tab.getGuiElement();
-      if (tabContent != null)
-        content.add(tabContent.convert(this));
-      return content;
-    }
-    Li li = new Li().setClass("tab").setId(tab.getId()).setOnClick(
-      "showTab('" + tab.getId() + "')");
-    if (tab.isSelected())
-      li.addClass("here");
-    li.newCData(locale.get(tab.getLabel()));
-    return li;
-  }
-
-
-  private Tag convert(org.proteios.gui.form.TextArea f)
-  {
-    String value = f.getValue();
-    Tag in = null;
-    // Use input
-    in = new Textarea().setName(f.getId()).setId(f.getId()).setCols(25);
-    if (value != null)
-      in.newCData(value);
-    else
-      in.newCData("");
-    if (f.isDisabled())
-    {
-      in.addClass("disabled");
-    }
-    return in;
-  }
-
-
- private String formatedValue(TextField<?> f)
- {
-  String value;
-  value = null;
-    if (f != null && f.getValue() != null)
-    {
-      if (f.getValue() instanceof Date)
-        value = formatter.format(f.getValue());
-      else
-        value = f.getValue().toString();
-    }
-  return value;
- }
-
-
-  private <D extends Object> Tag<?> convert(
-      org.proteios.gui.form.TextField<D> f)
-  {
-  String value, type;
-  Tag table, row, labelC, inC, helpC, container;
-  Input in;
-  Tag<?> field;
-
-    // Format the value
-    value = formatedValue(f);
-  container = new CData("");
-
-    in = null;
-    type = "text";
-    if (f.isHidden() || f.isDisabled())
-    {
-      type = "hidden";
-    }
-    in = new Input().setName(f.getId()).setType(type).setSize(25);
-  in.setSize(f.getCharWidth());
-    if (value == null)
-  {
-   value = "";
-  }
-    if (f.getParam().isRequired() || 
-   (f.getParam() instanceof VString && ((VString) f.getParam()).getMinCharacterLength() > 0))
-  {
-    in.addClass("required");
-  }
-    in.setValue(value);
-    in.setId(f.getId());
-  container.add(in);
-    if (f.isDisabled())
-    {
-   container.newCData(value);
-  }
-    return container;
-  }
-
-
-  private Tag<?> convert(org.proteios.gui.form.PasswordField f)
-  {
-    Input in = new Input().setId(f.getId()).setName(f.getId()).setType(
-      "password").setSize(f.getCharWidth());
-    if (f.getValue() != null)
-  {
-      in.setValue(f.getValue().toString());
-  }
-    return in;
-  }
-
-
-  public Tag<?> convert(org.proteios.gui.form.Checkbox<?> checkbox)
-  {
-    return convert(checkbox, false);
-  }
-
-
-  private Tag<?> convert(org.proteios.gui.form.Checkbox<?> checkbox,
-      boolean inForm)
-  {
-    Input cbF = new Input().setId(checkbox.getId()).setName(
-      checkbox.getId()).setType("checkbox");
-    if (checkbox.getValue() != null)
-      cbF.setValue(checkbox.getValue().toString());
-    if (checkbox.isChecked())
-      cbF.check();
-    if (checkbox.isDisabled())
-      cbF.disable();
-    if (inForm)
-    {
-      Tag<?> field = hf.newField(checkbox);
-      field.add(cbF);
-      field.add(hf.getFieldError(checkbox));
-      return field;
-    }
-    return cbF;
-  }
-
-
-  public Tag<?> convert(org.proteios.gui.Toolbar toolbar)
-  {
-    Div layout = new Div().setClass("toolbar");
-    Ul ul = layout.newUl();
-    for (AbstractLink actionLink : toolbar.list())
-    {
-      Li li = ul.newLi();
-      String icon = (String) iconSet.get(actionLink.getLabel());
-      if (icon != null)
-      {
-        li.newImg().setSrc(imagePath + icon);
-      }
-      if (actionLink.isDisabled())
-      {
-        li.addClass("disabled");
-      }
-      else
-      {
-        if (actionLink instanceof ClosePopup)
-        {
-          li.setOnClick(convert((ClosePopup) actionLink));
-        }
-        else if (actionLink instanceof PopupLink)
-        {
-          PopupLink pop = (PopupLink) actionLink;
-          /*
-           * This id works only if the labels do not have any spaces,
-           * they should not have spaces as they are keys for
-           * localization. If there is a better way to generate the id
-           * please fix it. But remember that the id must be the same
-           * always so test procedures can identify the link.
-           */
-          String id = nextId();
-          li.setOnClick("popup('" + id + "')");
-          if (currentFormTag != null)
-          {
-            Tag tmp = currentFormTag;
-            Div content = currentFormTag.newDiv().setId(id)
-              .setClass("popupLayout");
-            GUIElement<?> popContent = pop.getContent();
-            currentFormTag = content;
-            if (popContent != null)
-            {
-              content.add(popContent.convert(this));
-            }
-            currentFormTag = tmp;
-          }
-        }
-        else if (actionLink instanceof ActionLink)
-        {
-          if (currentFormId != null)
-          {
-            li.setOnClick(action2js((ActionLink) actionLink,
-              currentFormId));
-          }
-          else
-          {
-            li.setOnClick(action2js((ActionLink) actionLink));
-          }
-        }
-      }
-      li.newCData(locale.get(actionLink.getLabel()));
-    }
-    return layout.getRoot();
-  }
-
-
-  public Tag<?> convert(org.proteios.gui.Button button)
-  {
-    Div layout = new Div().setClass("button");
-  Span li = layout.newSpan();
-  AbstractLink actionLink = button.getLink();
-      String icon = (String) iconSet.get(actionLink.getLabel());
-      if (icon != null)
-      {
-        li.newImg().setSrc(imagePath + icon);
-      }
-   else
-   {
-    li.addClass("noicon");
-   }
-      if (actionLink.isDisabled())
-      {
-        li.addClass("disabled");
-      }
-      else
-      {
-        if (actionLink instanceof ClosePopup)
-        {
-          li.setOnClick(convert((ClosePopup) actionLink));
-        }
-        else if (actionLink instanceof PopupLink)
-        {
-          PopupLink pop = (PopupLink) actionLink;
-          /*
-           * This id works only if the labels do not have any spaces,
-           * they should not have spaces as they are keys for
-           * localization. If there is a better way to generate the id
-           * please fix it. But remember that the id must be the same
-           * always so test procedures can identify the link.
-           */
-          String id = nextId();
-          li.setOnClick("popup('" + id + "')");
-          if (currentFormTag != null)
-          {
-            Tag tmp = currentFormTag;
-            Div content = currentFormTag.newDiv().setId(id)
-              .setClass("popupLayout");
-            GUIElement<?> popContent = pop.getContent();
-            currentFormTag = content;
-            if (popContent != null)
-            {
-              content.add(popContent.convert(this));
-            }
-            currentFormTag = tmp;
-          }
-        }
-        else if (actionLink instanceof ActionLink)
-        {
-          if (currentFormId != null)
-          {
-            li.setOnClick(action2js((ActionLink) actionLink,
-              currentFormId));
-          }
-          else
-          {
-            li.setOnClick(action2js((ActionLink) actionLink));
-          }
-        }
-      }
-      li.newCData(locale.get(actionLink.getLabel()));
-    return layout.getRoot();
-  }
-
-
-  public Tag<?> convert(org.proteios.gui.ButtonSet toolbar)
-  {
-    Div layout = hf.newLayoutDiv();
-    layout.ins(convert((org.proteios.gui.Toolbar) toolbar));
-    return layout;
-  }
-
-
-  public Tag<?> convert(org.proteios.gui.Title title)
-  {
-    Tag<?> hx;
-    switch (title.getSize())
-    {
-      default:
-        hx = new H1();
-        break;
-    }
-    String titleLoc = locale.get(title.getTitle());
-    hx.newCData(titleLoc);
-    String subtitle = title.getSubtitle();
-    if (subtitle != null)
-    {
-      hx.newCData(" - ");
-      hx.newSpan().setClass("subtitle").newCData(subtitle);
-    }
-    return hx.getRoot();
-  }
-
-
-  @Override
-  public Tag missingConverter(ConvertableElement obj)
-  {
-    Div div = new Div().add(new CData(
-      "Missing convert() method for class " + obj.getClass()
-        .getSimpleName() + " in " + this.getClass().getSimpleName()));
-    div.newBr();
-    return div;
-  }
-
-
-  public void setLocale(Localizer locale)
-  {
-    if (this.locale == null)
-    {
-      this.locale = locale;
-      // Propagate the locale down to the HtmlFactory
-      hf.setLocalizer(locale);
-    }
-  }
-
-
-  public void setIconSet(Properties iconSet)
-  {
-    if (this.iconSet == null)
-      this.iconSet = iconSet;
-  }
+        if (fs.getTitle()!= null)
+        {
+            title.add(new CData(
+            locale.get(fs.getTitle().getTitle()) + "&nbsp;"));
+            subtitle = fs.getTitle().getSubtitle();
+            if (subtitle != null)
+            {
+                title.newCData(" - ");
+                title.newSpan().setClass("subtitle").newCData(subtitle);
+            }
+        }
+        legend.add(title.getRoot());
+        
+        fields = fieldset.newDiv().setClass("fields");
+    fields.setId(id);
+    fields.setStyle("display: " + (fs.isOpen() ? "block" : "none"));
+        table = fields.newTable();
+        for (org.proteios.gui.GUIElement f : fs.getFields())
+        {
+            row = table.newTr();
+            // Label cell
+            if(f instanceof org.proteios.gui.form.Field)
+            {
+                field = (org.proteios.gui.form.Field) f;
+                row.newTd().addClass("label").newCData(locale.get(field.getLabel()));
+                input = null;
+                // Field cell
+                if (f instanceof TextField)
+                {
+                    input = convert((TextField<?>) f);
+                    if(((TextField<?>)field).isHidden())
+                    {
+                        row.addClass("hidden");
+                    }
+                }
+                else if (f instanceof PasswordField)
+                {
+                    input = convert((PasswordField) f);
+                }
+                else if (f instanceof FileField)
+                {
+                    if (form != null)
+                    {
+                        form.setMultipart();
+                    }
+                    input = convert((FileField) f);
+                }
+                else if (f instanceof TextArea)
+                {
+                    input = convert((TextArea) f);
+                }
+                else if (f instanceof org.proteios.gui.form.Select)
+                {
+                    input = convert((org.proteios.gui.form.Select) f);
+                }
+                else if (f instanceof org.proteios.gui.form.Checkbox)
+                {
+                    input = convert((org.proteios.gui.form.Checkbox) f, false);
+                }
+                    
+                if (field.getParam().isRequired() || 
+                (field.getParam() instanceof VString && ((VString) field.getParam()).getMinCharacterLength() > 0))
+                {
+                    input.addClass("required");
+                }
+                if(input != null)
+                {
+                    row.newTd().add(input);
+                }
+                
+                // Help and error field
+                helpC = row.newTd();
+                helpC.newDiv().addClass("error").add(hf.getFieldError(field));
+                helpC.newDiv().addClass("help").newCData(field.getHelp());
+            }
+            if (f instanceof org.proteios.gui.table.Table)
+            {
+                row.newTd().add(convert((org.proteios.gui.table.Table) f));
+            }
+               
+        }
+        return fieldset;
+    }
+    
+    private Tag convert(FileField f)
+    {
+        Input in = new Input().setId(f.getId()).setName(f.getId()).setType(
+        "file");
+        if (f.getValue() != null)
+        in.setValue(f.getValue().toString());
+        if (f.isDisabled())
+        in.disable();
+        return in;
+    }
+    
+    public Tag convert(org.proteios.gui.form.Select<?> select)
+    {
+        Tag field = new CData("");
+        Select selectTag = field.newSelect().setId(select.getId()).setName(
+        select.getName());
+        // Use multiple selection box if isMultiple() == true
+        if (select.isMultiple() != null && select.isMultiple())
+        {
+            selectTag.setAttribute(new Attribute("multiple", ""));
+        }
+        // Set number of visible items if getSize() != null
+        if (select.getSize() != null)
+        {
+            selectTag.setAttribute(new Attribute("size", select.getSize()
+            .toString()));
+        }
+        if (select.isDisabled())
+        {
+            selectTag.setAttribute(new Attribute("disabled", "disabled"));
+            selectTag.addClass("disable");
+            Input hiddenF = field.newInput().setId(select.getId()).setName(
+            select.getName()).setType("hidden");
+            List<org.proteios.gui.form.Option> options = select.getOptions();
+            for (org.proteios.gui.form.Option o : options)
+            {
+                if (o.isSelected())
+                {
+                    hiddenF.setValue(o.getValue());
+                    break;
+                }
+            }
+        }
+        selectTag.setOnChange("setNameField(this)");
+        String indentString = "";
+        int indent = 0;
+        for (Iterator iter = select.getOptions().iterator(); iter.hasNext();)
+        {
+            org.proteios.gui.form.Option option = (org.proteios.gui.form.Option) iter
+            .next();
+            if (option.getIndent() > indent)
+            {
+                indentString = indentString.concat("&nbsp;");
+                indent++;
+            }
+            else if (option.getIndent() < indent)
+            {
+                indent--;
+                indentString.substring(0, indent);
+            }
+            Option optionTag = selectTag.newOption()
+            .setValue(option.getValue());
+            optionTag.newCData(indentString + option.getContent());
+            if (option.isSelected())
+            optionTag.select();
+        }
+        return field;
+    }
+    
+    public Tag convert(ColumnContainer container)
+    {
+        Tag layout = hf.newLayoutDiv();
+        Tag tbl = layout.newTable()
+        .setAttribute(new Attribute("width", "100%")).setClass("grid")
+        .setCellPadding(0).setCellSpacing(0);
+        Tr tr = tbl.newTr();
+        Iterator<GUIElement<?>> iter = container.getElements().iterator();
+        int width = 100 / container.size();
+        while (iter.hasNext())
+        {
+            GUIElement<?> e = iter.next();
+            if (e != null)
+            {
+                Td td = tr.newTd().setAttribute(
+                new Attribute("width", width + "%")).add(e.convert(this));
+                if (!iter.hasNext()) 
+                {
+                    td.addClass("last");
+                }
+            }
+        }
+        return layout;
+    }
+    
+    public Tag convert(org.proteios.gui.Empty empty)
+    {
+        return new Span().newCData("&nbsp;");
+    }
+    
+    public Tag convert(RowContainer container)
+    {
+        Tag span = new Span();
+        Iterator<GUIElement<?>> iter = container.getElements().iterator();
+        boolean first = true;
+        while (iter.hasNext())
+        {
+            GUIElement<?> e = iter.next();
+            if (e != null)
+            {
+                Tag layout = hf.newLayoutDiv();
+                if (first)
+                {
+                    layout.addClass("first");
+                    first = false;
+                }
+                layout.add(e.convert(this));
+                span.add(layout);
+            }
+        }
+        return span;
+    }
+    
+    private int treeLevel = 0;
+    
+    public Tag convert(Node node)
+    {
+        Tag li = new Li();
+        ActionLink a = node.getActionLink();
+        Tag href = li.newA().setHref("javascript:var nothing=0;");
+        if (treeLevel == 0)
+        href.setClass("top_parent");
+        // Get node label with or without localization
+        String label = node.getLabel();
+        if (node.isLocalizationUsed())
+        {
+            label = locale.get(node.getLabel());
+        }
+        if (a != null)
+        {
+            // To enable selenium ide testing all clickable items should
+            // have an id
+            String nodeId = node.getId();
+            href.setId(nodeId);
+            // Add optional icon image
+            String icon = fetchSelectionIconPath(a.isSelected());
+            if (icon != null)
+            {
+                Img img = href.newImg();
+                img.setSrc(imagePath + icon);
+                img.setStyle("border: none;");
+                // Set size for "blankbutton.gif" 1x16 pixels spacer image
+                if (icon.equals("icons/blankbutton.gif"))
+                {
+                    // Set spacer size to 10x14 pixels
+                    img.setAttribute(new Attribute("width", "10"));
+                    img.setAttribute(new Attribute("height", "14"));
+                }
+            }
+            if (a.isDisabled())
+            {
+                href.addClass("disabled");
+                if (label.equals(""))
+                {
+                    href.newCData("<hr/>");
+                    href.addClass("separator");
+                }
+            }
+            else
+            {
+                href.setOnClick("rightGo('" + a.toString() + "')");
+            }
+        }
+        href.newCData(label);
+        if (node.getChildNodes() != null)
+        {
+            if (treeLevel >= 1)
+            href.addClass("parent");
+            Ul next = li.newUl();
+            treeLevel++;
+            Iterator<Node> children = node.getChildNodes().iterator();
+            boolean first = true;
+            while (children.hasNext())
+            {
+                Node child = children.next();
+                Tag childLi = convert(child);
+                Tag childHref = (Tag) childLi.getElements().get(0);
+                if (first)
+                {
+                    childHref.addClass("first");
+                }
+                if (!children.hasNext())
+                {
+                    childHref.addClass("last");
+                }
+                
+                if (first)
+                first = false;
+                next.add(childLi);
+            }
+            treeLevel--;
+        }
+        return li;
+    }
+    
+    /**
+        * Convenience method for getting path to a bullet/spacer image file marking
+        * selected or unselected menu items. If the input selection flag is null,
+        * null is also returned, indicating that no icon should be used.
+        * 
+        * @param selected Boolean A flag indicating if the menu item is selected
+        *        (null = no icon).
+        * @return String A path string to a bullet/spacer image file.
+    */
+    private String fetchSelectionIconPath(Boolean selected)
+    {
+        String iconPath = null;
+        if (selected != null)
+        {
+            if (selected)
+            {
+                // If item is selected, start with a bullet
+                iconPath = "icons/checkedmenu.gif";
+            }
+            else
+            {
+                // Reserve blank space equal to bullet size for non-selected
+                // items
+                iconPath = "icons/blankbutton.gif";
+            }
+        }
+        return iconPath;
+    }
+    
+    /**
+        * Converts a toolbar so that button clicks post the form referenced by
+        * parameter formId
+        * 
+        * @param toolbar
+        * @param formId
+    */
+    private Tag convert(Toolbar toolbar, String formId)
+    {
+        if (toolbar != null)
+        {
+            Div layout = new Div().setClass("toolbar");
+            Ul ul = layout.newUl();
+            for (AbstractLink link : toolbar.list())
+            {
+                Tag li = ul.newLi();
+                if (link.isDisabled())
+                {
+                    li.addClass("disabled");
+                    li.newCData(locale.get(link.getLabel()));
+                }
+                else
+                {
+                    Tag a = null;
+                    if (link instanceof ActionLink)
+                    {
+                        a = convert((ActionLink) link, formId, true);
+                        li.add(a);
+                    }
+                    else if (link instanceof PopupLink)
+                    {
+                        PopupLink pop = (PopupLink) link;
+                        /*
+                            * This id works only if the labels do not have any
+                            * spaces, they should not have spaces as they are keys
+                            * for localization. If there is a better way to
+                            * generate the id please fix it. But remember that the
+                            * id must be the same always so test procedures can
+                            * identify the link.
+                        */
+                        String id = nextId();
+                        String icon = (String) iconSet.get(link.getLabel());
+                        if (icon != null)
+                        {
+                            li.newImg().setSrc(imagePath + icon);
+                        }
+                        li.setOnClick("popup('" + id + "')").newCData(
+                        locale.get(pop.getLabel()));
+                        if (currentFormTag != null)
+                        {
+                            Tag tmp = currentFormTag;
+                            Div content = currentFormTag.newDiv().setId(id)
+                            .setClass("popupLayout");
+                            GUIElement<?> popContent = pop.getContent();
+                            currentFormTag = content;
+                            if (popContent != null)
+                            {
+                                content.add(popContent.convert(this));
+                            }
+                            currentFormTag = tmp;
+                        }
+                    }
+                }
+            }
+            return layout.getRoot();
+        }
+        return new CData("");
+    }
+    
+    public Tag convert(org.proteios.gui.TabSet set)
+    {
+        Tag layout = hf.newLayoutDiv();
+        Tag div = layout.newDiv().setClass("tabs");
+        Tag ul = div.newUl().setClass("tabList");
+        List<Tab> tabs = set.getTabs();
+        Tab selectedTab = null;
+        for (org.proteios.gui.Tab tab : tabs)
+        {
+            ul.add(convert(tab, false));
+            if (tab.isSelected())
+            selectedTab = tab;
+        }
+        for (org.proteios.gui.Tab tab : tabs)
+        {
+            layout.add(convert(tab, true));
+        }
+        if (selectedTab == null)
+        {
+            selectedTab = tabs.get(0);
+            selectedTab.setSelected(true);
+        }
+        layout
+        .newCData("<script>showTab('" + selectedTab.getId() + "');</script>");
+        return layout;
+    }
+    
+    private Tag convert(org.proteios.gui.Tab tab, boolean convertTabContent)
+    {
+        String contentId = "contentOf" + tab.getId();
+        if (convertTabContent)
+        {
+            Div content = new Div().setClass("tabContent").setId(contentId);
+            GUIElement<?> tabContent = tab.getGuiElement();
+            if (tabContent != null)
+            content.add(tabContent.convert(this));
+            return content;
+        }
+        Li li = new Li().setClass("tab").setId(tab.getId()).setOnClick(
+        "showTab('" + tab.getId() + "')");
+        if (tab.isSelected())
+        li.addClass("here");
+        li.newCData(locale.get(tab.getLabel()));
+        return li;
+    }
+    
+    private Tag convert(org.proteios.gui.form.TextArea f)
+    {
+        String value = f.getValue();
+        Tag in = null;
+        // Use input
+        in = new Textarea().setName(f.getId()).setId(f.getId()).setCols(25);
+        if (value != null)
+        in.newCData(value);
+        else
+        in.newCData("");
+        if (f.isDisabled())
+        {
+            in.addClass("disabled");
+        }
+        return in;
+    }
+    
+    private String formatedValue(TextField<?> f)
+    {
+        String value;
+        value = null;
+        if (f != null && f.getValue() != null)
+        {
+            if (f.getValue() instanceof Date)
+            value = formatter.format(f.getValue());
+            else
+            value = f.getValue().toString();
+        }
+        return value;
+    }
+    
+    private <D extends Object> Tag<?> convert(
+    org.proteios.gui.form.TextField<D> f)
+    {
+        String value, type;
+        Tag table, row, labelC, inC, helpC, container;
+        Input in;
+        Tag<?> field;
+        
+        // Format the value
+        value = formatedValue(f);
+        container = new CData("");
+        
+        in = null;
+        type = "text";
+        if (f.isHidden() || f.isDisabled())
+        {
+            type = "hidden";
+        }
+        in = new Input().setName(f.getId()).setType(type).setSize(25);
+        in.setSize(f.getCharWidth());
+        if (value == null)
+        {
+            value = "";
+        }
+        if (f.getParam().isRequired() || 
+        (f.getParam() instanceof VString && ((VString) f.getParam()).getMinCharacterLength() > 0))
+        {
+            in.addClass("required");
+        }
+        in.setValue(value);
+        in.setId(f.getId());
+        container.add(in);
+        if (f.isDisabled())
+        {
+            container.newCData(value);
+        }
+        return container;
+    }
+    
+    private Tag<?> convert(org.proteios.gui.form.PasswordField f)
+    {
+        Input in = new Input().setId(f.getId()).setName(f.getId()).setType(
+        "password").setSize(f.getCharWidth());
+        if (f.getValue() != null)
+        {
+            in.setValue(f.getValue().toString());
+        }
+        return in;
+    }
+    
+    public Tag<?> convert(org.proteios.gui.form.Checkbox<?> checkbox)
+    {
+        return convert(checkbox, false);
+    }
+    
+    private Tag<?> convert(org.proteios.gui.form.Checkbox<?> checkbox,
+    boolean inForm)
+    {
+        Input cbF = new Input().setId(checkbox.getId()).setName(
+        checkbox.getId()).setType("checkbox");
+        if (checkbox.getValue() != null)
+        cbF.setValue(checkbox.getValue().toString());
+        if (checkbox.isChecked())
+        cbF.check();
+        if (checkbox.isDisabled())
+        cbF.disable();
+        if (inForm)
+        {
+            Tag<?> field = hf.newField(checkbox);
+            field.add(cbF);
+            field.add(hf.getFieldError(checkbox));
+            return field;
+        }
+        return cbF;
+    }
+    
+    public Tag<?> convert(org.proteios.gui.Toolbar toolbar)
+    {
+        Div layout = new Div().setClass("toolbar");
+        Ul ul = layout.newUl();
+        for (AbstractLink actionLink : toolbar.list())
+        {
+            Li li = ul.newLi();
+            String icon = (String) iconSet.get(actionLink.getLabel());
+            if (icon != null)
+            {
+                li.newImg().setSrc(imagePath + icon);
+            }
+            if (actionLink.isDisabled())
+            {
+                li.addClass("disabled");
+            }
+            else
+            {
+                if (actionLink instanceof ClosePopup)
+                {
+                    li.setOnClick(convert((ClosePopup) actionLink));
+                }
+                else if (actionLink instanceof PopupLink)
+                {
+                    PopupLink pop = (PopupLink) actionLink;
+                    /*
+                        * This id works only if the labels do not have any spaces,
+                        * they should not have spaces as they are keys for
+                        * localization. If there is a better way to generate the id
+                        * please fix it. But remember that the id must be the same
+                        * always so test procedures can identify the link.
+                    */
+                    String id = nextId();
+                    li.setOnClick("popup('" + id + "')");
+                    if (currentFormTag != null)
+                    {
+                        Tag tmp = currentFormTag;
+                        Div content = currentFormTag.newDiv().setId(id)
+                        .setClass("popupLayout");
+                        GUIElement<?> popContent = pop.getContent();
+                        currentFormTag = content;
+                        if (popContent != null)
+                        {
+                            content.add(popContent.convert(this));
+                        }
+                        currentFormTag = tmp;
+                    }
+                }
+                else if (actionLink instanceof ActionLink)
+                {
+                    if (currentFormId != null)
+                    {
+                        li.setOnClick(action2js((ActionLink) actionLink,
+                        currentFormId));
+                    }
+                    else
+                    {
+                        li.setOnClick(action2js((ActionLink) actionLink));
+                    }
+                }
+            }
+            li.newCData(locale.get(actionLink.getLabel()));
+        }
+        return layout.getRoot();
+    }
+    
+    public Tag<?> convert(org.proteios.gui.Button button)
+    {
+        Div layout = new Div().setClass("button");
+        Span li = layout.newSpan();
+        AbstractLink actionLink = button.getLink();
+        String icon = (String) iconSet.get(actionLink.getLabel());
+        if (icon != null)
+        {
+            li.newImg().setSrc(imagePath + icon);
+        }
+        else
+        {
+            li.addClass("noicon");
+        }
+        if (actionLink.isDisabled())
+        {
+            li.addClass("disabled");
+        }
+        else
+        {
+            if (actionLink instanceof ClosePopup)
+            {
+                li.setOnClick(convert((ClosePopup) actionLink));
+            }
+            else if (actionLink instanceof PopupLink)
+            {
+                PopupLink pop = (PopupLink) actionLink;
+                /*
+                    * This id works only if the labels do not have any spaces,
+                    * they should not have spaces as they are keys for
+                    * localization. If there is a better way to generate the id
+                    * please fix it. But remember that the id must be the same
+                    * always so test procedures can identify the link.
+                */
+                String id = nextId();
+                li.setOnClick("popup('" + id + "')");
+                if (currentFormTag != null)
+                {
+                    Tag tmp = currentFormTag;
+                    Div content = currentFormTag.newDiv().setId(id)
+                    .setClass("popupLayout");
+                    GUIElement<?> popContent = pop.getContent();
+                    currentFormTag = content;
+                    if (popContent != null)
+                    {
+                        content.add(popContent.convert(this));
+                    }
+                    currentFormTag = tmp;
+                }
+            }
+            else if (actionLink instanceof ActionLink)
+            {
+                if (currentFormId != null)
+                {
+                    li.setOnClick(action2js((ActionLink) actionLink,
+                    currentFormId));
+                }
+                else
+                {
+                    li.setOnClick(action2js((ActionLink) actionLink));
+                }
+            }
+        }
+        li.newCData(locale.get(actionLink.getLabel()));
+        return layout.getRoot();
+    }
+    
+    public Tag<?> convert(org.proteios.gui.ButtonSet toolbar)
+    {
+        Div layout = hf.newLayoutDiv();
+        layout.ins(convert((org.proteios.gui.Toolbar) toolbar));
+        return layout;
+    }
+    
+    public Tag<?> convert(org.proteios.gui.Title title)
+    {
+        Tag<?> hx;
+        switch (title.getSize())
+        {
+            default:
+            hx = new H1();
+            break;
+        }
+        String titleLoc = locale.get(title.getTitle());
+        hx.newCData(titleLoc);
+        String subtitle = title.getSubtitle();
+        if (subtitle != null)
+        {
+            hx.newCData(" - ");
+            hx.newSpan().setClass("subtitle").newCData(subtitle);
+        }
+        return hx.getRoot();
+    }
+    
+    @Override
+    public Tag missingConverter(ConvertableElement obj)
+    {
+        Div div = new Div().add(new CData(
+        "Missing convert() method for class " + obj.getClass()
+        .getSimpleName() + " in " + this.getClass().getSimpleName()));
+        div.newBr();
+        return div;
+    }
+    
+    public void setLocale(Localizer locale)
+    {
+        if (this.locale == null)
+        {
+            this.locale = locale;
+            // Propagate the locale down to the HtmlFactory
+            hf.setLocalizer(locale);
+        }
+    }
+    
+    public void setIconSet(Properties iconSet)
+    {
+        if (this.iconSet == null)
+        this.iconSet = iconSet;
+    }
 }

trunk/client/servlet/test/src/org/proteios/gui/form/NewUserFormTest.java

@@ -1 +1 @@
 package org.proteios.gui.web;
 
+import java.io.IOException;
+import java.util.Properties;
 import org.junit.Before;
 import org.junit.Test;
@@ -8 +10 @@
 import org.proteios.gui.form.*;
 import org.proteios.gui.layout.RowLayout;
-
 import se.lu.thep.waf.dom.html.Tag;
-
-import java.io.IOException;
-import java.util.Properties;
 
 public class NewUserFormTest
 {
-  HtmlOutputUtil out = null;
-  Localizer locale = null;
-  Properties iconSet = null;
-
-  @Before
-  public void setup()
-  {
-    out = new HtmlOutputUtil();
-    try
-    {
-      locale = new Localizer("en");
-      iconSet = new Properties();
-      iconSet.load(ActionFactory.class
-        .getResourceAsStream("/icons/default"));
-    }
-    catch (IOException e)
-    {
-      e.printStackTrace();
-    }
-  }
-
-
-  @Test
-  public void testWebGUI()
-  {
-    RowLayout layout;
-  Form form = new NewUserForm(null); // We skip the roles by not providing a DbControl
-  LayoutConverter lconverter;
-  Tag html;
-  layout = new RowLayout();
-    layout.add(form);
-    lconverter = new LayoutConverter(".", null);
-    lconverter.setLocalizer(locale);
-    lconverter.setIconSet(iconSet);
-    layout.setConverter(lconverter);
-    html = layout.getHtml(".", null);
-    out.printToFile(html, "TEST_NewUserForm.html"); 
-  }
+    HtmlOutputUtil out = null;
+    Localizer locale = null;
+    Properties iconSet = null;
+    
+    @Before
+    public void setup()
+    {
+        out = new HtmlOutputUtil();
+        try
+        {
+            locale = new Localizer("en");
+            iconSet = new Properties();
+            iconSet.load(ActionFactory.class
+            .getResourceAsStream("/icons/default"));
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+    }
+    
+    @Test
+    public void testWebGUI()
+    {
+        RowLayout layout;
+        NewUserForm form = new NewUserForm(null); // We skip the roles by not providing a DbControl
+        form.pwdFS.setOpen(false);
+        LayoutConverter lconverter;
+        Tag html;
+        layout = new RowLayout();
+        layout.add(form);
+        lconverter = new LayoutConverter(".", null);
+        lconverter.setLocalizer(locale);
+        lconverter.setIconSet(iconSet);
+        layout.setConverter(lconverter);
+        html = layout.getHtml(".", null);
+        out.printToFile(html, "TEST_NewUserForm.html"); 
+    }
 }

trunk/client/servlet/www/static/css/layout2.jsp

@@ -221 +221 @@
 }
 
+
 div.form form div.legend
 {
@@ -226 +227 @@
   border-style: solid;
   border-color: #fff;
+  cursor: default;
+}
+
+div.form form div.legend div.toggle
+{
+    float: left;
+    width: 10px;
+    border: 0px;
 }
 
@@ -233 +242 @@
   padding: 10px 10px;
 }
+
+
 
 div.form form fieldset div.fields table.field

trunk/client/servlet/www/static/js/script.js

@@ -5 +5 @@
 var CONTEXT = "/proteios/app?action=";
 
+function empty() { return true; }
 function rightGo(action)
 {
@@ -116 +117 @@
   {
     div.style.display = "block";
+  }
+}
+
+/* Toggles visibility of a fieldset */
+function toggleFieldset(id)
+{
+  var node = getElement(id);
+  var icon = getElement("btn" + id);
+  if(node.style.display == "block")
+  {
+    node.style.display = "none";
+    icon.innerHTML = "+";
+  }
+  else
+  {
+    node.style.display = "block";
+    icon.innerHTML = "-";
   }
 }