reset local files wizard component when selected again

This commit is contained in:
adam-m 2013-05-14 17:22:13 -04:00
parent f8bb586d4f
commit 20c73bd79d
7 changed files with 91 additions and 66 deletions

View File

@ -134,6 +134,13 @@ final class AddImageVisualPanel1 extends JPanel {
return currentPanel.getContentType();
}
/**
* Reset the data sources panel selected
*/
public void reset() {
currentPanel.reset();
}
/**
* Sets the image path of the current panel.
* @param s the image path to set

View File

@ -16,7 +16,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.sleuthkit.autopsy.casemodule;
import java.beans.PropertyChangeEvent;
@ -86,7 +85,8 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
* Tests whether the panel is finished and it is safe to proceed to the next
* one. If the panel is valid, the "Next" button will be enabled.
*
* @return boolean true if all the fields are correctly filled, false otherwise
* @return boolean true if all the fields are correctly filled, false
* otherwise
*/
@Override
public boolean isValid() {
@ -98,7 +98,7 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
*/
void moveFocusToNext() {
// set the focus to the next button of the wizard dialog if it's enabled
if(isNextEnable){
if (isNextEnable) {
Lookup.getDefault().lookup(AddImageAction.class).requestFocusButton("Next >");
}
}
@ -108,11 +108,10 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
*
* @param isEnabled true if next button can be enabled, false otherwise
*/
public void enableNextButton(boolean isEnabled){
public void enableNextButton(boolean isEnabled) {
isNextEnable = isEnabled;
fireChangeEvent();
}
private final Set<ChangeListener> listeners = new HashSet<ChangeListener>(1); // or can use ChangeSupport in NB 6.0
/**
@ -140,8 +139,8 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
}
/**
* This method is auto-generated. It seems that this method is used to listen
* to any change in this wizard panel.
* This method is auto-generated. It seems that this method is used to
* listen to any change in this wizard panel.
*/
protected final void fireChangeEvent() {
Iterator<ChangeListener> it;
@ -154,26 +153,26 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
}
}
// You can use a settings object to keep track of state. Normally the
// settings object will be the WizardDescriptor, so you can use
// WizardDescriptor.getProperty & putProperty to store information entered
// by the user.
/**
* Provides the wizard panel with the current data--either the default data
* or already-modified settings, if the user used the previous and/or next
* buttons. This method can be called multiple times on one instance of
* WizardDescriptor.Panel.
*s
* WizardDescriptor.Panel. s
*
* @param settings the setting to be read from
*/
@Override
public void readSettings(WizardDescriptor settings) {
AddImageVisualPanel1 component = getComponent();
//reset settings if supports it
//getComponent().reset();
// Prepopulate the image directory from the properties file
try{
try {
String lastDataSourceDirectory = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_LASTDATASOURCE_PATH);
String lastDataSourceType = ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_LASTDATASOURCE_TYPE);
@ -191,27 +190,26 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
// If there is a process object in the settings, revert it and remove it from the settings
AddImageAction.CleanupTask cleanupTask = (AddImageAction.CleanupTask) settings.getProperty(AddImageAction.IMAGECLEANUPTASK_PROP);
if(cleanupTask != null){
try{
if (cleanupTask != null) {
try {
cleanupTask.cleanup();
}catch(Exception ex){
} catch (Exception ex) {
Logger logger = Logger.getLogger(AddImageWizardPanel1.class.getName());
logger.log(Level.WARNING, "Error cleaning up image task", ex);
}finally{
} finally {
cleanupTask.disable();
}
}
}
catch(Exception e){
} catch (Exception e) {
}
}
/**
* Provides the wizard panel with the opportunity to update the settings
* with its current customized state. Rather than updating its settings
* with every change in the GUI, it should collect them, and then only save
* them when requested to by this method. This method can be called multiple
* with its current customized state. Rather than updating its settings with
* every change in the GUI, it should collect them, and then only save them
* when requested to by this method. This method can be called multiple
* times on one instance of WizardDescriptor.Panel.
*
* @param settings the setting to be stored to
@ -230,12 +228,12 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
String firstImagePath = firstImage.substring(0, firstImage.lastIndexOf(File.separator) + 1);
ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_LASTDATASOURCE_PATH, firstImagePath);
ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_LASTDATASOURCE_TYPE, getComponent().getContentType().toString());
}
/**
* The "listener" for any property change in this panel. Any property changes
* will invoke the "fireChangeEvent()" method.
* The "listener" for any property change in this panel. Any property
* changes will invoke the "fireChangeEvent()" method.
*
* @param evt the property change event
*/

View File

@ -52,7 +52,7 @@ import org.sleuthkit.datamodel.TskException;
*/
class AddImageWizardPanel3 implements WizardDescriptor.Panel<WizardDescriptor> {
private Logger logger = Logger.getLogger(AddImageWizardPanel3.class.getName());
private static final Logger logger = Logger.getLogger(AddImageWizardPanel3.class.getName());
private IngestConfigurator ingestConfig = Lookup.getDefault().lookup(IngestConfigurator.class);
/**
* The visual component that displays this panel. If you need to access the

View File

@ -58,6 +58,11 @@ abstract class ContentTypePanel extends JPanel {
*/
abstract public boolean enableNext();
/**
* Tells this panel to reset itself
*/
abstract public void reset();
/**
* Tells this panel it has been selected.
*/

View File

@ -155,6 +155,11 @@ public class ImageFilePanel extends ContentTypePanel implements DocumentListener
return ContentType.IMAGE;
}
@Override
public void reset() {
//nothing to reset
}
/**

View File

@ -166,6 +166,11 @@ public class LocalDiskPanel extends ContentTypePanel {
return enableNext;
}
@Override
public void reset() {
//nothing to reset
}
/**
* @return the representation of this panel as a String.
*/

View File

@ -91,7 +91,13 @@ public class LocalFilesPanel extends ContentTypePanel {
@Override
public void select() {
//nothing needed
reset();
}
@Override
public void reset() {
currentFiles.clear();
selectedPaths.setText("");
}
@Override
@ -213,8 +219,7 @@ public class LocalFilesPanel extends ContentTypePanel {
}//GEN-LAST:event_selectButtonActionPerformed
private void clearButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_clearButtonActionPerformed
currentFiles.clear();
selectedPaths.setText("");
reset();
}//GEN-LAST:event_clearButtonActionPerformed