mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-14 17:06:16 +00:00
Merge in new data source deletion code from McKinnon
This commit is contained in:
commit
2ed67a883e
@ -58,6 +58,7 @@ public final class DeleteDataSourceAction extends AbstractAction {
|
|||||||
Case.getCurrentCaseThrows().getSleuthkitCase().deleteDataSource(dataSourceID);
|
Case.getCurrentCaseThrows().getSleuthkitCase().deleteDataSource(dataSourceID);
|
||||||
KeywordSearchService kwsService = Lookup.getDefault().lookup(KeywordSearchService.class);
|
KeywordSearchService kwsService = Lookup.getDefault().lookup(KeywordSearchService.class);
|
||||||
kwsService.deleteDataSource(dataSourceID);
|
kwsService.deleteDataSource(dataSourceID);
|
||||||
|
Case.getCurrentCaseThrows().notifyDataSourceDeleted(dataSourceID);
|
||||||
} catch (NoCurrentCaseException | TskCoreException | KeywordSearchServiceException e) {
|
} catch (NoCurrentCaseException | TskCoreException | KeywordSearchServiceException e) {
|
||||||
logger.log(Level.WARNING, String.format("Error Deleting data source (obj_id=%d)", dataSourceID), e);
|
logger.log(Level.WARNING, String.format("Error Deleting data source (obj_id=%d)", dataSourceID), e);
|
||||||
}
|
}
|
||||||
|
@ -77,6 +77,7 @@ import org.sleuthkit.autopsy.casemodule.events.CommentChangedEvent;
|
|||||||
import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
|
import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
|
||||||
import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent;
|
import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent;
|
||||||
import org.sleuthkit.autopsy.casemodule.events.DataSourceAddedEvent;
|
import org.sleuthkit.autopsy.casemodule.events.DataSourceAddedEvent;
|
||||||
|
import org.sleuthkit.autopsy.casemodule.events.DataSourceDeletedEvent;
|
||||||
import org.sleuthkit.autopsy.casemodule.events.DataSourceNameChangedEvent;
|
import org.sleuthkit.autopsy.casemodule.events.DataSourceNameChangedEvent;
|
||||||
import org.sleuthkit.autopsy.casemodule.events.ReportAddedEvent;
|
import org.sleuthkit.autopsy.casemodule.events.ReportAddedEvent;
|
||||||
import org.sleuthkit.autopsy.casemodule.multiusercases.CaseNodeData.CaseNodeDataException;
|
import org.sleuthkit.autopsy.casemodule.multiusercases.CaseNodeData.CaseNodeDataException;
|
||||||
@ -1482,6 +1483,18 @@ public class Case {
|
|||||||
eventPublisher.publish(new DataSourceNameChangedEvent(dataSource, newName));
|
eventPublisher.publish(new DataSourceNameChangedEvent(dataSource, newName));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Notifies case event subscribers that a data source has been delete from
|
||||||
|
* the case database.
|
||||||
|
*
|
||||||
|
* This should not be called from the event dispatch thread (EDT)
|
||||||
|
*
|
||||||
|
* @param dataSourceId The data source that was deleted.
|
||||||
|
*/
|
||||||
|
public void notifyDataSourceDeleted(Long dataSourceId) {
|
||||||
|
eventPublisher.publish(new DataSourceDeletedEvent(dataSourceId));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Notifies case event subscribers that a content tag has been added.
|
* Notifies case event subscribers that a content tag has been added.
|
||||||
*
|
*
|
||||||
|
@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
* Autopsy Forensic Browser
|
||||||
|
*
|
||||||
|
* Copyright 2015-2019 Basis Technology Corp.
|
||||||
|
* Contact: carrier <at> sleuthkit <dot> org
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.sleuthkit.autopsy.casemodule.events;
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
import org.sleuthkit.autopsy.casemodule.Case;
|
||||||
|
import org.sleuthkit.autopsy.events.AutopsyEvent;
|
||||||
|
|
||||||
|
public class DataSourceDeletedEvent extends AutopsyEvent implements Serializable {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
private final long dataSourceId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an event published when a data source is added to a case.
|
||||||
|
*
|
||||||
|
* @param dataSourceId The data source that was deleted.
|
||||||
|
*/
|
||||||
|
public DataSourceDeletedEvent(Long dataSourceId) {
|
||||||
|
|
||||||
|
super(Case.Events.DATA_SOURCE_DELETED.toString(), null, dataSourceId);
|
||||||
|
this.dataSourceId = dataSourceId;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the data source id that is being deleted
|
||||||
|
*
|
||||||
|
* @return The data source id.
|
||||||
|
*/
|
||||||
|
public long getDataSourceId() {
|
||||||
|
return dataSourceId;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user