Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3899

Timestamp:

Oct 20, 2010, 1:10:39 PM (13 years ago)

Author:

Gregory Vincic

Message:

Fixes #712.

Location:

trunk/client/servlet/src/org/proteios/action

Files:

: 2 edited

directory/ViewActiveDirectory.java (modified) (2 diffs)
project/UploadDemoFiles.java (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/client/servlet/src/org/proteios/action/directory/ViewActiveDirectory.java

-                      r3888
+                      r3899
 /*
  $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.action.directory;
 …
 /**
  * Displays properties of a Directory and the content of that directory.
+ *
  * @author gregory
  */
+    * Displays properties of a Directory and the content of that directory.
+    *
+    * @author gregory
+*/
 public class ViewActiveDirectory
     extends ProteiosAction<ViewActiveDirectory>
+extends ProteiosAction<ViewActiveDirectory>
+{
+  /**
+   * Session identifier for an active directory
+   */
+  public static final VInteger VDIRID = new VInteger("active.dir.id", 1, true);
+  public static final VBoolean VSELECT = new VBoolean("select", true);
+  public static final VBoolean VSELECTMOVEDIR = new VBoolean(
+    "select.move.dir", false);
+  public static final VBoolean VMOVEFILESSTART = new VBoolean("moveFilesStart", false);
+  public static final VBoolean VMOVEFILES = new VBoolean("moveFiles", false);
+  public static final VBoolean VTABLEUPDATEBUTTONCLICKED = new VBoolean("tableUpdateButtonClicked", false);
+  /**
+   * Creates a layout for viewing/selecting the contents of a directory. The
+   * details of what the layout contains depends on Boolean flags transferred
+   * as valid parameters, that indicate the purpose of the directory listing.
+   * The general layout consists of a directory table and a file table. The
+   * directory table has two tabs, a 'contents' tab and a 'properties' tab.
+   * The directory 'contents' tab shows a list of sub-directories in the
+   * current directory, as well as a link to the parent directory. The file
+   * table shows a list of files in the current directory. The file table may
+   * be configured by the user via a popup window, and also has a filter row
+   * below the table header.
+   */
+  @Override
+  protected void runMe()
+      throws ActionException, InvalidParameterValue
+  {
+    log.debug("Start");
+    // Define
+    Boolean select, selectMoveDir, moveFilesStart, moveFilesMode = null;
+    String actionId;
+    DbControl dc;
+    Integer itemId, start, max;
+    ItemQuery<File> query;
+    Directory rootDir;
+    User user;
+    ItemFactory factory;
+    List<String> columnOrder;
+    Project activeP;
+    QueryFactory qf;
+    //
+    // Fetch table update button clicked flag
+    boolean tableUpdateButtonClicked = fetchTableUpdateButtonClickedFlag();
+    log.debug("tableUpdateButtonClicked = " + tableUpdateButtonClicked);
+    // Create
+    // Check if user has selected file[s] in directory table to move
+    moveFilesStart = getValidBoolean(VMOVEFILESSTART);
+    if (moveFilesStart == null)
+    {
+      moveFilesStart = false;
+      log
+        .debug("Input moveFilesStart == null, reset to moveFilesStart = " + moveFilesStart);
+    }
+    log.debug("moveFilesStart = " + moveFilesStart);
+    if (moveFilesStart)
+    {
+      // Check input
+      List<Integer> tmpFileIds = getValidIntegerList(ItemIdField.VPARAM);
+      log.debug("tmpFileIds from ItemIdField.VPARAM for input check = " + tmpFileIds);
+      if (tmpFileIds != null && tmpFileIds.size() > 0)
+      {
+        setSessionAttribute(VSELECT, true);
+        setSessionAttribute(VSELECTMOVEDIR, true);
+        setSessionAttribute(VMOVEFILES, true);
+        setSessionAttribute(ForwardField.VPARAM, MoveFiles.class.getName());
+      }
+      else
+      {
+        setError("Select at least one file to move");
+      }
+    }
+    select = getSessionAttribute(VSELECT);
+    actionId = getSessionAttribute(ForwardField.VPARAM);
+    selectMoveDir = getSessionAttribute(VSELECTMOVEDIR);
+    moveFilesMode = getSessionAttribute(VMOVEFILES);
+    qf = getQueryFactory();
+    dc = newDbControl();
+    activeP = getActiveProject(dc);
+    // Use
+    if (selectMoveDir == null)
+    {
+      selectMoveDir = false;
+      log
+        .debug("Input selectMoveDir == null, reset to selectMoveDir = " + selectMoveDir);
+    }
+    if (moveFilesMode == null)
+    {
+      moveFilesMode = false;
+      log
+        .debug("Input moveFilesMode == null, reset to moveFilesMode = " + moveFilesMode);
+    }
+    log.debug("select = " + select + " selectMoveDir = " + selectMoveDir + " moveFilesMode = " + moveFilesMode);
+    /***********************************************************************
+     * Create file table
+     */
+    // A user clicked a directory
+    itemId = getSessionAttribute(ViewActiveDirectory.VDIRID);
+    if (itemId == null)
+    {
+      // No directory selected, first time
+      user = getOwner();
+      dc.reattachItem(user);
+      rootDir = user.getHomeDirectory();
+    }
+    else
+    {
+      factory = getItemFactory(dc);
+      rootDir = factory.getById(Directory.class, itemId);
+    }
+    // Query with parameters
+    query = rootDir.getFileQuery();
+    start = 0;
+    max = 1000000000;
+    columnOrder = getValidStringList(ConfigureTableFactory2.VCOLUMNORDER);
+    // Use
+    setAttribute(ConfigureTableFactory2.VDATACLASS, FileData.class
+      .getName());
+    setAttribute(ConfigureTableFactory2.VWRAPPERCLASS, File.class.getName());
+    // Configure TableFactory2
+    ConfigureTableFactory2 confTF2 = new ConfigureTableFactory2(getOwner());
+    confTF2.setExternalTableUpdateButtonClicked(tableUpdateButtonClicked);
+    TableFactory2 tableFactory2 = confTF2.configure(dc, File.class,
+      FileData.class, query, start, max, columnOrder, this, this
+        .getTableFactory2());
+    // Create file table
+    Table fileTable = tableFactory2.build();
+  // Add asPopup parameter to hide the menu in the next step. This is needed when the action is used
+  // in the wizard
+  if (getActionFactory().getAsPopup())
+    {
+      TextField<Boolean> asPopup = new TextField<Boolean>(
+        ActionFactory.VPOPUP);
+      asPopup.setHidden(true);
+      asPopup.setValue(true);
+      fileTable.add(asPopup);
+    }
+    /**
+     * If in the top level of the project, add all files visible to the
+     * project, but which are not in an accessible directory
+     */
+    if (activeP != null && activeP.getProjectDirectory() != null && activeP.getProjectDirectory().equals(rootDir))
+    {
+      log.debug("Checking for exclude directories");
+      query = qf.select(File.class);
+      query.exclude(Include.MINE);
+      query.include(Include.IN_PROJECT);
+      ItemQuery<Directory> dirQuery = qf.select(Directory.class);
+      dirQuery.exclude(Include.MINE);
+      dirQuery.include(Include.IN_PROJECT);
+      List<Directory> allDirs = dirQuery.list(dc);
+      // Specifically add the current dir so that files are not repeated
+      query.restrictPermanent(Restrictions.neq(Hql.property("directory"),
+        Hql.entity(rootDir)));
+      for (Directory currentDir : allDirs)
+      {
+        log.debug("Excluded dir: " + currentDir.getName());
+        query.restrictPermanent(Restrictions.neq(Hql
+          .property("directory"), Hql.entity(currentDir)));
+      }
+      tableFactory2 = confTF2.configure(dc, File.class, FileData.class,
+        query, start, max, columnOrder, this, this.getTableFactory2());
+      Table newTable = tableFactory2.build();
+      for (Row r : newTable.getRows())
+      {
+        r.getTags().add("shared");
+        fileTable.addRow(r);
+      }
+    }
+    fileTable.setTitle("Files");
+    // Only add file view action if no dedicated file selection
+    if (select == null || select)
+    {
+      /*
+       * Column actions are transferred to cells in rows, when the table
+       * is built.
+       */
+      for (Row row : fileTable.getRows())
+      {
+        for (Cell<?> cell : row.getCells())
+        {
+          cell.setActionLink(null);
+        }
+      }
+    }
+    //
+    fileTable.add(new TextField<String>(ConfigureTableFactory2.VWRAPPERCLASS, File.class.getName()));
+    fileTable.add(new TextField<String>(ConfigureTableFactory2.VDATACLASS, FileData.class.getName()));
+    // Add query parameters
+    fileTable.add(new TextField<Integer>(ConfigureTableFactory2.VQUERYSTARTAT, start));
+    // Set forward action
+    fileTable.add(new TextField<String>(ConfigureTableFactory2.VFORWARDTO, ViewActiveDirectory.class.getName()));
+    // Set this action as the table configuration action
+    fileTable.setConfigureTableAction(getActionFactory().getActionLink(
+      ConfigureTableFactory2.class, ""));
+    // We do not use the scroller when browsing for files
+    fileTable.setScroller(null);
+    // Add column order
+    List<Column> header = fileTable.getHeader();
+    for (int i = 0; i < header.size(); i++)
+    {
+      AttributeDefinition ad = header.get(i).getAttributeDefinition();
+      fileTable.add(new TextField<String>(ConfigureTableFactory2.VCOLUMNORDER, ad.getKey()));
+    }
+    // Add class name needed for delete action
+    fileTable.add(new TextField<String>(FormFactory.VCLASSNAME, File.class.getName()));
+    // Add optional form title
+    String formTitle = fetchFormTitle(select, selectMoveDir);
+    fileTable.add(new TitleField(formTitle));
+    // Add optional special name for "Next" button
+    String nextButtonName = fetchNextButtonName(select, selectMoveDir);
+    fileTable.add(new NextButtonNameField(nextButtonName));
+    // Use getRequest().getAttribute("table") in a
+    // subsequent action to get the created table.
+    //
+    // Add update button
+    Toolbar fileToolbar = new Toolbar();
+    fileTable.setToolbar(fileToolbar);
+    ActionLink update = getActionFactory().getActionLink(
+      ViewActiveDirectory.class, "Update");
+    update.addParameter(VTABLEUPDATEBUTTONCLICKED, true);
+    fileToolbar.add(update);
+    //
+    String path = rootDir.getPath().toString();
+    fileTable.setTitle(fileTable.getTitle());
+    //
+    ClassDescriptor wrapperDescriptor = new ClassDescriptor(File.class);
+    setAttribute("table", fileTable);
+    setAttribute("tableQuery", query);
+    setAttribute("header", header);
+    setAttribute("wrapperDescriptor", wrapperDescriptor);
+    /*
+     * Directory table
+     */
+    // prependDirectories(fileTable, rootDir, select, selectMoveDir);
+    Table dirTable = createDirectoryTable(fileTable, rootDir, select,
+      selectMoveDir, moveFilesMode, moveFilesStart);
+    Toolbar dirToolbar = new Toolbar();
+    dirTable.setToolbar(dirToolbar);
+    dirTable.add(new TextField<String>(ConfigureTableFactory2.VWRAPPERCLASS, Directory.class.getName()));
+    // We do not use the scroller when browsing for directories
+    dirTable.setScroller(null);
+    //
+    TabSet ts = null;
+    Title title = null;
+    /***********************************************************************
+     * Directory content form
+     */
+    if (select == null || select)
+    {
+      // Get optional special title for file selection form
+      formTitle = fetchFormTitle(select, selectMoveDir);
+      // Get optional special name for "Next" button
+      nextButtonName = fetchNextButtonName(select, selectMoveDir);
+      /*
+       * If selection is for directory to move file to, override above.
+       */
+      if (selectMoveDir)
+      {
+        // Add button to directory table tool bar
+        // Remove default buttons
+        dirToolbar.list().clear();
+        // dirToolbar.clear();
+        // Add a possibly renamed "Next" button
+        ActionLink al = new ActionLink(nextButtonName, actionId);
+        dirToolbar.setDefaultAction(al);
+        dirToolbar.add(al);
+        /*
+         * Moving several files
+         */
+        log.debug("moveFilesMode = " + moveFilesMode);
+        if (moveFilesMode)
+        {
+          /*
+           * This action may be called several times when
+           * navigating from the source to the target directory.
+           * First time the id values for selected files are
+           * stored in the default valid parameter VInteger ItemIdField.VPARAM,
+           * otherwise they are stored in valid parameter VInteger ViewActiveFile.VFILEID.
+           */
+          List<Integer> tmpFileIds = null;
+          // Check if first time when navigating to target directory
+          if (moveFilesStart)
+          {
+            tmpFileIds = getValidIntegerList(ItemIdField.VPARAM);
+            log.debug("tmpFileIds from ItemIdField.VPARAM = " + tmpFileIds);
+          }
+          else
+          {
+            tmpFileIds = getValidIntegerList(ViewActiveFile.VFILEID);
+            log.debug("tmpFileIds from ViewActiveFile.VFILEID = " + tmpFileIds);
+          }
+          log.debug("tmpFileIds = " + tmpFileIds);
+          // Add id values for selected files as parameters to action link
+          if (tmpFileIds != null && tmpFileIds.size() > 0)
+          {
+            // Set id values for source files
+            for (Integer fileId : tmpFileIds)
+            {
+          getFormFactory().addHiddenField(dirTable, ViewActiveFile.VFILEID, fileId);
+            }
+          }
+        }
+      }
+      title = new Title(formTitle);
+      // Add button to file table tool bar
+      // Remove default buttons
+      fileToolbar.list().clear();
+      fileToolbar.clear();
+      // Add update button
+      fileToolbar.add(update);
+      // Add a possibly renamed "Next" button
+      ActionLink al = new ActionLink(nextButtonName, actionId);
+      // fileToolbar.setDefaultAction(al);
+      fileToolbar.setDefaultAction(update);
+      fileToolbar.add(al);
+      log.debug("(2) fileToolbar.getDefaultAction() = " + fileToolbar
+        .getDefaultAction());
+    }
+    else
+    {
+        title = new Title("Files");
+      // Simple browsing of the directory
+      // Button for new directory
+      ActionLink newDirectoryBtn = getActionFactory().getActionLink(
+        NewDirectory.class, "NewDirectory");
+      dirToolbar.add(newDirectoryBtn);
+      // Button for deleting directory
+      ActionLink deleteDirectoryBtn = getActionFactory().getActionLink(
+        DeleteDirectory.class, "DeleteDirectory");
+      dirToolbar.add(deleteDirectoryBtn);
+      // Add directory tool bar
+      dirTable.setToolbar(dirToolbar);
+      // Simple browsing of the directory
+      // Button for moving file[s]
+      ActionLink moveAction = getActionFactory().getActionLink(
+        ViewActiveDirectory.class, "Move");
+      moveAction.addParameter(VMOVEFILESSTART, true);
+      fileToolbar.add(moveAction);
+      if (fileTable.getRows().size() == 0)
+      {
+        moveAction.disable();
+      }
+      // Button for deleting file
+      ActionLink deleteAction = getActionFactory().getActionLink(
+        DeleteItems.class, "Delete");
+      fileToolbar.add(deleteAction);
+      if (fileTable.getRows().size() == 0)
+      {
+        deleteAction.disable();
+      }
+      // Button for sharing directory
+      PopupLink shareAction = new PopupLink();
+      GUIElement<?> popupContent = ShareToProject.createPermissionForm(true);
+      shareAction.setContent(popupContent);
+      shareAction.setLabel("UseInProject");
+      // Button for sharing file
+      PopupLink shareFileAction = new PopupLink();
+      GUIElement<?> popupContent2 = ShareToProject.createPermissionForm(false);
+      shareFileAction.setContent(popupContent2);
+      shareFileAction.setLabel("UseInProject");
+      if (dc.getSessionControl().getActiveProjectId() == 0)
+      {
+        shareAction.disable();
+        shareFileAction.disable();
+      }
+      dirToolbar.add(shareAction);
+      fileToolbar.add(shareFileAction);
+      // Button for uploading file
+      ActionLink upload = getActionFactory().getActionLink(NewFile.class,
+        "UploadFile");
+      fileToolbar.add(upload);
+      // Button for uploading demo files
+      fileToolbar.add(getActionFactory().getActionLink(
+        UploadDemoFiles.class, "UploadDemoFiles"));
+      log.debug("(3) fileToolbar.getDefaultAction() = " + fileToolbar
+        .getDefaultAction());
+      /*******************************************************************
+       * Directory content container
+       */
+      RowContainer contentContainer = new RowContainer();
+      contentContainer.add(dirTable);
+      contentContainer.add(fileTable);
+      /*******************************************************************
+       * Directory properties form
+       */
+      Form propertiesForm = getFormFactory().getForm(Directory.class,
+        rootDir);
+      // Toolbar
+      Toolbar dirToolbar2 = new Toolbar();
+      dirToolbar2.add(getActionFactory().getActionLink(
+        SaveDirectory.class, "Save"));
+      propertiesForm.setToolbar(dirToolbar2);
+      /*******************************************************************
+       * Directory extensions
+       */
+      @SuppressWarnings("unused")
+      List<DirectoryContext> directoryContexts = getRegistry()
+        .getContexts(DirectoryContext.class);
+      if (directoryContexts == null)
+      {
+        log.debug("directoryContexts = null");
+      }
+      else
+      {
+        log.debug("directoryContexts.size() = " + directoryContexts
+          .size());
+      }
+      if (!directoryContexts.isEmpty())
+      {
+        Table dirExtTable = new Table("dirExtensionsTable");
+        List<Column> dirExtHeader = new ArrayList<Column>(2);
+        Column<String> name = new Column<String>("Name");
+        dirExtHeader.add(name);
+        Column<String> description = new Column<String>("Description");
+        dirExtHeader.add(description);
+        dirExtTable.setHeader(dirExtHeader);
+        int rowId = 0;
+        for (DirectoryContext context : directoryContexts)
+        {
+          rowId++;
+          Row row = new Row(rowId);
+          // Name column
+          log.debug("context.getLabel() = \"" + context.getLabel() + "\"");
+          Cell<String> nameCell = new Cell<String>(context.getLabel());
+          AbstractLink link = context
+            .getActionLink(getActionFactory());
+          // Link the extensions so that when one is selected the
+          // files table/form is posted to the given action.
+          CrossLink postTableLink = new CrossLink(dirTable, link);
+          nameCell.setActionLink(postTableLink);
+          row.addCell(nameCell);
+          // Description column
+          log.debug("context.getDescription() = \"" + context.getDescription() + "\"");
+          Cell<String> descCell = new Cell<String>(context.getDescription());
+          descCell.setActionLink(postTableLink);
+          row.addCell(descCell);
+          //
+          dirExtTable.addRow(row);
+        }
+        PopupLink dirExtensions = new PopupLink();
+        TitledWindow popup = new TitledWindow(
+          "ExtensionsForDirectories");
+        popup.setStatic(false);
+        popup.setContent(dirExtTable);
+        dirExtensions.setLabel("ExtensionsForDirectories");
+        dirExtensions.setContent(popup);
+        dirToolbar.add(dirExtensions);
+      }
+      /*******************************************************************
+       * File extensions
+       */
+      @SuppressWarnings("unused")
+      List<FileContext> fileContexts = getRegistry().getContexts(
+        FileContext.class);
+      if (fileContexts == null)
+      {
+        log.debug("fileContexts = null");
+      }
+      else
+      {
+        log.debug("fileContexts.size() = " + fileContexts.size());
+      }
+      if (!fileContexts.isEmpty())
+      {
+        Table fileExtTable = new Table("fileExtensionsTable");
+        List<Column> fileExtHeader = new ArrayList<Column>(2);
+        Column<String> name = new Column<String>("Name");
+        fileExtHeader.add(name);
+        Column<String> description = new Column<String>("Description");
+        fileExtHeader.add(description);
+        fileExtTable.setHeader(fileExtHeader);
+        int rowId = 0;
+        for (FileContext context : fileContexts)
+        {
+          rowId++;
+          Row row = new Row(rowId);
+          // Name column
+          log.debug("context.getLabel() = \"" + context.getLabel() + "\"");
+          Cell<String> nameCell = new Cell<String>(context.getLabel());
+          AbstractLink link = context
+            .getActionLink(getActionFactory());
+          // Link the extensions so that when one is selected the
+          // files table/form is posted to the given action.
+          CrossLink postTableLink = new CrossLink(fileTable, link);
+          nameCell.setActionLink(postTableLink);
+          row.addCell(nameCell);
+          // Description column
+          log.debug("context.getDescription() = \"" + context.getDescription() + "\"");
+          Cell<String> descCell = new Cell<String>(context.getDescription());
+          descCell.setActionLink(postTableLink);
+          row.addCell(descCell);
+          //
+          fileExtTable.addRow(row);
+        }
+        TitledWindow popup = new TitledWindow("ExtensionsForFiles");
+        popup.setStatic(false);
+        popup.setContent(fileExtTable);
+        PopupLink fileExtensions = new PopupLink();
+        fileExtensions.setLabel("ExtensionsForFiles");
+        fileExtensions.setContent(popup);
+        fileToolbar.add(fileExtensions);
+      }
+      /*******************************************************************
+       * Tab set
+       */
+      ts = new TabSet();
+      // Content tab
+      Tab contentTab = new Tab("Content", "dirContent");
+      contentTab.setGuiElement(contentContainer);
+      contentTab.setSelected(true);
+      ts.add(contentTab);
+      // Properties tab
+      Tab propertiesTab = new Tab("Properties", "dirProperties");
+      propertiesTab.setGuiElement(propertiesForm);
+      ts.add(propertiesTab);
+    }
+    /***********************************************************************
+     * Layout
+     */
+    RowLayout layout = getLayoutFactory().getRowLayout();
+    layout.add(title);
+    // Directory tab set
+    if (ts != null)
+    {
+      layout.add(ts);
+    }
+    else
+    {
+      if (selectMoveDir)
+      {
+        layout.add(dirTable);
+      }
+      else
+      {
+        layout.add(dirTable);
+        // Add file table
+        layout.add(fileTable);
+      }
+    }
+    //
+    setLayout(layout);
+  }
+  /**
+   * Obtains title for file/directory selection form from valid parameter.
+   *
+   * @param select Boolean Indicates file selection
+   * @param selectMoveDir Boolean Indicates directory selection
+   * @return String Title for file selection form
+   */
+  @SuppressWarnings("unchecked")
+  private String fetchFormTitle(Boolean select, Boolean selectMoveDir)
+  {
+    String formTitle = null;
+    if (select == null || select)
+    {
+      // Get optional special title for file selection form
+      try
+      {
+        formTitle = getString(TitleField.VPARAM);
+      }
+      catch (InvalidParameterValue e)
+      {}
+      if (formTitle == null || formTitle.equals(""))
+      {
+        formTitle = getSessionAttribute(TitleField.VPARAM);
+      }
+      if (formTitle == null || formTitle.equals(""))
+      {
+        formTitle = new String("Select file[s]");
+      }
+      // If selection is for directory to move file to, override above
+      if (selectMoveDir)
+      {
+        formTitle = new String("Move to target directory");
+      }
+    }
+    return formTitle;
+  }
+  /**
+   * Obtains name for for "Next" button in file/directory selection form from
+   * valid parameter.
+   *
+   * @param select Boolean Indicates file selection
+   * @param selectMoveDir Boolean Indicates directory selection
+   * @return String Name for "Next" button in file selection form
+   */
+  @SuppressWarnings("unchecked")
+  private String fetchNextButtonName(Boolean select, Boolean selectMoveDir)
+  {
+    String nextButtonName = null;
+    if (select == null || select)
+    {
+      // Get optional special name for "Next" button
+      try
+      {
+        nextButtonName = getString(NextButtonNameField.VPARAM);
+      }
+      catch (InvalidParameterValue e)
+      {}
+      if (nextButtonName == null || nextButtonName.equals(""))
+      {
+        nextButtonName = getSessionAttribute(NextButtonNameField.VPARAM);
+      }
+      if (nextButtonName == null || nextButtonName.equals(""))
+      {
+        nextButtonName = new String("Next");
+      }
+      // If selection is for directory to move file to, override above
+      if (selectMoveDir)
+      {
+        nextButtonName = new String("Next");
+      }
+    }
+    return nextButtonName;
+  }
+  /**
+   * Creates a directory table showing sub-directories in current directory,
+   * as well as a link to parent directory. The table columns are defined by
+   * the template table.
+   *
+   * @param templateTable Table Template table for selecting columns.
+   * @param dir Directory Source directory.
+   * @param select Boolean Flag indicating file selection mode.
+   * @param selectMoveDir Boolean Flag indicating directory selection mode
+   *        (overrides file selection mode).
+   * @param moveFilesMode Boolean Flag indicating file batch move mode.
+   * @param moveFilesStart Boolean Flag indicating file batch move start.
+   * @return Table
+   */
+  @SuppressWarnings("unchecked")
+  private Table createDirectoryTable(Table templateTable, Directory dir,
+      Boolean select, Boolean selectMoveDir, Boolean moveFilesMode, Boolean moveFilesStart)
+  {
+    // Define
+    ItemQuery<Directory> query;
+    TableFactory tfactory;
+    DbControl dc;
+    Project activeP;
+    QueryFactory qf;
+  String path = dir.getPath().toString();
+    // Create
+    qf = getQueryFactory();
+    dc = newDbControl();
+    activeP = getActiveProject(dc);
+    tfactory = getTableFactory();
+    tfactory.setDbControl(dc);
+    query = dir.getSubDirectories();
+    if (activeP != null)
+    {
+      query.include(Include.IN_PROJECT);
+    }
+    tfactory.reset();
+    tfactory.setDbControl(dir.getDbControl());
+    tfactory.setItemClass(Directory.class);
+    tfactory.setQuery(query);
+    // Allow unlimited number of rows in table
+    tfactory.setMaxResults(0);
+    ActionLink clickAction = null;
+    if (select == null || select)
+    {
+      // Get optional special title for file selection form
+      String formTitle = fetchFormTitle(select, selectMoveDir);
+      // Get optional special name for "Next" button
+      String nextButtonName = fetchNextButtonName(select, selectMoveDir);
+      clickAction = getActionFactory().getActionLink(SelectFile.class,
+        "View");
+      clickAction
+        .addParameter(TitleField.VPARAM, formTitle);
+      clickAction.addParameter(NextButtonNameField.VPARAM,
+        nextButtonName);
+      if (moveFilesMode)
+      {
+        /*
+         * This action may be called several times when
+         * navigating from the source to the target directory.
+         * First time the id values for selected files are
+         * stored in the default valid parameter VInteger ItemIdField.VPARAM,
+         * otherwise they are stored in valid parameter VInteger ViewActiveFile.VFILEID.
+         */
+        List<Integer> tmpFileIds = null;
+        // Check if first time when navigating to target directory
+        if (moveFilesStart)
+        {
+          try
+          {
+            tmpFileIds = getValidIntegerList(ItemIdField.VPARAM);
+          }
+          catch (Exception e)
+          {
+            log.debug("Exception when trying to retrieve file id list from ItemIdField.VPARAM: " + e);
+          }
+          log.debug("tmpFileIds from ItemIdField.VPARAM = " + tmpFileIds);
+        }
+        else
+        {
+          try
+          {
+            tmpFileIds = getValidIntegerList(ViewActiveFile.VFILEID);
+          }
+          catch (Exception e)
+          {
+            log.debug("Exception when trying to retrieve file id list from ViewActiveFile.VFILEID: " + e);
+          }
+          log.debug("tmpFileIds from ViewActiveFile.VFILEID = " + tmpFileIds);
+        }
+        log.debug("tmpFileIds = " + tmpFileIds);
+        // Add id values for selected files as parameters to click action
+        if (tmpFileIds != null && tmpFileIds.size() > 0)
+        {
+          // Set id values for source files
+          for (Integer fileId : tmpFileIds)
+          {
+            clickAction.addParameter(ViewActiveFile.VFILEID, fileId);
+          }
+        }
+      }
+    }
+    else
+    {
+      clickAction = getActionFactory().getActionLink(ViewDirectory.class,
+        "View");
+    }
+    tfactory.setColumnAction("Name", clickAction);
+    Table tmpTable = tfactory.build();
+    /**
+     * If in the top level of the project, also show directories that are
+     * shared to the project, but originate in other projects
+     */
+    if (activeP != null && activeP.getProjectDirectory().equals(dir))
+    {
+      dir.getProjectKey();
+      query = qf.select(Directory.class);
+      query.exclude(Include.MINE);
+      query.include(Include.IN_PROJECT);
+      List<Directory> allDirs = query.list(dc);
+      List<Integer> excludeDirs = new ArrayList<Integer>();
+      boolean use = false;
+      // Only list the top directories, do not include the current dir or
+      // directories with it as parent
+      for (Directory currentDir : allDirs)
+      {
+        if (!allDirs.contains(currentDir.getParent()) && !currentDir
+          .equals(dir) && !currentDir.getParent().equals(dir))
+        {
+          log.debug("Included dir: " + currentDir.getName());
+          use = true;
+        }
+        else
+        {
+          excludeDirs.add(currentDir.getId());
+          log.debug("Excluded dir: " + currentDir.getName());
+        }
+      }
+      query.reset();
+      // Add directories if there are any
+      if (use)
+      {
+        for (Integer id : excludeDirs)
+        {
+          query.restrict(Restrictions.neq(Hql.property("id"),
+            Expressions.integer(id.intValue())));
+        }
+        tfactory.setQuery(query);
+        Table tabletop = tfactory.build();
+        for (Row r : tabletop.getRows())
+        {
+          r.getTags().add("shared");
+        }
+        // Merge the tables
+        for (Row r : tmpTable.getRows())
+        {
+          tabletop.addRow(r);
+        }
+        tmpTable = tabletop;
+      }
+    }
+    // Create adapted directory table
+    Table table = new Table("DirectoryTable");
+    // Set title explicitly, to get correct plural for "Directory"
+    table.setTitle("Directory");
+    table.setSubtitle(path);
+    // Adapt header to template table
+    /*
+     * Simply using the template header,
+     * table.setHeader(templateTable.getHeader()); would work if the latter
+     * did not include an appended filter row.
+     */
+    List<Column> adaptedHeader = adaptTableHeader(0, templateTable,
+      tmpTable);
+    table.setHeader(adaptedHeader);
+    // Adapt directory table data to template table
+    for (Row row : tmpTable.getRows())
+    {
+      // Clear checkbox if navigating to target directory
+      if (selectMoveDir != null && selectMoveDir)
+      {
+        row.getCells().get(0).setValue(null);
+      }
+      // Add slash to directory names
+      Cell nameCell = row.getCells().get(1);
+      String dirName = (String) nameCell.getValue();
+      nameCell.setValue(dirName + "/");
+      // For column 2 and upwards, add empty cells if necessary.
+      // row = adaptTableRow(row, 2, templateTable, tmpTable);
+      row = adaptTableRow(row, 2, templateTable, tmpTable);
+      table.getRows().add(0, row);
+    }
+    Directory parentDir = dir.getParent();
+    if (!dir.isRootDirectory() && parentDir != null && !parentDir
+      .isRootDirectory())
+    {
+      // Prepend parent directory row
+      Row parentDirRow = tfactory.createRow(parentDir);
+      // Clear checkbox
+      parentDirRow.getCells().get(0).setValue(null);
+      // Add slash to directory names
+      Cell nameCell = parentDirRow.getCells().get(1);
+      nameCell.setValue("../");
+      // For column 2 and upwards, add empty cells if necessary.
+      // parentDirRow = adaptTableRow(parentDirRow, 2, templateTable,
+      // tmpTable);
+      parentDirRow = adaptTableRow(parentDirRow, 2, templateTable,
+        tmpTable);
+      table.getRows().add(0, parentDirRow);
+    }
+    return table;
+  }
+  /**
+   * Adapts a table header for source items so it fits in a table for template
+   * items. The tables for source and template items are used to find what
+   * cells in the source row are applicable in the template table. This is
+   * done by checking the names for each column. A column in the template
+   * table that has a corresponding column in the source table will have the
+   * source cell inserted, otherwise an empty cell. Columns unique to the
+   * source table will not trigger insertion of a cell.
+   *
+   * @param startIndex int Index for first column to check
+   * @param templateTable Table Table for template items
+   * @param sourceTable Table Table for source items
+   * @return List<Column> Output header for source item, modified to fit into
+   *         template table.
+   */
+  @SuppressWarnings("unchecked")
+  private List<Column> adaptTableHeader(int startIndex, Table templateTable,
+      Table sourceTable)
+  {
+    if (startIndex >= templateTable.getHeader().size())
+    {
+      // No columns to adapt, return input header.
+      return sourceTable.getHeader();
+    }
+    /*
+     * Get hash table of column names and column indices in source table.
+     */
+    Hashtable<String, Integer> sourceColumnNameHashtable = new Hashtable<String, Integer>(
+);
+    for (int i = startIndex; i < sourceTable.getHeader().size(); i++)
+    {
+      Column srcc = sourceTable.getHeader().get(i);
+      String sourceColumnName = srcc.getValue();
+      if (sourceColumnName != null)
+      {
+        // Add source column name to hash table.
+        sourceColumnNameHashtable.put(sourceColumnName, new Integer(i));
+        log
+          .debug("i = " + i + " sourceColumnNameHashtable.get(" + sourceColumnName + ").intValue() = " + sourceColumnNameHashtable
+            .get(sourceColumnName).intValue());
+      }
+    }
+    /*
+     * For column startIndex and upwards, only keep source columns for
+     * columns existing in both source and template tables. Add empty
+     * columns for columns unique to template table.
+     */
+    Table tmpTable = new Table("TemporaryTable");
+    // Add columns up to startIndex.
+    for (int i = 0; i < startIndex; i++)
+    {
+      Column column = sourceTable.getHeader().get(i);
+      tmpTable.add(column);
+      log
+        .debug("i = " + i + " column \"" + column.getValue() + "\" copied.");
+    }
+    /*
+     * For column startIndex and upwards, add empty columns if necessary.
+     */
+    for (int i = startIndex; i < templateTable.getHeader().size(); i++)
+    {
+      Column c = templateTable.getHeader().get(i);
+      // Only add visible columns in template table
+      if (!c.isVisible())
+      {
+        continue;
+      }
+      // Check if corresponding source table column exists, if any.
+      String templateColumnName = c.getValue();
+      if (sourceColumnNameHashtable.containsKey(templateColumnName))
+      {
+        // Source table column OK
+        int sourceColumnIndex = sourceColumnNameHashtable.get(
+          templateColumnName).intValue();
+        Column column = sourceTable.getHeader().get(sourceColumnIndex);
+        // If initial Id column, remove column name
+        if (i == 0 && column.getValue().equals("Id"))
+        {
+          column.setValue("");
+        }
+        tmpTable.add(column);
+        log
+          .debug("i = " + i + " templateColumnName = \"" + templateColumnName + "\" column \"" + column
+            .getValue() + "\" inserted.");
+      }
+      else
+      {
+        // Add new column for template column not in source table
+        Column column = new Column(templateColumnName);
+        // If initial Id column, remove column name
+        if (i == 0 && column.getValue().equals("Id"))
+        {
+          column.setValue("");
+        }
+        tmpTable.add(column);
+        log
+          .debug("i = " + i + " templateColumnName = \"" + templateColumnName + "\" new column \"" + column
+            .getValue() + "\" inserted.");
+      }
+    }
+    // Return adapted source header.
+    return tmpTable.getHeader();
+  }
+  /**
+   * Adapts a table row for source items so it fits in a table for template
+   * items. The tables for source and template items are used to find what
+   * cells in the source row are applicable in the template table. This is
+   * done by checking the names for each column. A column in the template
+   * table that has a corresponding column in the source table will have the
+   * source cell inserted, otherwise an empty cell. Columns unique to the
+   * source table will not trigger insertion of a cell.
+   *
+   * @param row Row Input row from source table to be adapted.
+   * @param startIndex int Index for first column to check
+   * @param templateTable Table Table for template items
+   * @param sourceTable Table Table for source items
+   * @return Row Output row for source item, modified to fit into template
+   *         table.
+   */
+  @SuppressWarnings("unchecked")
+  private Row adaptTableRow(Row row, int startIndex, Table templateTable,
+      Table sourceTable)
+  {
+    if (startIndex >= row.getCells().size())
+    {
+      // No cells to adapt, return input row.
+      return row;
+    }
+    /*
+     * Get hash table of column names and column indices in source table.
+     */
+    Hashtable<String, Integer> sourceColumnNameHashtable = new Hashtable<String, Integer>(
+);
+    for (int i = startIndex; i < sourceTable.getHeader().size(); i++)
+    {
+      Column srcc = sourceTable.getHeader().get(i);
+      String sourceColumnName = srcc.getValue();
+      if (sourceColumnName != null)
+      {
+        // Add source column name to hash table.
+        sourceColumnNameHashtable.put(sourceColumnName, new Integer(i));
+        log
+          .debug("i = " + i + " sourceColumnNameHashtable.get(" + sourceColumnName + ").intValue() = " + sourceColumnNameHashtable
+            .get(sourceColumnName).intValue());
+      }
+    }
+    /*
+     * For column startIndex and upwards, only keep source cells for columns
+     * existing in both source and template tables. Add empty cells for
+     * columns unique to template table.
+     */
+    ArrayList<Cell<?>> cellList = new ArrayList<Cell<?>>(0);
+    // Add cells up to startIndex.
+    for (int i = 0; i < startIndex; i++)
+    {
+      Cell<?> cell = row.getCells().get(i);
+      cellList.add(cell);
+      log
+        .debug("New row i = " + i + " cell value \"" + cell.getValue() + "\" copied.");
+    }
+    /*
+     * For column startIndex and upwards, add empty cells if necessary.
+     */
+    Cell emptyCell = new Cell<String>(null);
+    for (int i = startIndex; i < templateTable.getHeader().size(); i++)
+    {
+      Column c = templateTable.getHeader().get(i);
+      // Only add visible columns in template table
+      if (!c.isVisible())
+      {
+        continue;
+      }
+      // Check if corresponding source table cell exists, if any.
+      String templateColumnName = c.getValue();
+      if (sourceColumnNameHashtable.containsKey(templateColumnName))
+      {
+        // Source table cell OK
+        int sourceCellIndex = sourceColumnNameHashtable.get(
+          templateColumnName).intValue();
+        Cell<?> cell = row.getCells().get(sourceCellIndex);
+        cellList.add(cell);
+        log
+          .debug("New row i = " + i + " templateColumnName = \"" + templateColumnName + "\" cell value \"" + cell
+            .getValue() + "\" inserted.");
+      }
+      else
+      {
+        // Add empty cell for template column not in source table
+        cellList.add(emptyCell);
+        log
+          .debug("New row i = " + i + " templateColumnName = \"" + templateColumnName + "\" empty cell inserted.");
+      }
+    }
+    // Construct adapted source row.
+    row.setCells(cellList);
+    return row;
+  }
+  /**
+   * Convenience method for fetching the
+   * table update button clicked flag.
+   *
+   * @return boolean The table update button clicked flag.
+   */
+  private boolean fetchTableUpdateButtonClickedFlag()
+  {
+    // Get table update button clicked flag
+    boolean tableUpdateButtonClicked = false;
+    Boolean tableUpdateButtonClickedFlagFromRequest = false;
+    try
+    {
+      tableUpdateButtonClickedFlagFromRequest = getValidBoolean(VTABLEUPDATEBUTTONCLICKED);
+      if (tableUpdateButtonClickedFlagFromRequest == null)
+      {
+        tableUpdateButtonClicked = false;
+      }
+      else
+      {
+        tableUpdateButtonClicked = tableUpdateButtonClickedFlagFromRequest;
+      }
+    }
+    catch (Exception e)
+    {
+      log.debug("Exception when trying to get valid parameter VTABLEUPDATEBUTTONCLICKED: " + e);
+    }
+    log.debug("tableUpdateButtonClickedFlagFromRequest = " + tableUpdateButtonClickedFlagFromRequest + " tableUpdateButtonClicked = " + tableUpdateButtonClicked);
+    //
+    log.debug("tableUpdateButtonClicked = " + tableUpdateButtonClicked);
+    return tableUpdateButtonClicked;
+  }
+    /**
+        * Session identifier for an active directory
+    */
+    public static final VInteger VDIRID = new VInteger("active.dir.id", 1, true);
+    public static final VBoolean VSELECT = new VBoolean("select", true);
+    public static final VBoolean VSELECTMOVEDIR = new VBoolean(
+    "select.move.dir", false);
+    public static final VBoolean VMOVEFILESSTART = new VBoolean("moveFilesStart", false);
+    public static final VBoolean VMOVEFILES = new VBoolean("moveFiles", false);
+    public static final VBoolean VTABLEUPDATEBUTTONCLICKED = new VBoolean("tableUpdateButtonClicked", false);
+    /**
+        * Creates a layout for viewing/selecting the contents of a directory. The
+        * details of what the layout contains depends on Boolean flags transferred
+        * as valid parameters, that indicate the purpose of the directory listing.
+        * The general layout consists of a directory table and a file table. The
+        * directory table has two tabs, a 'contents' tab and a 'properties' tab.
+        * The directory 'contents' tab shows a list of sub-directories in the
+        * current directory, as well as a link to the parent directory. The file
+        * table shows a list of files in the current directory. The file table may
+        * be configured by the user via a popup window, and also has a filter row
+        * below the table header.
+    */
+    @Override
+    protected void runMe()
+    throws ActionException, InvalidParameterValue
+    {
+        log.debug("Start");
+        // Define
+        Boolean select, selectMoveDir, moveFilesStart, moveFilesMode = null;
+        String actionId;
+        DbControl dc;
+        Integer itemId, start, max;
+        ItemQuery<File> query;
+        Directory rootDir;
+        User user;
+        ItemFactory factory;
+        List<String> columnOrder;
+        Project activeP;
+        QueryFactory qf;
+        //
+        // Fetch table update button clicked flag
+        boolean tableUpdateButtonClicked = fetchTableUpdateButtonClickedFlag();
+        log.debug("tableUpdateButtonClicked = " + tableUpdateButtonClicked);
+        // Create
+        // Check if user has selected file[s] in directory table to move
+        moveFilesStart = getValidBoolean(VMOVEFILESSTART);
+        if (moveFilesStart == null)
+        {
+            moveFilesStart = false;
+            log
+            .debug("Input moveFilesStart == null, reset to moveFilesStart = " + moveFilesStart);
+        }
+        log.debug("moveFilesStart = " + moveFilesStart);
+        if (moveFilesStart)
+        {
+            // Check input
+            List<Integer> tmpFileIds = getValidIntegerList(ItemIdField.VPARAM);
+            log.debug("tmpFileIds from ItemIdField.VPARAM for input check = " + tmpFileIds);
+            if (tmpFileIds != null && tmpFileIds.size() > 0)
+            {
+                setSessionAttribute(VSELECT, true);
+                setSessionAttribute(VSELECTMOVEDIR, true);
+                setSessionAttribute(VMOVEFILES, true);
+                setSessionAttribute(ForwardField.VPARAM, MoveFiles.class.getName());
+            }
+            else
+            {
+                setError("Select at least one file to move");
+            }
+        }
+        select = getSessionAttribute(VSELECT);
+        actionId = getSessionAttribute(ForwardField.VPARAM);
+        selectMoveDir = getSessionAttribute(VSELECTMOVEDIR);
+        moveFilesMode = getSessionAttribute(VMOVEFILES);
+        qf = getQueryFactory();
+        dc = newDbControl();
+        activeP = getActiveProject(dc);
+        // Use
+        if (selectMoveDir == null)
+        {
+            selectMoveDir = false;
+            log
+            .debug("Input selectMoveDir == null, reset to selectMoveDir = " + selectMoveDir);
+        }
+        if (moveFilesMode == null)
+        {
+            moveFilesMode = false;
+            log
+            .debug("Input moveFilesMode == null, reset to moveFilesMode = " + moveFilesMode);
+        }
+        log.debug("select = " + select + " selectMoveDir = " + selectMoveDir + " moveFilesMode = " + moveFilesMode);
+        /***********************************************************************
+            * Create file table
+        */
+        // A user clicked a directory
+        itemId = getSessionAttribute(ViewActiveDirectory.VDIRID);
+        if (itemId == null)
+        {
+            // No directory selected, first time
+            user = getOwner();
+            dc.reattachItem(user);
+            rootDir = user.getHomeDirectory();
+        }
+        else
+        {
+            factory = getItemFactory(dc);
+            rootDir = factory.getById(Directory.class, itemId);
+        }
+        // Query with parameters
+        query = rootDir.getFileQuery();
+        start = 0;
+        max = 1000000000;
+        columnOrder = getValidStringList(ConfigureTableFactory2.VCOLUMNORDER);
+        // Use
+        setAttribute(ConfigureTableFactory2.VDATACLASS, FileData.class
+        .getName());
+        setAttribute(ConfigureTableFactory2.VWRAPPERCLASS, File.class.getName());
+        // Configure TableFactory2
+        ConfigureTableFactory2 confTF2 = new ConfigureTableFactory2(getOwner());
+        confTF2.setExternalTableUpdateButtonClicked(tableUpdateButtonClicked);
+        TableFactory2 tableFactory2 = confTF2.configure(dc, File.class,
+        FileData.class, query, start, max, columnOrder, this, this
+        .getTableFactory2());
+        // Create file table
+        Table fileTable = tableFactory2.build();
+        // Add asPopup parameter to hide the menu in the next step. This is needed when the action is used
+        // in the wizard
+        if (getActionFactory().getAsPopup())
+        {
+            TextField<Boolean> asPopup = new TextField<Boolean>(
+            ActionFactory.VPOPUP);
+            asPopup.setHidden(true);
+            asPopup.setValue(true);
+            fileTable.add(asPopup);
+        }
+        /**
+            * If in the top level of the project, add all files visible to the
+            * project, but which are not in an accessible directory
+        */
+        if (activeP != null && activeP.getProjectDirectory() != null && activeP.getProjectDirectory().equals(rootDir))
+        {
+            log.debug("Checking for exclude directories");
+            query = qf.select(File.class);
+            query.exclude(Include.MINE);
+            query.include(Include.IN_PROJECT);
+            ItemQuery<Directory> dirQuery = qf.select(Directory.class);
+            dirQuery.exclude(Include.MINE);
+            dirQuery.include(Include.IN_PROJECT);
+            List<Directory> allDirs = dirQuery.list(dc);
+            // Specifically add the current dir so that files are not repeated
+            query.restrictPermanent(Restrictions.neq(Hql.property("directory"),
+            Hql.entity(rootDir)));
+            for (Directory currentDir : allDirs)
+            {
+                log.debug("Excluded dir: " + currentDir.getName());
+                query.restrictPermanent(Restrictions.neq(Hql
+                .property("directory"), Hql.entity(currentDir)));
+            }
+            tableFactory2 = confTF2.configure(dc, File.class, FileData.class,
+            query, start, max, columnOrder, this, this.getTableFactory2());
+            Table newTable = tableFactory2.build();
+            for (Row r : newTable.getRows())
+            {
+                r.getTags().add("shared");
+                fileTable.addRow(r);
+            }
+        }
+        fileTable.setTitle("Files");
+        // Only add file view action if no dedicated file selection
+        if (select == null || select)
+        {
+            /*
+                * Column actions are transferred to cells in rows, when the table
+                * is built.
+            */
+            for (Row row : fileTable.getRows())
+            {
+                for (Cell<?> cell : row.getCells())
+                {
+                    cell.setActionLink(null);
+                }
+            }
+        }
+        //
+        fileTable.add(new TextField<String>(ConfigureTableFactory2.VWRAPPERCLASS, File.class.getName()));
+        fileTable.add(new TextField<String>(ConfigureTableFactory2.VDATACLASS, FileData.class.getName()));
+        // Add query parameters
+        fileTable.add(new TextField<Integer>(ConfigureTableFactory2.VQUERYSTARTAT, start));
+        // Set forward action
+        fileTable.add(new TextField<String>(ConfigureTableFactory2.VFORWARDTO, ViewActiveDirectory.class.getName()));
+        // Set this action as the table configuration action
+        fileTable.setConfigureTableAction(getActionFactory().getActionLink(
+        ConfigureTableFactory2.class, ""));
+        // We do not use the scroller when browsing for files
+        fileTable.setScroller(null);
+        // Add column order
+        List<Column> header = fileTable.getHeader();
+        for (int i = 0; i < header.size(); i++)
+        {
+            AttributeDefinition ad = header.get(i).getAttributeDefinition();
+            fileTable.add(new TextField<String>(ConfigureTableFactory2.VCOLUMNORDER, ad.getKey()));
+        }
+        // Add class name needed for delete action
+        fileTable.add(new TextField<String>(FormFactory.VCLASSNAME, File.class.getName()));
+        // Add optional form title
+        String formTitle = fetchFormTitle(select, selectMoveDir);
+        fileTable.add(new TitleField(formTitle));
+        // Add optional special name for "Next" button
+        String nextButtonName = fetchNextButtonName(select, selectMoveDir);
+        fileTable.add(new NextButtonNameField(nextButtonName));
+        // Use getRequest().getAttribute("table") in a
+        // subsequent action to get the created table.
+        //
+        // Add update button
+        Toolbar fileToolbar = new Toolbar();
+        fileTable.setToolbar(fileToolbar);
+        ActionLink update = getActionFactory().getActionLink(
+        ViewActiveDirectory.class, "Update");
+        update.addParameter(VTABLEUPDATEBUTTONCLICKED, true);
+        fileToolbar.add(update);
+        //
+        String path = rootDir.getPath().toString();
+        fileTable.setTitle(fileTable.getTitle());
+        //
+        ClassDescriptor wrapperDescriptor = new ClassDescriptor(File.class);
+        setAttribute("table", fileTable);
+        setAttribute("tableQuery", query);
+        setAttribute("header", header);
+        setAttribute("wrapperDescriptor", wrapperDescriptor);
+        /*
+            * Directory table
+        */
+        // prependDirectories(fileTable, rootDir, select, selectMoveDir);
+        Table dirTable = createDirectoryTable(fileTable, rootDir, select,
+        selectMoveDir, moveFilesMode, moveFilesStart);
+        Toolbar dirToolbar = new Toolbar();
+        dirTable.setToolbar(dirToolbar);
+        dirTable.add(new TextField<String>(ConfigureTableFactory2.VWRAPPERCLASS, Directory.class.getName()));
+        // We do not use the scroller when browsing for directories
+        dirTable.setScroller(null);
+        //
+        TabSet ts = null;
+        Title title = null;
+        /***********************************************************************
+            * Directory content form
+        */
+        if (select == null || select)
+        {
+            // Get optional special title for file selection form
+            formTitle = fetchFormTitle(select, selectMoveDir);
+            // Get optional special name for "Next" button
+            nextButtonName = fetchNextButtonName(select, selectMoveDir);
+            /*
+                * If selection is for directory to move file to, override above.
+            */
+            if (selectMoveDir)
+            {
+                // Add button to directory table tool bar
+                // Remove default buttons
+                dirToolbar.list().clear();
+                // dirToolbar.clear();
+                // Add a possibly renamed "Next" button
+                ActionLink al = new ActionLink(nextButtonName, actionId);
+                dirToolbar.setDefaultAction(al);
+                dirToolbar.add(al);
+                /*
+                    * Moving several files
+                */
+                log.debug("moveFilesMode = " + moveFilesMode);
+                if (moveFilesMode)
+                {
+                    /*
+                        * This action may be called several times when
+                        * navigating from the source to the target directory.
+                        * First time the id values for selected files are
+                        * stored in the default valid parameter VInteger ItemIdField.VPARAM,
+                        * otherwise they are stored in valid parameter VInteger ViewActiveFile.VFILEID.
+                    */
+                    List<Integer> tmpFileIds = null;
+                    // Check if first time when navigating to target directory
+                    if (moveFilesStart)
+                    {
+                        tmpFileIds = getValidIntegerList(ItemIdField.VPARAM);
+                        log.debug("tmpFileIds from ItemIdField.VPARAM = " + tmpFileIds);
+                    }
+                    else
+                    {
+                        tmpFileIds = getValidIntegerList(ViewActiveFile.VFILEID);
+                        log.debug("tmpFileIds from ViewActiveFile.VFILEID = " + tmpFileIds);
+                    }
+                    log.debug("tmpFileIds = " + tmpFileIds);
+                    // Add id values for selected files as parameters to action link
+                    if (tmpFileIds != null && tmpFileIds.size() > 0)
+                    {
+                        // Set id values for source files
+                        for (Integer fileId : tmpFileIds)
+                        {
+                            getFormFactory().addHiddenField(dirTable, ViewActiveFile.VFILEID, fileId);
+                        }
+                    }
+                }
+            }
+            title = new Title(formTitle);
+            // Add button to file table tool bar
+            // Remove default buttons
+            fileToolbar.list().clear();
+            fileToolbar.clear();
+            // Add update button
+            fileToolbar.add(update);
+            // Add a possibly renamed "Next" button
+            ActionLink al = new ActionLink(nextButtonName, actionId);
+            // fileToolbar.setDefaultAction(al);
+            fileToolbar.setDefaultAction(update);
+            fileToolbar.add(al);
+            log.debug("(2) fileToolbar.getDefaultAction() = " + fileToolbar
+            .getDefaultAction());
+        }
+        else
+        {
+            title = new Title("Files");
+            // Simple browsing of the directory
+            // Button for new directory
+            ActionLink newDirectoryBtn = getActionFactory().getActionLink(
+            NewDirectory.class, "NewDirectory");
+            dirToolbar.add(newDirectoryBtn);
+            // Button for deleting directory
+            ActionLink deleteDirectoryBtn = getActionFactory().getActionLink(
+            DeleteDirectory.class, "DeleteDirectory");
+            dirToolbar.add(deleteDirectoryBtn);
+            // Add directory tool bar
+            dirTable.setToolbar(dirToolbar);
+            // Simple browsing of the directory
+            // Button for moving file[s]
+            ActionLink moveAction = getActionFactory().getActionLink(
+            ViewActiveDirectory.class, "Move");
+            moveAction.addParameter(VMOVEFILESSTART, true);
+            fileToolbar.add(moveAction);
+            if (fileTable.getRows().size() == 0)
+            {
+                moveAction.disable();
+            }
+            // Button for deleting file
+            ActionLink deleteAction = getActionFactory().getActionLink(
+            DeleteItems.class, "Delete");
+            fileToolbar.add(deleteAction);
+            if (fileTable.getRows().size() == 0)
+            {
+                deleteAction.disable();
+            }
+            // Button for sharing directory
+            PopupLink shareAction = new PopupLink();
+            GUIElement<?> popupContent = ShareToProject.createPermissionForm(true);
+            shareAction.setContent(popupContent);
+            shareAction.setLabel("UseInProject");
+            // Button for sharing file
+            PopupLink shareFileAction = new PopupLink();
+            GUIElement<?> popupContent2 = ShareToProject.createPermissionForm(false);
+            shareFileAction.setContent(popupContent2);
+            shareFileAction.setLabel("UseInProject");
+            if (dc.getSessionControl().getActiveProjectId() == 0)
+            {
+                shareAction.disable();
+                shareFileAction.disable();
+            }
+            dirToolbar.add(shareAction);
+            fileToolbar.add(shareFileAction);
+            // Button for uploading file
+            ActionLink upload = getActionFactory().getActionLink(NewFile.class,
+            "UploadFile");
+            fileToolbar.add(upload);
+            log.debug("(3) fileToolbar.getDefaultAction() = " + fileToolbar
+            .getDefaultAction());
+            /*******************************************************************
+                * Directory content container
+            */
+            RowContainer contentContainer = new RowContainer();
+            contentContainer.add(dirTable);
+            contentContainer.add(fileTable);
+            /*******************************************************************
+                * Directory properties form
+            */
+            Form propertiesForm = getFormFactory().getForm(Directory.class,
+            rootDir);
+            // Toolbar
+            Toolbar dirToolbar2 = new Toolbar();
+            dirToolbar2.add(getActionFactory().getActionLink(
+            SaveDirectory.class, "Save"));
+            propertiesForm.setToolbar(dirToolbar2);
+            /*******************************************************************
+                * Directory extensions
+            */
+            @SuppressWarnings("unused")
+            List<DirectoryContext> directoryContexts = getRegistry()
+            .getContexts(DirectoryContext.class);
+            if (directoryContexts == null)
+            {
+                log.debug("directoryContexts = null");
+            }
+            else
+            {
+                log.debug("directoryContexts.size() = " + directoryContexts
+                .size());
+            }
+            if (!directoryContexts.isEmpty())
+            {
+                Table dirExtTable = new Table("dirExtensionsTable");
+                List<Column> dirExtHeader = new ArrayList<Column>(2);
+                Column<String> name = new Column<String>("Name");
+                dirExtHeader.add(name);
+                Column<String> description = new Column<String>("Description");
+                dirExtHeader.add(description);
+                dirExtTable.setHeader(dirExtHeader);
+                int rowId = 0;
+                for (DirectoryContext context : directoryContexts)
+                {
+                    rowId++;
+                    Row row = new Row(rowId);
+                    // Name column
+                    log.debug("context.getLabel() = \"" + context.getLabel() + "\"");
+                    Cell<String> nameCell = new Cell<String>(context.getLabel());
+                    AbstractLink link = context
+                    .getActionLink(getActionFactory());
+                    // Link the extensions so that when one is selected the
+                    // files table/form is posted to the given action.
+                    CrossLink postTableLink = new CrossLink(dirTable, link);
+                    nameCell.setActionLink(postTableLink);
+                    row.addCell(nameCell);
+                    // Description column
+                    log.debug("context.getDescription() = \"" + context.getDescription() + "\"");
+                    Cell<String> descCell = new Cell<String>(context.getDescription());
+                    descCell.setActionLink(postTableLink);
+                    row.addCell(descCell);
+                    //
+                    dirExtTable.addRow(row);
+                }
+                PopupLink dirExtensions = new PopupLink();
+                TitledWindow popup = new TitledWindow(
+                "ExtensionsForDirectories");
+                popup.setStatic(false);
+                popup.setContent(dirExtTable);
+                dirExtensions.setLabel("ExtensionsForDirectories");
+                dirExtensions.setContent(popup);
+                dirToolbar.add(dirExtensions);
+            }
+            /*******************************************************************
+                * File extensions
+            */
+            @SuppressWarnings("unused")
+            List<FileContext> fileContexts = getRegistry().getContexts(
+            FileContext.class);
+            if (fileContexts == null)
+            {
+                log.debug("fileContexts = null");
+            }
+            else
+            {
+                log.debug("fileContexts.size() = " + fileContexts.size());
+            }
+            if (!fileContexts.isEmpty())
+            {
+                Table fileExtTable = new Table("fileExtensionsTable");
+                List<Column> fileExtHeader = new ArrayList<Column>(2);
+                Column<String> name = new Column<String>("Name");
+                fileExtHeader.add(name);
+                Column<String> description = new Column<String>("Description");
+                fileExtHeader.add(description);
+                fileExtTable.setHeader(fileExtHeader);
+                int rowId = 0;
+                for (FileContext context : fileContexts)
+                {
+                    rowId++;
+                    Row row = new Row(rowId);
+                    // Name column
+                    log.debug("context.getLabel() = \"" + context.getLabel() + "\"");
+                    Cell<String> nameCell = new Cell<String>(context.getLabel());
+                    AbstractLink link = context
+                    .getActionLink(getActionFactory());
+                    // Link the extensions so that when one is selected the
+                    // files table/form is posted to the given action.
+                    CrossLink postTableLink = new CrossLink(fileTable, link);
+                    nameCell.setActionLink(postTableLink);
+                    row.addCell(nameCell);
+                    // Description column
+                    log.debug("context.getDescription() = \"" + context.getDescription() + "\"");
+                    Cell<String> descCell = new Cell<String>(context.getDescription());
+                    descCell.setActionLink(postTableLink);
+                    row.addCell(descCell);
+                    //
+                    fileExtTable.addRow(row);
+                }
+                TitledWindow popup = new TitledWindow("ExtensionsForFiles");
+                popup.setStatic(false);
+                popup.setContent(fileExtTable);
+                PopupLink fileExtensions = new PopupLink();
+                fileExtensions.setLabel("ExtensionsForFiles");
+                fileExtensions.setContent(popup);
+                fileToolbar.add(fileExtensions);
+            }
+            /*******************************************************************
+                * Tab set
+            */
+            ts = new TabSet();
+            // Content tab
+            Tab contentTab = new Tab("Content", "dirContent");
+            contentTab.setGuiElement(contentContainer);
+            contentTab.setSelected(true);
+            ts.add(contentTab);
+            // Properties tab
+            Tab propertiesTab = new Tab("Properties", "dirProperties");
+            propertiesTab.setGuiElement(propertiesForm);
+            ts.add(propertiesTab);
+        }
+        /***********************************************************************
+            * Layout
+        */
+        RowLayout layout = getLayoutFactory().getRowLayout();
+        layout.add(title);
+        // Directory tab set
+        if (ts != null)
+        {
+            layout.add(ts);
+        }
+        else
+        {
+            if (selectMoveDir)
+            {
+                layout.add(dirTable);
+            }
+            else
+            {
+                layout.add(dirTable);
+                // Add file table
+                layout.add(fileTable);
+            }
+        }
+        //
+        setLayout(layout);
+    }
+    /**
+        * Obtains title for file/directory selection form from valid parameter.
+        *
+        * @param select Boolean Indicates file selection
+        * @param selectMoveDir Boolean Indicates directory selection
+        * @return String Title for file selection form
+    */
+    @SuppressWarnings("unchecked")
+    private String fetchFormTitle(Boolean select, Boolean selectMoveDir)
+    {
+        String formTitle = null;
+        if (select == null || select)
+        {
+            // Get optional special title for file selection form
+            try
+            {
+                formTitle = getString(TitleField.VPARAM);
+            }
+            catch (InvalidParameterValue e)
+            {}
+            if (formTitle == null || formTitle.equals(""))
+            {
+                formTitle = getSessionAttribute(TitleField.VPARAM);
+            }
+            if (formTitle == null || formTitle.equals(""))
+            {
+                formTitle = new String("Select file[s]");
+            }
+            // If selection is for directory to move file to, override above
+            if (selectMoveDir)
+            {
+                formTitle = new String("Move to target directory");
+            }
+        }
+        return formTitle;
+    }
+    /**
+        * Obtains name for for "Next" button in file/directory selection form from
+        * valid parameter.
+        *
+        * @param select Boolean Indicates file selection
+        * @param selectMoveDir Boolean Indicates directory selection
+        * @return String Name for "Next" button in file selection form
+    */
+    @SuppressWarnings("unchecked")
+    private String fetchNextButtonName(Boolean select, Boolean selectMoveDir)
+    {
+        String nextButtonName = null;
+        if (select == null || select)
+        {
+            // Get optional special name for "Next" button
+            try
+            {
+                nextButtonName = getString(NextButtonNameField.VPARAM);
+            }
+            catch (InvalidParameterValue e)
+            {}
+            if (nextButtonName == null || nextButtonName.equals(""))
+            {
+                nextButtonName = getSessionAttribute(NextButtonNameField.VPARAM);
+            }
+            if (nextButtonName == null || nextButtonName.equals(""))
+            {
+                nextButtonName = new String("Next");
+            }
+            // If selection is for directory to move file to, override above
+            if (selectMoveDir)
+            {
+                nextButtonName = new String("Next");
+            }
+        }
+        return nextButtonName;
+    }
+    /**
+        * Creates a directory table showing sub-directories in current directory,
+        * as well as a link to parent directory. The table columns are defined by
+        * the template table.
+        *
+        * @param templateTable Table Template table for selecting columns.
+        * @param dir Directory Source directory.
+        * @param select Boolean Flag indicating file selection mode.
+        * @param selectMoveDir Boolean Flag indicating directory selection mode
+        *        (overrides file selection mode).
+        * @param moveFilesMode Boolean Flag indicating file batch move mode.
+        * @param moveFilesStart Boolean Flag indicating file batch move start.
+        * @return Table
+    */
+    @SuppressWarnings("unchecked")
+    private Table createDirectoryTable(Table templateTable, Directory dir,
+    Boolean select, Boolean selectMoveDir, Boolean moveFilesMode, Boolean moveFilesStart)
+    {
+        // Define
+        ItemQuery<Directory> query;
+        TableFactory tfactory;
+        DbControl dc;
+        Project activeP;
+        QueryFactory qf;
+        String path = dir.getPath().toString();
+        // Create
+        qf = getQueryFactory();
+        dc = newDbControl();
+        activeP = getActiveProject(dc);
+        tfactory = getTableFactory();
+        tfactory.setDbControl(dc);
+        query = dir.getSubDirectories();
+        if (activeP != null)
+        {
+            query.include(Include.IN_PROJECT);
+        }
+        tfactory.reset();
+        tfactory.setDbControl(dir.getDbControl());
+        tfactory.setItemClass(Directory.class);
+        tfactory.setQuery(query);
+        // Allow unlimited number of rows in table
+        tfactory.setMaxResults(0);
+        ActionLink clickAction = null;
+        if (select == null || select)
+        {
+            // Get optional special title for file selection form
+            String formTitle = fetchFormTitle(select, selectMoveDir);
+            // Get optional special name for "Next" button
+            String nextButtonName = fetchNextButtonName(select, selectMoveDir);
+            clickAction = getActionFactory().getActionLink(SelectFile.class,
+            "View");
+            clickAction
+            .addParameter(TitleField.VPARAM, formTitle);
+            clickAction.addParameter(NextButtonNameField.VPARAM,
+            nextButtonName);
+            if (moveFilesMode)
+            {
+                /*
+                    * This action may be called several times when
+                    * navigating from the source to the target directory.
+                    * First time the id values for selected files are
+                    * stored in the default valid parameter VInteger ItemIdField.VPARAM,
+                    * otherwise they are stored in valid parameter VInteger ViewActiveFile.VFILEID.
+                */
+                List<Integer> tmpFileIds = null;
+                // Check if first time when navigating to target directory
+                if (moveFilesStart)
+                {
+                    try
+                    {
+                        tmpFileIds = getValidIntegerList(ItemIdField.VPARAM);
+                    }
+                    catch (Exception e)
+                    {
+                        log.debug("Exception when trying to retrieve file id list from ItemIdField.VPARAM: " + e);
+                    }
+                    log.debug("tmpFileIds from ItemIdField.VPARAM = " + tmpFileIds);
+                }
+                else
+                {
+                    try
+                    {
+                        tmpFileIds = getValidIntegerList(ViewActiveFile.VFILEID);
+                    }
+                    catch (Exception e)
+                    {
+                        log.debug("Exception when trying to retrieve file id list from ViewActiveFile.VFILEID: " + e);
+                    }
+                    log.debug("tmpFileIds from ViewActiveFile.VFILEID = " + tmpFileIds);
+                }
+                log.debug("tmpFileIds = " + tmpFileIds);
+                // Add id values for selected files as parameters to click action
+                if (tmpFileIds != null && tmpFileIds.size() > 0)
+                {
+                    // Set id values for source files
+                    for (Integer fileId : tmpFileIds)
+                    {
+                        clickAction.addParameter(ViewActiveFile.VFILEID, fileId);
+                    }
+                }
+            }
+        }
+        else
+        {
+            clickAction = getActionFactory().getActionLink(ViewDirectory.class,
+            "View");
+        }
+        tfactory.setColumnAction("Name", clickAction);
+        Table tmpTable = tfactory.build();
+        /**
+            * If in the top level of the project, also show directories that are
+            * shared to the project, but originate in other projects
+        */
+        if (activeP != null && activeP.getProjectDirectory().equals(dir))
+        {
+            dir.getProjectKey();
+            query = qf.select(Directory.class);
+            query.exclude(Include.MINE);
+            query.include(Include.IN_PROJECT);
+            List<Directory> allDirs = query.list(dc);
+            List<Integer> excludeDirs = new ArrayList<Integer>();
+            boolean use = false;
+            // Only list the top directories, do not include the current dir or
+            // directories with it as parent
+            for (Directory currentDir : allDirs)
+            {
+                if (!allDirs.contains(currentDir.getParent()) && !currentDir
+                .equals(dir) && !currentDir.getParent().equals(dir))
+                {
+                    log.debug("Included dir: " + currentDir.getName());
+                    use = true;
+                }
+                else
+                {
+                    excludeDirs.add(currentDir.getId());
+                    log.debug("Excluded dir: " + currentDir.getName());
+                }
+            }
+            query.reset();
+            // Add directories if there are any
+            if (use)
+            {
+                for (Integer id : excludeDirs)
+                {
+                    query.restrict(Restrictions.neq(Hql.property("id"),
+                    Expressions.integer(id.intValue())));
+                }
+                tfactory.setQuery(query);
+                Table tabletop = tfactory.build();
+                for (Row r : tabletop.getRows())
+                {
+                    r.getTags().add("shared");
+                }
+                // Merge the tables
+                for (Row r : tmpTable.getRows())
+                {
+                    tabletop.addRow(r);
+                }
+                tmpTable = tabletop;
+            }
+        }
+        // Create adapted directory table
+        Table table = new Table("DirectoryTable");
+        // Set title explicitly, to get correct plural for "Directory"
+        table.setTitle("Directory");
+        table.setSubtitle(path);
+        // Adapt header to template table
+        /*
+            * Simply using the template header,
+            * table.setHeader(templateTable.getHeader()); would work if the latter
+            * did not include an appended filter row.
+        */
+        List<Column> adaptedHeader = adaptTableHeader(0, templateTable,
+        tmpTable);
+        table.setHeader(adaptedHeader);
+        // Adapt directory table data to template table
+        for (Row row : tmpTable.getRows())
+        {
+            // Clear checkbox if navigating to target directory
+            if (selectMoveDir != null && selectMoveDir)
+            {
+                row.getCells().get(0).setValue(null);
+            }
+            // Add slash to directory names
+            Cell nameCell = row.getCells().get(1);
+            String dirName = (String) nameCell.getValue();
+            nameCell.setValue(dirName + "/");
+            // For column 2 and upwards, add empty cells if necessary.
+            // row = adaptTableRow(row, 2, templateTable, tmpTable);
+            row = adaptTableRow(row, 2, templateTable, tmpTable);
+            table.getRows().add(0, row);
+        }
+        Directory parentDir = dir.getParent();
+        if (!dir.isRootDirectory() && parentDir != null && !parentDir
+        .isRootDirectory())
+        {
+            // Prepend parent directory row
+            Row parentDirRow = tfactory.createRow(parentDir);
+            // Clear checkbox
+            parentDirRow.getCells().get(0).setValue(null);
+            // Add slash to directory names
+            Cell nameCell = parentDirRow.getCells().get(1);
+            nameCell.setValue("../");
+            // For column 2 and upwards, add empty cells if necessary.
+            // parentDirRow = adaptTableRow(parentDirRow, 2, templateTable,
+            // tmpTable);
+            parentDirRow = adaptTableRow(parentDirRow, 2, templateTable,
+            tmpTable);
+            table.getRows().add(0, parentDirRow);
+        }
+        return table;
+    }
+    /**
+        * Adapts a table header for source items so it fits in a table for template
+        * items. The tables for source and template items are used to find what
+        * cells in the source row are applicable in the template table. This is
+        * done by checking the names for each column. A column in the template
+        * table that has a corresponding column in the source table will have the
+        * source cell inserted, otherwise an empty cell. Columns unique to the
+        * source table will not trigger insertion of a cell.
+        *
+        * @param startIndex int Index for first column to check
+        * @param templateTable Table Table for template items
+        * @param sourceTable Table Table for source items
+        * @return List<Column> Output header for source item, modified to fit into
+        *         template table.
+    */
+    @SuppressWarnings("unchecked")
+    private List<Column> adaptTableHeader(int startIndex, Table templateTable,
+    Table sourceTable)
+    {
+        if (startIndex >= templateTable.getHeader().size())
+        {
+            // No columns to adapt, return input header.
+            return sourceTable.getHeader();
+        }
+        /*
+            * Get hash table of column names and column indices in source table.
+        */
+        Hashtable<String, Integer> sourceColumnNameHashtable = new Hashtable<String, Integer>(
+);
+        for (int i = startIndex; i < sourceTable.getHeader().size(); i++)
+        {
+            Column srcc = sourceTable.getHeader().get(i);
+            String sourceColumnName = srcc.getValue();
+            if (sourceColumnName != null)
+            {
+                // Add source column name to hash table.
+                sourceColumnNameHashtable.put(sourceColumnName, new Integer(i));
+                log
+                .debug("i = " + i + " sourceColumnNameHashtable.get(" + sourceColumnName + ").intValue() = " + sourceColumnNameHashtable
+                .get(sourceColumnName).intValue());
+            }
+        }
+        /*
+            * For column startIndex and upwards, only keep source columns for
+            * columns existing in both source and template tables. Add empty
+            * columns for columns unique to template table.
+        */
+        Table tmpTable = new Table("TemporaryTable");
+        // Add columns up to startIndex.
+        for (int i = 0; i < startIndex; i++)
+        {
+            Column column = sourceTable.getHeader().get(i);
+            tmpTable.add(column);
+            log
+            .debug("i = " + i + " column \"" + column.getValue() + "\" copied.");
+        }
+        /*
+            * For column startIndex and upwards, add empty columns if necessary.
+        */
+        for (int i = startIndex; i < templateTable.getHeader().size(); i++)
+        {
+            Column c = templateTable.getHeader().get(i);
+            // Only add visible columns in template table
+            if (!c.isVisible())
+            {
+                continue;
+            }
+            // Check if corresponding source table column exists, if any.
+            String templateColumnName = c.getValue();
+            if (sourceColumnNameHashtable.containsKey(templateColumnName))
+            {
+                // Source table column OK
+                int sourceColumnIndex = sourceColumnNameHashtable.get(
+                templateColumnName).intValue();
+                Column column = sourceTable.getHeader().get(sourceColumnIndex);
+                // If initial Id column, remove column name
+                if (i == 0 && column.getValue().equals("Id"))
+                {
+                    column.setValue("");
+                }
+                tmpTable.add(column);
+                log
+                .debug("i = " + i + " templateColumnName = \"" + templateColumnName + "\" column \"" + column
+                .getValue() + "\" inserted.");
+            }
+            else
+            {
+                // Add new column for template column not in source table
+                Column column = new Column(templateColumnName);
+                // If initial Id column, remove column name
+                if (i == 0 && column.getValue().equals("Id"))
+                {
+                    column.setValue("");
+                }
+                tmpTable.add(column);
+                log
+                .debug("i = " + i + " templateColumnName = \"" + templateColumnName + "\" new column \"" + column
+                .getValue() + "\" inserted.");
+            }
+        }
+        // Return adapted source header.
+        return tmpTable.getHeader();
+    }
+    /**
+        * Adapts a table row for source items so it fits in a table for template
+        * items. The tables for source and template items are used to find what
+        * cells in the source row are applicable in the template table. This is
+        * done by checking the names for each column. A column in the template
+        * table that has a corresponding column in the source table will have the
+        * source cell inserted, otherwise an empty cell. Columns unique to the
+        * source table will not trigger insertion of a cell.
+        *
+        * @param row Row Input row from source table to be adapted.
+        * @param startIndex int Index for first column to check
+        * @param templateTable Table Table for template items
+        * @param sourceTable Table Table for source items
+        * @return Row Output row for source item, modified to fit into template
+        *         table.
+    */
+    @SuppressWarnings("unchecked")
+    private Row adaptTableRow(Row row, int startIndex, Table templateTable,
+    Table sourceTable)
+    {
+        if (startIndex >= row.getCells().size())
+        {
+            // No cells to adapt, return input row.
+            return row;
+        }
+        /*
+            * Get hash table of column names and column indices in source table.
+        */
+        Hashtable<String, Integer> sourceColumnNameHashtable = new Hashtable<String, Integer>(
+);
+        for (int i = startIndex; i < sourceTable.getHeader().size(); i++)
+        {
+            Column srcc = sourceTable.getHeader().get(i);
+            String sourceColumnName = srcc.getValue();
+            if (sourceColumnName != null)
+            {
+                // Add source column name to hash table.
+                sourceColumnNameHashtable.put(sourceColumnName, new Integer(i));
+                log
+                .debug("i = " + i + " sourceColumnNameHashtable.get(" + sourceColumnName + ").intValue() = " + sourceColumnNameHashtable
+                .get(sourceColumnName).intValue());
+            }
+        }
+        /*
+            * For column startIndex and upwards, only keep source cells for columns
+            * existing in both source and template tables. Add empty cells for
+            * columns unique to template table.
+        */
+        ArrayList<Cell<?>> cellList = new ArrayList<Cell<?>>(0);
+        // Add cells up to startIndex.
+        for (int i = 0; i < startIndex; i++)
+        {
+            Cell<?> cell = row.getCells().get(i);
+            cellList.add(cell);
+            log
+            .debug("New row i = " + i + " cell value \"" + cell.getValue() + "\" copied.");
+        }
+        /*
+            * For column startIndex and upwards, add empty cells if necessary.
+        */
+        Cell emptyCell = new Cell<String>(null);
+        for (int i = startIndex; i < templateTable.getHeader().size(); i++)
+        {
+            Column c = templateTable.getHeader().get(i);
+            // Only add visible columns in template table
+            if (!c.isVisible())
+            {
+                continue;
+            }
+            // Check if corresponding source table cell exists, if any.
+            String templateColumnName = c.getValue();
+            if (sourceColumnNameHashtable.containsKey(templateColumnName))
+            {
+                // Source table cell OK
+                int sourceCellIndex = sourceColumnNameHashtable.get(
+                templateColumnName).intValue();
+                Cell<?> cell = row.getCells().get(sourceCellIndex);
+                cellList.add(cell);
+                log
+                .debug("New row i = " + i + " templateColumnName = \"" + templateColumnName + "\" cell value \"" + cell
+                .getValue() + "\" inserted.");
+            }
+            else
+            {
+                // Add empty cell for template column not in source table
+                cellList.add(emptyCell);
+                log
+                .debug("New row i = " + i + " templateColumnName = \"" + templateColumnName + "\" empty cell inserted.");
+            }
+        }
+        // Construct adapted source row.
+        row.setCells(cellList);
+        return row;
+    }
+    /**
+        * Convenience method for fetching the
+        * table update button clicked flag.
+        *
+        * @return boolean The table update button clicked flag.
+    */
+    private boolean fetchTableUpdateButtonClickedFlag()
+    {
+        // Get table update button clicked flag
+        boolean tableUpdateButtonClicked = false;
+        Boolean tableUpdateButtonClickedFlagFromRequest = false;
+        try
+        {
+            tableUpdateButtonClickedFlagFromRequest = getValidBoolean(VTABLEUPDATEBUTTONCLICKED);
+            if (tableUpdateButtonClickedFlagFromRequest == null)
+            {
+                tableUpdateButtonClicked = false;
+            }
+            else
+            {
+                tableUpdateButtonClicked = tableUpdateButtonClickedFlagFromRequest;
+            }
+        }
+        catch (Exception e)
+        {
+            log.debug("Exception when trying to get valid parameter VTABLEUPDATEBUTTONCLICKED: " + e);
+        }
+        log.debug("tableUpdateButtonClickedFlagFromRequest = " + tableUpdateButtonClickedFlagFromRequest + " tableUpdateButtonClicked = " + tableUpdateButtonClicked);
+        //
+        log.debug("tableUpdateButtonClicked = " + tableUpdateButtonClicked);
+        return tableUpdateButtonClicked;
+    }
+}

trunk/client/servlet/src/org/proteios/action/project/UploadDemoFiles.java

-                      r3626
+                      r3899
 /*
+ $Id$
+ Copyright (C) 2007 Fredrik Levander, 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) 2007 Fredrik Levander, Gregory Vincic, Olle Mansson
+    Copyright (C) 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.action.project;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import org.proteios.Context;
+import org.proteios.ContextEnabled;
+import org.proteios.FileContext;
 import org.proteios.action.ProteiosAction;
 import org.proteios.core.DbControl;
 …
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
-import java.net.MalformedURLException;
-import java.net.URL;
 /**
+ * Uploads a set of files for demonstration purposes.
+ *
+ * @author gregory
+ */
+    Uploads a set of files for demonstration purposes.
+*/
 public class UploadDemoFiles
+    extends ProteiosAction<UploadDemoFiles>
+extends ProteiosAction<UploadDemoFiles>
+implements ContextEnabled
+{
+  private static final String root = "http://www.proteios.org/trac/downloads/demoProjectFiles/";
+  private ItemFactory factory = null;
+  private DbControl dc = null;
+  @Override
+  protected void runMe()
+      throws ActionException, InvalidParameterValue
+  {
+    dc = newDbControl();
+    Project project = isProjectActive(dc);
+    factory = new ItemFactory(dc);
+    /***********************************************************************
+     * Upload some files
+     */
+    Directory projectDir = project.getProjectDirectory();
+    // Project directories get the name of the project
+    addRobotFiles(projectDir);
+    addMascotFiles(projectDir);
+    addPeakListFiles(projectDir);
+    //
+    setMessage("Demo files uploaded");
+    dc.commit();
+  }
+  /**
+   * @param dc
+   * @param parentDir
+   * @throws ActionException
+   */
+  private void addPeakListFiles(Directory parentDir)
+      throws ActionException
+  {
+    Directory dir = factory.create(Directory.class);
+    dir.setParent(parentDir);
+    dir.setName("Peaklist files");
+    dc.saveItem(dir);
+    FileType fileType = factory.getById(FileType.class, SystemItems
+      .getId(FileType.MZDATA));
+    uploadFile(dir, "qtof_A2.xml", fileType);
+    uploadFile(dir, "qtof_A3.xml", fileType);
+  }
+  /**
+   * @param dc
+   * @param parentDir
+   * @throws ActionException
+   */
+  private void addMascotFiles(Directory parentDir)
+      throws ActionException
+  {
+    ItemFactory factory = new ItemFactory(dc);
+    Directory dir = factory.create(Directory.class);
+    dir.setParent(parentDir);
+    dir.setName("Mascot files");
+    dc.saveItem(dir);
+    FileType fileType = factory.getById(FileType.class, SystemItems
+      .getId(FileType.MASCOT_XML));
+    uploadFile(dir, "result1.xml", fileType);
+    uploadFile(dir, "result2.xml", fileType);
+  }
+  /**
+   * @param dc
+   * @param parentDir
+   * @throws ActionException
+   */
+  private void addRobotFiles(Directory parentDir)
+      throws ActionException
+  {
+    ItemFactory factory = new ItemFactory(dc);
+    Directory dir = factory.create(Directory.class);
+    dir.setParent(parentDir);
+    dir.setName("Robot result files");
+    dc.saveItem(dir);
+    FileType fileType = factory.getById(FileType.class, SystemItems
+      .getId(FileType.SHW_RESULT));
+    uploadFile(dir, "robotResult.xml", fileType);
+  }
+  private void uploadFile(Directory dir, String fileName, FileType type)
+      throws ActionException
+  {
+    URL fileUrl = getFile(fileName);
+    File file = factory.create(File.class);
+    file.setDirectory(dir);
+    file.setName(fileName);
+    file.setDescription("Use external plate id 18115042KAISA4 to import");
+    file.setFileType(type);
+    try
+    {
+      dc.saveItem(file);
+      file.upload(fileUrl.openStream(), false);
+      dc.saveItem(file);
+    }
+    catch (Exception e)
+    {
+      throw new ActionException(e);
+    }
+  }
+  private URL getFile(String fileName)
+      throws ActionException
+  {
+    try
+    {
+      return new URL(root + fileName);
+    }
+    catch (MalformedURLException e)
+    {
+      throw new ActionException(e);
+    }
+  }
+    private static final String root = "http://www.proteios.org/trac/downloads/demoProjectFiles/";
+    private ItemFactory factory = null;
+    private DbControl dc = null;
+    @Override
+    protected void runMe() throws ActionException, InvalidParameterValue
+    {
+        dc = newDbControl();
+        Project project = isProjectActive(dc);
+        Directory projectDir = project.getProjectDirectory();
+        factory = getItemFactory(dc);
+        // Project directories get the name of the project
+        addRobotFiles(projectDir);
+        addMascotFiles(projectDir);
+        addPeakListFiles(projectDir);
+        setMessage("Demo files uploaded");
+        dc.commit();
+    }
+    private void addPeakListFiles(Directory parentDir) throws ActionException
+    {
+        Directory dir = factory.create(Directory.class);
+        dir.setParent(parentDir);
+        dir.setName("Peaklist files");
+        dc.saveItem(dir);
+        FileType fileType = factory.getById(FileType.class, SystemItems
+        .getId(FileType.MZDATA));
+        uploadFile(dir, "qtof_A2.xml", fileType);
+        uploadFile(dir, "qtof_A3.xml", fileType);
+    }
+    private void addMascotFiles(Directory parentDir) throws ActionException
+    {
+        Directory dir = factory.create(Directory.class);
+        dir.setParent(parentDir);
+        dir.setName("Mascot files");
+        dc.saveItem(dir);
+        FileType fileType = factory.getById(FileType.class, SystemItems
+        .getId(FileType.MASCOT_XML));
+        uploadFile(dir, "result1.xml", fileType);
+        uploadFile(dir, "result2.xml", fileType);
+    }
+    private void addRobotFiles(Directory parentDir) throws ActionException
+    {
+        Directory dir = factory.create(Directory.class);
+        dir.setParent(parentDir);
+        dir.setName("Robot result files");
+        dc.saveItem(dir);
+        FileType fileType = factory.getById(FileType.class, SystemItems
+        .getId(FileType.SHW_RESULT));
+        uploadFile(dir, "robotResult.xml", fileType);
+    }
+    private void uploadFile(Directory dir, String fileName, FileType type) throws ActionException
+    {
+        URL fileUrl = getFile(fileName);
+        File file = factory.create(File.class);
+        file.setDirectory(dir);
+        file.setName(fileName);
+        file.setDescription("Use external plate id 18115042KAISA4 to import");
+        file.setFileType(type);
+        try
+        {
+            dc.saveItem(file);
+            file.upload(fileUrl.openStream(), false);
+            dc.saveItem(file);
+        }
+        catch (Exception e)
+        {
+            throw new ActionException(e);
+        }
+    }
+    private URL getFile(String fileName) throws ActionException
+    {
+        try
+        {
+            return new URL(root + fileName);
+        }
+        catch (MalformedURLException e)
+        {
+            throw new ActionException(e);
+        }
+    }
+    public List<Context> listContexts()
+    {
+        List<Context> contexts = new ArrayList<Context>(1);
+        /*
+            We want our action to appear as an extension when viewing files. Do
+            this by adding a FileContext to the list of contexts.
+        */
+        FileContext files = new FileContext("UploadDemoFiles",
+        "Upload demo files",
+        UploadDemoFiles.class);
+        contexts.add(files);
+        return contexts;
+    }
+}

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 3899

Legend:

trunk/client/servlet/src/org/proteios/action/directory/ViewActiveDirectory.java

trunk/client/servlet/src/org/proteios/action/project/UploadDemoFiles.java

Download in other formats: