Subversion Repositories DevTools

Index: data/src/java/com/nuix/swing/filechooser/JFileChooserFactory.java

===================================================================

--- data/src/java/com/nuix/swing/filechooser/JFileChooserFactory.java	(revision 2561)

+++ data/src/java/com/nuix/swing/filechooser/JFileChooserFactory.java	(working copy)

@@ -36,6 +36,20 @@

     // Methods

     /**

+     * Convenience method to get the last directory for a given state key,

+     * without wasting time creating the file chooser itself.

+     *

+     * @param stateKey the key to use for storing the state.

+     * @return the last directory.

+     */

+    public static File getLastDirectory(String stateKey)

+    {

+        String value = prefs.get(stateKey, null);

+        return value == null ? null : new File(value);

+    }

+

+

+    /**

      * Gets a reference to the file chooser, preconfigured to the appropriate

      * state.

      * 

@@ -61,10 +75,10 @@

         });

         // Reset some of the chooser's properties to the defaults.

-        String lastDirectory = prefs.get(stateKey, null);

+        File lastDirectory = getLastDirectory(stateKey);

         if (lastDirectory != null)

         {

-            chooser.setCurrentDirectory(new File(lastDirectory));

+            chooser.setCurrentDirectory(lastDirectory);

         }

         return chooser;

Index: data/src/java/com/nuix/swing/widgets/FileChooserField.java

===================================================================

--- data/src/java/com/nuix/swing/widgets/FileChooserField.java	(revision 2561)

+++ data/src/java/com/nuix/swing/widgets/FileChooserField.java	(working copy)

@@ -150,6 +150,7 @@

         int buttonHeight = fileTextField.getPreferredSize().height +

                            (textFieldInsets.top + textFieldInsets.bottom) / 2;

         browseButton.setMargin(textFieldInsets);

+        //noinspection SuspiciousNameCombination

         browseButton.setPreferredSize(new Dimension(buttonHeight, buttonHeight));

         browseButton.addActionListener(new ActionListener()

         {

@@ -179,6 +180,16 @@

     // Methods

     /**

+     * Gets the initial directory.

+     *

+     * @return the initial directory.

+     */

+    public File getInitialDirectory()

+    {

+        return JFileChooserFactory.getLastDirectory(directoryStateKey);

+    }

+

+    /**

      * Tests if the input for this field is valid.  The input is valid if the file

      * passes the checks put in place by the file checker.

      *

Index: data/src/java/com/nuix/data/EvidenceInfo.java

===================================================================

--- data/src/java/com/nuix/data/EvidenceInfo.java	(revision 2561)

+++ data/src/java/com/nuix/data/EvidenceInfo.java	(working copy)

@@ -1,31 +1,31 @@

 package com.nuix.data;

-import com.nuix.investigator.cases.CaseEvidence;

-import com.nuix.investigator.cases.CaseUtils;

-import com.nuix.util.FileUtils;

-import com.nuix.log.Channel;

-import com.nuix.log.ChannelManager;

-import com.nuix.product.LicencingException;

-import com.nuix.product.Licence;

-import com.nuix.data.email.PstFileData;

-import com.nuix.data.email.DbxEmailFileData;

-import com.nuix.data.email.MbxEmailFileData;

-import com.nuix.data.email.NsfFileData;

-import com.nuix.data.email.MboxFileData;

-import com.nuix.data.email.EmlFileData;

-import com.nuix.data.email.ImapPopAccountData;

-

+import java.io.File;

+import java.io.IOException;

 import java.net.URI;

 import java.net.URISyntaxException;

+import java.util.ArrayList;

 import java.util.List;

-import java.util.ArrayList;

-import java.io.File;

-import java.io.IOException;

 import org.jdom.Document;

+import org.jdom.Element;

 import org.jdom.Namespace;

-import org.jdom.Element;

+import com.nuix.data.email.DbxEmailFileData;

+import com.nuix.data.email.EmlFileData;

+import com.nuix.data.email.ImapPopAccountData;

+import com.nuix.data.email.MboxFileData;

+import com.nuix.data.email.MbxEmailFileData;

+import com.nuix.data.email.NsfFileData;

+import com.nuix.data.email.PstFileData;

+import com.nuix.investigator.cases.CaseEvidence;

+import com.nuix.investigator.cases.CaseUtils;

+import com.nuix.log.Channel;

+import com.nuix.log.ChannelManager;

+import com.nuix.product.Licence;

+import com.nuix.product.LicencingException;

+import com.nuix.util.FileUtils;

+

 /**

  * Container class to hold the data required for a evidence group.

  */

@@ -57,6 +57,11 @@

         ChannelManager.getChannel("INVESTIGATOR.EvidenceGroup");

     /**

+     * Will be set to {@code true} later when the evidence is saved to disk.

+     */

+    private boolean saved;

+

+    /**

      * The {@link URI} instance encapsulated in this evidence group.

      */

     private List<URI> contents;

@@ -93,9 +98,15 @@

      * if it already existed in the set and hence wasn't added.

      * @throws LicencingException if the licence for the application does not

      *         permit the data to be processed.

+     * @throws IllegalStateException if this evidence is already saved to disk.

      */

     public boolean addURI(URI dataURI)

     {

+        if (saved)

+        {

+            throw new IllegalStateException("Cannot add URI to a saved evidence folder");

+        }

+

         // If general data is not enabled, we will potentially need to check

         // the type of the data.

         if (!Licence.getInstance().isEnabled(GENERAL_DATA_FEATURE_NAME))

@@ -136,11 +147,18 @@

     }

     /**

-     * Remove an {@link URI} from the set.

+     * Remove a {@link URI} from the set.

+     *

      * @param dataURIToRemove The {@link URI} to remove. 

+     * @throws IllegalStateException if this evidence is already saved to disk.

      */

     public void removeURI(URI dataURIToRemove)

     {

+        if (saved)

+        {

+            throw new IllegalStateException("Cannot remove URI from a saved evidence folder");

+        }

+

         contents.remove(dataURIToRemove);

     }

@@ -156,9 +174,16 @@

     /**

      * Clear out the contents of this EvidenceInfo instance.

+     *

+     * @throws IllegalStateException if this evidence is already saved to disk.

      */

     public void clearContents()

     {

+        if (saved)

+        {

+            throw new IllegalStateException("Cannot clear a saved evidence folder");

+        }

+

         contents.clear();

     }

@@ -174,6 +199,7 @@

     /**

      * Get the name of this set of evidence.

+     *

      * @return String The name of the evidence.

      */

     public String getName()

@@ -183,15 +209,23 @@

     /**

      * Set the name of the evidence.

+     *

      * @param name The name of the evidence.

+     * @throws IllegalStateException if this evidence is already saved to disk.

      */

     public void setName(String name)

     {

+        if (saved)

+        {

+            throw new IllegalStateException("Cannot set name on a saved evidence folder");

+        }

+

         this.name = name;

     }

     /**

      * Get the description associated with this set of evidence.

+     *

      * @return String the description.

      */

     public String getDescription()

@@ -201,14 +235,32 @@

     /**

      * Set the description of this evidence set.

+     *

      * @param description The description.

+     * @throws IllegalStateException if this evidence is already saved to disk.

      */

     public void setDescription(String description)

     {

+        if (saved)

+        {

+            throw new IllegalStateException("Cannot set description on a saved evidence folder");

+        }

+

         this.description = description;

     }

     /**

+     * Checks if this evidence has already been saved to disk.  If it is saved to disk

+     * already then attempts to modify it will fail.

+     *

+     * @return {@code true} if this evidence has been saved to disk, {@code false} otherwise.

+     */

+    public boolean isSaved()

+    {

+        return saved;

+    }

+

+    /**

      * Indicates whether some other object is "equal to" this one.

      *

      * @param obj the reference object with which to compare.

@@ -290,6 +342,8 @@

         try

         {

             CaseUtils.saveXml(xmlDoc, xmlFile);

+

+            saved = true;

         }

         catch (IOException e)

         {

@@ -341,6 +395,8 @@

                     contents.add(new URI(uriStr));

                 }

             }

+

+            saved = true;

         }

         catch (URISyntaxException e)

         {

Index: data/src/java/com/nuix/investigator/MainWindow.java

===================================================================

--- data/src/java/com/nuix/investigator/MainWindow.java	(revision 2561)

+++ data/src/java/com/nuix/investigator/MainWindow.java	(working copy)

@@ -9,7 +9,6 @@

 import java.awt.event.WindowEvent;

 import java.beans.PropertyChangeEvent;

 import java.beans.PropertyChangeListener;

-import java.util.List;

 import javax.swing.BorderFactory;

 import javax.swing.JFrame;

@@ -19,26 +18,24 @@

 import com.nuix.investigator.actions.file.ExitAction;

 import com.nuix.investigator.browser.BrowserPanel;

 import com.nuix.investigator.cases.Case;

-import com.nuix.investigator.cases.CaseEvidence;

 import com.nuix.investigator.cases.CaseHistoryDetail;

+import com.nuix.investigator.cases.CommonMetadata;

 import com.nuix.investigator.cases.ModifyCaseEvidencePane;

-import com.nuix.investigator.cases.CaseFactory;

-import com.nuix.investigator.cases.CommonMetadata;

-import com.nuix.investigator.cases.event.StatusBarLoadingAdapter;

+import com.nuix.investigator.cases.creation.AddLoadableEvidencePane;

 import com.nuix.investigator.history.HistoryRecord;

 import com.nuix.investigator.images.ImageFactory;

+import com.nuix.investigator.options.global.GlobalPreferences;

 import com.nuix.investigator.processing.ProcessingRunner;

 import com.nuix.investigator.search.SearchPanel;

-import com.nuix.investigator.options.global.GlobalPreferences;

 import com.nuix.log.Channel;

 import com.nuix.log.ChannelManager;

+import com.nuix.resources.ResourceFactory;

 import com.nuix.resources.ResourceGroup;

-import com.nuix.resources.ResourceFactory;

+import com.nuix.swing.context.ContextContainer;

+import com.nuix.swing.context.ContextTracker;

+import com.nuix.swing.context.JTabbedPaneContextHelper;

 import com.nuix.swing.widgets.JAutotitleTabbedPane;

 import com.nuix.swing.widgets.JStatusBar;

-import com.nuix.swing.context.ContextTracker;

-import com.nuix.swing.context.ContextContainer;

-import com.nuix.swing.context.JTabbedPaneContextHelper;

 /**

  * The main window of the application.

@@ -210,31 +207,26 @@

                         HistoryRecord.Type.SESSION, HistoryRecord.Point.START,

                         new CaseHistoryDetail(this.currentCase.getLocation())));

-                // Start with the processing if the previous run was not completed.

-                // Otherwise, start with a search panel.

-                // XXX: Come up with a better idea for detecting that there's work to be done.

-                ProcessingRunner runner = null;

-                List<CaseEvidence> evidenceSet = this.currentCase.getEvidenceSet();

-                if (evidenceSet.isEmpty())

+                if (this.currentCase.isCompound())

                 {

-                    new ModifyCaseEvidencePane(getCurrentCase()).showDialog(this);

+                    // If a compound case has no simple cases added to it, we prompt the

+                    // user to choose some simple cases to add.

+                    if (this.currentCase.isEmpty())

+                    {

+                        new ModifyCaseEvidencePane(this.currentCase).showDialog(this);

+                    }

+

+                    loadingCompleted();

                 }

-                else if (evidenceSet.size() == 1)

+                else

                 {

-                    runner = new ProcessingRunner(this, evidenceSet.get(0));

-                    if (runner.hasWork())

+                    // If a simple case has no evidence loaded in it, we prompt the user to load some.

+                    if (this.currentCase.isEmpty())

                     {

-                        runner.run();

+                        new AddLoadableEvidencePane(this.currentCase).showDialog(this);

                     }

-                    else

-                    {

-                        runner = null;

-                    }

-                }

-                if (runner == null)

-                {

-                    loadingCompleted();

+                    maybeLoadEvidence();

                 }

             }

@@ -244,6 +236,26 @@

     }

     /**

+     * Checks if there is any evidence yet to be loaded in the current case,

+     * and loads it if there is.

+     */

+    public void maybeLoadEvidence()

+    {

+        // Either the user just added evidence, or there was already evidence.

+        // Now complete any processing work that has to be done.

+        // XXX: Come up with a better idea for detecting that there's work to be done.

+        ProcessingRunner runner = new ProcessingRunner(this, this.currentCase.getEvidenceSet().get(0));

+        if (runner.hasWork())

+        {

+            runner.run();

+        }

+        else

+        {

+            loadingCompleted();

+        }

+    }

+

+    /**

      * Called when loading completes.

      * <p>

      * Populates the initial tabs in the main window and refreshes the case in case

Index: data/src/java/com/nuix/investigator/cases/CaseContentTreeModel.java

===================================================================

--- data/src/java/com/nuix/investigator/cases/CaseContentTreeModel.java	(revision 2561)

+++ data/src/java/com/nuix/investigator/cases/CaseContentTreeModel.java	(working copy)

@@ -1,18 +1,19 @@

 package com.nuix.investigator.cases;

+import java.net.URI;

+import java.util.ArrayList;

+import java.util.List;

+

+import javax.swing.event.EventListenerList;

+import javax.swing.event.TreeModelEvent;

+import javax.swing.event.TreeModelListener;

+import javax.swing.tree.TreeModel;

+import javax.swing.tree.TreePath;

+

 import com.nuix.data.EvidenceInfo;

 import com.nuix.log.Channel;

 import com.nuix.log.ChannelManager;

-import javax.swing.tree.TreeModel;

-import javax.swing.tree.TreePath;

-import javax.swing.event.TreeModelListener;

-import javax.swing.event.TreeModelEvent;

-import javax.swing.event.EventListenerList;

-import java.util.List;

-import java.util.ArrayList;

-import java.net.URI;

-

 /**

  * An implementation of TreeModel to capture the evidence structure for a case.

  */ 

@@ -148,14 +149,30 @@

     {

         if (parent == ROOT_NODE)

         {

-            return roots.indexOf(child);

+            if (child instanceof EvidenceInfo)

+            {

+                //noinspection SuspiciousMethodCalls

+                return roots.indexOf(child);

+            }

+            else

+            {

+                return -1;

+            }

         }

         else if (parent instanceof EvidenceInfo)

         {

-            EvidenceInfo evidenceInfo = (EvidenceInfo) parent;

-            // Get the child.

-            List<URI> contents = evidenceInfo.getContents();

-            return contents.indexOf(child);

+            if (child instanceof URI)

+            {

+                EvidenceInfo evidenceInfo = (EvidenceInfo) parent;

+                // Get the child.

+                List<URI> contents = evidenceInfo.getContents();

+                //noinspection SuspiciousMethodCalls

+                return contents.indexOf(child);

+            }

+            else

+            {

+                return -1;

+            }

         }

         return -1;

@@ -258,6 +275,8 @@

     /**

      * Get all the EvidenceInfo instances in the tree.

+     *

+     * @return the list of evidence roots.

      */ 

     public List<EvidenceInfo> getEvidence()

     {

Index: data/src/java/com/nuix/investigator/cases/Case.java

===================================================================

--- data/src/java/com/nuix/investigator/cases/Case.java	(revision 2561)

+++ data/src/java/com/nuix/investigator/cases/Case.java	(working copy)

@@ -33,7 +33,6 @@

 import com.nuix.store.user.DefaultSession;

 import com.nuix.store.user.Session;

 import com.nuix.util.FileUtils;

-import com.nuix.util.WrappedIOException;

 /**

  * A case, which has a number of properties as well as a number of loaded files.

@@ -163,6 +162,32 @@

     }

     /**

+     * <p>Convenience method for detecting whether this case is empty.  In the case of a simple

+     * case this means no evidence is loaded.  In the case of a compound case, this means no

+     * simple cases are added to it.</p>

+     *

+     * <p>The situation of a compound case composed of multiple empty simple cases is considered

+     * to not be empty.</p>

+     *

+     * @return {@code true} if the case is empty, {@code false} otherwise.

+     */

+    public boolean isEmpty()

+    {

+        if (isCompound())

+        {

+            return evidenceSet.isEmpty();

+        }

+        else

+        {

+            // TODO: Do we consider it to have data if there is work on the queue?

+            // We might want a more convenient way to determine that there is work on the queue.

+            // e.g., can we make it so if the directory exists, there is definitely work to be done?

+

+            return getEvidenceSet().get(0).getItemCount() == 0;

+        }

+    }

+

+    /**

      * Gets the count of the total number of items in the case.

      *

      * @return the number of items in the case.

@@ -402,7 +427,7 @@

         }

         catch (SQLException e)

         {

-            throw new WrappedIOException("Error creating initial schema for analysis database", e);

+            throw new IOException("Error creating initial schema for analysis database", e);

         }

         container.registerComponentInstance(Database.class, database);

@@ -413,7 +438,7 @@

         }

         catch (MigrationException e)

         {

-            throw new WrappedIOException("Error initialising stores", e);

+            throw new IOException("Error initialising stores", e);

         }

         save();

Index: data/src/java/com/nuix/investigator/cases/cases.xml

===================================================================

--- data/src/java/com/nuix/investigator/cases/cases.xml	(revision 2561)

+++ data/src/java/com/nuix/investigator/cases/cases.xml	(working copy)

@@ -5,6 +5,142 @@

 - Resources for the wizards.

 -->

 <Resources>

+    <Group name="AddLoadableEvidencePane">

+        <String name="Title" value="Add Case Evidence"/>

+

+        <String name="Text" value="Please choose the files and directories you wish to load into this case."/>

+

+        <String name="Add" value="Add..."/>

+        <String name="Remove" value="Remove"/>

+        <String name="Edit" value="Edit..."/>

+        <String name="EvidencePrefix" value="Evidence {0}"/>

+        <String name="EvidenceNameFormat" value="{0} ({1})"/>

+        <String name="EvidenceNameFormatNoDescription" value="{0}"/>

+

+        <Group name="MustSpecifyUniqueName">

+            <String name="Title" value="Evidence Name Already Exists"/>

+            <String name="Text" value="&lt;html&gt;

+                You must specify a unique evidence name.

+                </html>"/>

+        </Group>

+

+        <Group name="MustAddContent">

+            <String name="Title" value="Missing User Input"/>

+            <String name="Text" value="&lt;html&gt;

+                You must add at least one file or directory before progressing<br>

+                to the next page.

+                </html>"/>

+        </Group>

+    </Group>

+

+    <Group name="EvidenceInputPane">

+        <String name="Add" value="Add..."/>

+        <String name="AddFile" value="Add File..."/>

+        <String name="AddDirectory" value="Add Directory..."/>

+        <String name="AddMailStore" value="Add Mail Store..."/>

+        <String name="Remove" value="Remove"/>

+        <String name="EvidenceInput" value="Add/Edit Evidence"/>

+        <String name="Content" value="Content:"/>

+        <String name="EvidenceName" value="Evidence name:"/>

+        <String name="EvidenceComments" value="Comments:"/>

+        <String name="DirectoryTitle" value="Add Directory(s)"/>

+        <String name="FileTitle" value="Add File(s)"/>

+

+        <Group name="NonexistentFile">

+            <String name="Title" value="Nonexistent File"/>

+            <String name="Text" value="&lt;html&gt;

+                The file you have chosen does not exist:<br>

+                {0}

+                </html>"/>

+        </Group>

+

+        <Group name="NonexistentDirectory">

+            <String name="Title" value="Nonexistent Directory"/>

+            <String name="Text" value="&lt;html&gt;

+                The directory you have chosen does not exist:<br>

+                {0}

+                </html>"/>

+        </Group>

+

+        <Group name="MustAddEvidence">

+            <String name="Title" value="Missing User Input"/>

+            <String name="Text" value="&lt;html&gt;

+                You must add at least one file or directory before progressing.

+                </html>"/>

+        </Group>

+

+        <Group name="MustSpecifyName">

+            <String name="Title" value="Missing Evidence Name"/>

+            <String name="Text" value="&lt;html&gt;

+                You must specify the evidence name before progressing.

+                </html>"/>

+        </Group>

+

+        <Group name="RestrictedFile">

+            <String name="Title" value="Restricted File"/>

+            <String name="Text" value="&lt;html&gt;

+                The file you have chosen cannot be loaded due to restrictions<br>

+                in your software licence:<br>

+                {0}

+                <p>

+                To remove this restriction, please contact &CompanyNameShort; to obtain a full licence.

+                </html>"/>

+        </Group>

+

+        <Group name="SomeItemsNotAddedDueToLimit">

+            <String name="Title" value="Some Items Not Added"/>

+            <String name="Text" value="&lt;html&gt;

+                Some items were not added due to the file limit of {0} permitted by your licence.

+                <p>

+                To remove this limit, please contact &CompanyNameShort; to obtain a full licence.

+                </html>"/>

+        </Group>

+

+        <Group name="Duplicate">

+            <String name="Title" value="Duplicate entry"/>

+            <String name="Text" value="&lt;html&gt;

+                The item you selected was already in the list.

+                </html>"/>

+        </Group>

+

+        <Group name="Duplicates">

+            <String name="Title" value="Duplicate entries"/>

+            <String name="Text" value="&lt;html&gt;

+                {0} of the items you selected {0,choice,1#was|1<were} already in the list.

+                </html>"/>

+        </Group>

+    </Group>

+

+    <Group name="MailStoreInputPane">

+        <String name="Title" value="Add Mail Store"/>

+

+        <!-- Fields -->

+        <String name="Protocol" value="Mail Store Type:"/>

+        <String name="Host" value="Server Hostname:"/>

+        <String name="Port" value="Server Port:"/>

+        <String name="Username" value="Username:"/>

+        <String name="Password" value="Password:"/>

+

+        <!-- Protocols -->

+        <String name="PleaseSelect" value="Please select:"/>

+        <String name="pop" value="POP"/>

+        <String name="imap" value="IMAP"/>

+

+        <!-- Errors -->

+        <Group name="FieldsNotComplete">

+            <String name="Title" value="Missing User Input"/>

+            <String name="Text" value="&lt;html&gt;

+                You must fill in all fields.

+                </html>"/>

+        </Group>

+        <Group name="FieldsInvalid">

+            <String name="Title" value="Invalid User Input"/>

+            <String name="Text" value="&lt;html&gt;

+                Some of the fields you entered are invalid.

+                </html>"/>

+        </Group>

+    </Group>

+    

     <Group name="ModifyCaseEvidencePane">

         <String name="Title" value="Add Case Evidence"/>

         <String name="Text" value="&lt;html&gt;

@@ -102,4 +238,142 @@

         <String name="Evidence.DatabaseReadOnly"

                 value="Database is read-only.  Annotations will be viewable but not editable, and history will not be recorded."/>

     </Group>

+

+    <Group name="NewCasePane">

+        <String name="Title" value="New Case"/>

+

+        <String name="CaseSettings" value="Case settings"/>

+        <String name="TextProcessingSettings" value="Text processing settings"/>

+        <String name="OtherProcessingSettings" value="Other processing settings"/>

+    </Group>

+

+    <Group name="CaseSettingsPanel">

+        <String name="Name" value="Name:"/>

+        <String name="DefaultNameFormat" value="Case {0}"/>

+        <String name="Directory" value="Directory:"/>

+        <String name="Investigator" value="Investigator:"/>

+        <String name="Description" value="Description:"/>

+        <String name="Type" value="Case type:"/>

+        <String name="SimpleCase" value="Simple (contains loaded evidence)"/>

+        <String name="CompoundCase" value="Compound (contains other cases)"/>

+

+

+        <Group name="MustEnterDirectory">

+            <String name="Title" value="Missing user input"/>

+            <String name="Text" value="&lt;html&gt;

+                You must enter a directory.

+                </html>"/>

+        </Group>

+

+        <Group name="RootNotPossible">

+            <String name="Title" value="Invalid user input"/>

+            <String name="Text" value="&lt;html&gt;

+                Case files cannot reside in the root of a hard drive.

+                <p>

+                Please choose a subdirectory.

+                </html>"/>

+        </Group>

+

+        <Group name="NoParentDirectory">

+            <String name="Title" value="Invalid user input"/>

+            <String name="Text" value="&lt;html&gt;

+                The directory you have entered is invalid because the parent<br>

+                directory does not exist.

+                </html>"/>

+        </Group>

+

+        <Group name="NotADirectory">

+            <String name="Title" value="Invalid user input"/>

+            <String name="Text" value="&lt;html&gt;

+                Ths file you have chosen is not a directory.

+                </html>"/>

+        </Group>

+

+        <Group name="DirectoryNotEmpty">

+            <String name="Title" value="Invalid user input"/>

+            <String name="Text" value="&lt;html&gt;

+                The directory you have entered contains files already.

+                <p>

+                Please choose an empty directory.

+                </html>"/>

+        </Group>

+

+        <Group name="FieldsNotComplete">

+            <String name="Title" value="Missing User Input"/>

+            <String name="Text" value="&lt;html&gt;

+                You must fill in the name and investigator fields.

+                </html>"/>

+        </Group>

+    </Group>

+

+    <Group name="TextProcessingSettingsPanel">

+        <String name="ProcessTextOption" value="Store and index text of data items"/>

+        <String name="ProcessTextOptionToolTip"

+                value="<html>

+                       Selecting this option will make the system store and index<br>

+                       text for each data item processed.  This will increase<br>

+                       processing time, and thus might be disabled if you know<br>

+                       in advance that you won't need to perform any text searching.

+                       </html>"/>

+        <String name="StopWordsPolicyLabel" value="Use Stop Words:"/>

+        <String name="StemmingPolicyLabel" value="Use Stemming:"/>

+    </Group>

+

+    <Group name="OtherProcessingSettingsPanel">

+        <String name="DeletedEmailsOption" value="Extract from slack space of email boxes"/>

+        <String name="DeletedEmailsOptionToolTip"

+                value="<html>

+                       Attempt to retrieve deleted emails located in the slack

+                       space of a mail box file. <br>This is applicable only with PST,

+                       OST, DBX and EDB/STM files.

+                       </html>"/>

+        <String name="StoreBinaryOption" value="Store binary of data items"/>

+        <String name="StoreBinaryOptionToolTip"

+                value="<html>

+                       Selecting this option will make the system store binary data<br>

+                       for each item processed.  This will speed up exports but increase<br>

+                       processing time and storage.

+                       </html>"/>

+        <String name="DirectAccessOption" value="Enable direct access to NSF email boxes"/>

+        <String name="DirectAccessOptionToolTip"

+                value="<html>

+                       Directly accessing NSF files results in access records<br>

+                       within the file being updated, which in turn modifies the file.<br>

+                       The internal data itself is unchanged.  Selecting this option<br>

+                       will ensure a copy of the mailbox is performed and processing<br>

+                       is done only on the copy, rather than the source data, at the<br>

+                       expense of more processing time.  If an NSF file is read-only,<br>

+                       a copy will be made irrespective of this setting.<br>

+                       </html>"/>

+        <String name="ExtractEmbeddedImagesOption" value="Extract embedded images"/>

+        <String name="ExtractEmbeddedImagesOptionToolTip"

+                value="<html>

+                      Extract images embedded in items such as Office documents.

+                      </html>"/>

+        <String name="CreateThumbnailsOption" value="Create thumbnails for image data items"/>

+        <String name="CreateThumbnailsOptionToolTip"

+                value="<html>

+                      Selecting this option will generate a thumbnail<br>

+                      image for each image data item detected.  This<br>

+                      will increase processing time, but will enable the<br>

+                      "Thumbnail" tabs within the analysis interface,<br>

+                      for quickly inspecting image data.<br>

+                      </html>"/>

+        <String name="DeduplicateDataOption" value="De-duplicate data"/>

+        <String name="DeduplicateDataOptionToolTip"

+                value="<html>

+                      Selecting this option will prevent duplicate data<br>

+                      items being processed more than once.<br>

+                      Instead their properties and content will be blank<br>

+                      and they will be marked as duplicates.<br>

+                      </html>"/>

+        <String name="SkinToneAnalysisOption" value="Skin tone analysis"/>

+        <String name="SkinToneAnalysisOptionToolTip"

+                value="<html>

+                      Selecting this option will perform skin-tone analysis<br>

+                      over all detected images.  Once the case evidence has<br>

+                      been loaded, the skin tone filter can be used to display<br>

+                      images with significant amount of skin tones present.<br>

+                      </html>"/>

+    </Group>

 </Resources>

Index: data/src/java/com/nuix/investigator/cases/creation/OtherProcessingSettingsPanel.java

===================================================================

--- data/src/java/com/nuix/investigator/cases/creation/OtherProcessingSettingsPanel.java	(revision 2511)

+++ data/src/java/com/nuix/investigator/cases/creation/OtherProcessingSettingsPanel.java	(working copy)

@@ -1,70 +1,40 @@

-package com.nuix.investigator.wizard.panels;

+package com.nuix.investigator.cases.creation;

-import com.nuix.resources.ResourceGroup;

-import com.nuix.swing.wizard.AbstractWizardPanel;

-import com.nuix.swing.wizard.AbstractWizardModel;

-import com.nuix.investigator.images.ImageFactory;

-import com.nuix.investigator.wizard.NewCaseWizardModel;

-import com.nuix.data.DataProcessingSettings;

-import com.nuix.store.index.settings.StopWordsPolicy;

-import com.nuix.store.index.settings.StemmingPolicy;

-import com.nuix.store.index.settings.TextIndexSettings;

-import com.nuix.store.index.settings.AbstractPolicy;

+import java.awt.GridBagConstraints;

+import java.awt.GridBagLayout;

+import java.awt.Insets;

+import java.awt.event.ActionEvent;

+import java.awt.event.ActionListener;

 import javax.swing.JCheckBox;

-import javax.swing.JLabel;

 import javax.swing.JPanel;

-import javax.swing.BoxLayout;

-import javax.swing.Box;

 import javax.swing.SwingUtilities;

-import javax.swing.BorderFactory;

-import javax.swing.JComboBox;

-import javax.swing.DefaultComboBoxModel;

-import java.awt.GridBagLayout;

-import java.awt.GridBagConstraints;

-import java.awt.Insets;

-import java.awt.Container;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

+import com.nuix.data.DataProcessingSettings;

+import com.nuix.resources.ResourceFactory;

+import com.nuix.resources.ResourceGroup;

 /**

- * Wizard step for specifying the data processing settings for each case.

+ * Panel for specifying other data processing settings.

  */

-public class CaseContentPropertiesPanel extends AbstractWizardPanel

+public class OtherProcessingSettingsPanel extends JPanel

 {

     ///////////////////////////////////////////////////////////////////////////

-    // Constants

-

-    ///////////////////////////////////////////////////////////////////////////

     // Fields

     /**

      * The resources for the panel.

      */

-    private ResourceGroup resources;

+    private ResourceGroup resources =

+        ResourceFactory.get("/com/nuix/investigator/cases/cases.xml")

+            .getSubgroup("OtherProcessingSettingsPanel");

     /**

-     * The "process text" checkbox.

-     */

-    private JCheckBox processTextCheckBox;

-

-    /**

      * The "store binary" checkbox.

      */

     private JCheckBox storeBinaryCheckBox;

     /**

-     * The stop words policy combobox.

-     */

-    private JComboBox stopWordsPolicyComboBox;

-

-    /**

-     * The stemming policy combo box.

-     */

-    private JComboBox stemmingPolicyComboBox;

-

-    /**

      * A reference to the "extract from slack space" checkbox.

      */

     private JCheckBox extractFromSlackSpaceCheckBox = null;

@@ -98,21 +68,48 @@

     // Constructors

     /**

-     * Constructor initialising resources.

-     * @param resources The {@link ResourceGroup} to initialise with.

+     * Constructs the panel.

      */

-    public CaseContentPropertiesPanel(ResourceGroup resources)

+    public OtherProcessingSettingsPanel()

     {

-        super("CaseContentPropertiesPanel");

-        setLogo(ImageFactory.createIcon("WizardLeft.png"));

-        this.resources = resources;

+        super(new GridBagLayout());

+

+        GridBagConstraints c1 = new GridBagConstraints();

+        c1.insets = new Insets(4, 4, 4, 4);

+        c1.anchor = GridBagConstraints.LINE_START;

+        GridBagConstraints c2 = (GridBagConstraints) c1.clone();

+        c2.weightx = 1.0;

+        c2.gridwidth = GridBagConstraints.REMAINDER;

+

+        // Remaining options.

+        storeBinaryCheckBox = addJCheckbox("StoreBinaryOption", c2);

+        extractFromSlackSpaceCheckBox = addJCheckbox("DeletedEmailsOption", c2);

+        directAccessCheckBox = addJCheckbox("DirectAccessOption", c2);

+        extractEmbeddedImagesCheckBox = addJCheckbox("ExtractEmbeddedImagesOption", c2);

+        createThumbnailsCheckBox = addJCheckbox("CreateThumbnailsOption", c2);

+        deduplicateDataCheckBox = addJCheckbox("DeduplicateDataOption", c2);

+        skinToneAnalysisCheckBox = addJCheckbox("SkinToneAnalysisOption", c2);

+

+        // If skinToneAnalysisCheckbox is selected, then the createThumbnailsCheckbox

+        // must be enabled.

+        skinToneAnalysisCheckBox.addActionListener(new ActionListener()

+        {

+            public void actionPerformed(ActionEvent e)

+            {

+                updateState();

+            }

+        });

+

+        // Load default state from a dummy model.

+        importModel(new NewCaseModel());

+        updateState();

     }

     ///////////////////////////////////////////////////////////////////////////

     // Methods

     /**

-     * Validates the data entered by the user. This is always true since 

+     * Validates the data entered by the user. This is always true since

      * we're simply altering the boolean state of checkboxes.

      *

      * @return <code>true</code> if the data in this panel is valid,

@@ -128,12 +125,9 @@

      *

      * @param model the wizard model.

      */

-    public void importModel(AbstractWizardModel model)

+    private void importModel(NewCaseModel model)

     {

-        NewCaseWizardModel m = (NewCaseWizardModel) model;

-

-        DataProcessingSettings processingSettings = m.getProcessingSettings();

-        processTextCheckBox.setSelected(processingSettings.getProcessText());

+        DataProcessingSettings processingSettings = model.getProcessingSettings();

         storeBinaryCheckBox.setSelected(processingSettings.getStoreBinary());

         extractFromSlackSpaceCheckBox.setSelected(processingSettings.getExtractFromSlackSpace());

         directAccessCheckBox.setSelected(processingSettings.getDirectAccessToMailboxes());

@@ -141,12 +135,6 @@

         createThumbnailsCheckBox.setSelected(processingSettings.getCreateThumbnails());

         deduplicateDataCheckBox.setSelected(processingSettings.getDeduplicateData());

         skinToneAnalysisCheckBox.setSelected(processingSettings.getSkinToneAnalysis());

-

-        TextIndexSettings textIndexSettings = m.getCaseEvidenceSettings().getTextIndexSettings();

-        stopWordsPolicyComboBox.setSelectedItem(new PolicyContainer(textIndexSettings.getStopWordsPolicy()));

-        stemmingPolicyComboBox.setSelectedItem(new PolicyContainer(textIndexSettings.getStemmingPolicy()));

-

-        wireCheckboxes();

     }

     /**