From a2a8fc0bc6a647ec63ba0fb6feb89796fb948075 Mon Sep 17 00:00:00 2001 From: jmillman Date: Thu, 2 Jul 2015 10:54:29 -0400 Subject: [PATCH] move Tag events to ...casemodule.events package; explicitly implement Serializable interface. use as needed logger to avoid serializing it. --- Core/src/org/sleuthkit/autopsy/casemodule/Case.java | 8 ++++---- .../events/BlackBoardArtifactTagAddedEvent.java | 5 +++-- .../events/BlackBoardArtifactTagDeletedEvent.java | 4 ++-- .../{ => casemodule}/events/ContentTagAddedEvent.java | 5 +++-- .../events/ContentTagDeletedEvent.java | 4 ++-- .../autopsy/{ => casemodule}/events/TagAddedEvent.java | 10 ++++++---- .../{ => casemodule}/events/TagDeletedEvent.java | 5 +++-- .../autopsy/imagegallery/ImageGalleryController.java | 8 +++----- .../imagegallery/datamodel/CategoryManager.java | 4 ++-- .../imagegallery/datamodel/DrawableTagsManager.java | 4 ++-- .../imagegallery/datamodel/grouping/GroupManager.java | 4 ++-- .../gui/drawableviews/DrawableTileBase.java | 4 ++-- .../imagegallery/gui/drawableviews/DrawableView.java | 4 ++-- .../imagegallery/gui/drawableviews/MetaDataPane.java | 4 ++-- 14 files changed, 38 insertions(+), 35 deletions(-) rename Core/src/org/sleuthkit/autopsy/{ => casemodule}/events/BlackBoardArtifactTagAddedEvent.java (92%) rename Core/src/org/sleuthkit/autopsy/{ => casemodule}/events/BlackBoardArtifactTagDeletedEvent.java (95%) rename Core/src/org/sleuthkit/autopsy/{ => casemodule}/events/ContentTagAddedEvent.java (93%) rename Core/src/org/sleuthkit/autopsy/{ => casemodule}/events/ContentTagDeletedEvent.java (96%) rename Core/src/org/sleuthkit/autopsy/{ => casemodule}/events/TagAddedEvent.java (91%) rename Core/src/org/sleuthkit/autopsy/{ => casemodule}/events/TagDeletedEvent.java (95%) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index 792f6c4526..1ac03b2859 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -63,10 +63,10 @@ import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.events.AutopsyEvent; import org.sleuthkit.autopsy.events.AutopsyEventException; import org.sleuthkit.autopsy.events.AutopsyEventPublisher; -import org.sleuthkit.autopsy.events.BlackBoardArtifactTagAddedEvent; -import org.sleuthkit.autopsy.events.BlackBoardArtifactTagDeletedEvent; -import org.sleuthkit.autopsy.events.ContentTagAddedEvent; -import org.sleuthkit.autopsy.events.ContentTagDeletedEvent; +import org.sleuthkit.autopsy.casemodule.events.BlackBoardArtifactTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.BlackBoardArtifactTagDeletedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.datamodel.BlackboardArtifactTag; import org.sleuthkit.datamodel.Content; diff --git a/Core/src/org/sleuthkit/autopsy/events/BlackBoardArtifactTagAddedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/BlackBoardArtifactTagAddedEvent.java similarity index 92% rename from Core/src/org/sleuthkit/autopsy/events/BlackBoardArtifactTagAddedEvent.java rename to Core/src/org/sleuthkit/autopsy/casemodule/events/BlackBoardArtifactTagAddedEvent.java index f6dad50cfe..3c3d15aec8 100644 --- a/Core/src/org/sleuthkit/autopsy/events/BlackBoardArtifactTagAddedEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/BlackBoardArtifactTagAddedEvent.java @@ -16,8 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.events; +package org.sleuthkit.autopsy.casemodule.events; +import java.io.Serializable; import javax.annotation.concurrent.Immutable; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.datamodel.BlackboardArtifactTag; @@ -27,7 +28,7 @@ import org.sleuthkit.datamodel.TskCoreException; * Event sent when a black board artifact tag is added. */ @Immutable -public class BlackBoardArtifactTagAddedEvent extends TagAddedEvent { +public class BlackBoardArtifactTagAddedEvent extends TagAddedEvent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/Core/src/org/sleuthkit/autopsy/events/BlackBoardArtifactTagDeletedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/BlackBoardArtifactTagDeletedEvent.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/events/BlackBoardArtifactTagDeletedEvent.java rename to Core/src/org/sleuthkit/autopsy/casemodule/events/BlackBoardArtifactTagDeletedEvent.java index 31f2196dc4..9afef66f37 100644 --- a/Core/src/org/sleuthkit/autopsy/events/BlackBoardArtifactTagDeletedEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/BlackBoardArtifactTagDeletedEvent.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.events; +package org.sleuthkit.autopsy.casemodule.events; import java.io.Serializable; import javax.annotation.concurrent.Immutable; @@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.BlackboardArtifactTag; * Event that is fired when a black board artifact tag is deleted. */ @Immutable -public class BlackBoardArtifactTagDeletedEvent extends TagDeletedEvent { +public class BlackBoardArtifactTagDeletedEvent extends TagDeletedEvent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/Core/src/org/sleuthkit/autopsy/events/ContentTagAddedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/ContentTagAddedEvent.java similarity index 93% rename from Core/src/org/sleuthkit/autopsy/events/ContentTagAddedEvent.java rename to Core/src/org/sleuthkit/autopsy/casemodule/events/ContentTagAddedEvent.java index 960d04b9a4..966138434a 100644 --- a/Core/src/org/sleuthkit/autopsy/events/ContentTagAddedEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/ContentTagAddedEvent.java @@ -16,8 +16,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.events; +package org.sleuthkit.autopsy.casemodule.events; +import java.io.Serializable; import javax.annotation.concurrent.Immutable; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.datamodel.ContentTag; @@ -27,7 +28,7 @@ import org.sleuthkit.datamodel.TskCoreException; * An event that is fired when a ContentTag is added. */ @Immutable -public class ContentTagAddedEvent extends TagAddedEvent { +public class ContentTagAddedEvent extends TagAddedEvent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/Core/src/org/sleuthkit/autopsy/events/ContentTagDeletedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/ContentTagDeletedEvent.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/events/ContentTagDeletedEvent.java rename to Core/src/org/sleuthkit/autopsy/casemodule/events/ContentTagDeletedEvent.java index 3ffc9ccbbf..406ef58a0b 100644 --- a/Core/src/org/sleuthkit/autopsy/events/ContentTagDeletedEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/ContentTagDeletedEvent.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.events; +package org.sleuthkit.autopsy.casemodule.events; import java.io.Serializable; import javax.annotation.concurrent.Immutable; @@ -27,7 +27,7 @@ import org.sleuthkit.datamodel.ContentTag; * An event that is fired when a ContentTag is deleted. */ @Immutable -public class ContentTagDeletedEvent extends TagDeletedEvent { +public class ContentTagDeletedEvent extends TagDeletedEvent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/Core/src/org/sleuthkit/autopsy/events/TagAddedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/TagAddedEvent.java similarity index 91% rename from Core/src/org/sleuthkit/autopsy/events/TagAddedEvent.java rename to Core/src/org/sleuthkit/autopsy/casemodule/events/TagAddedEvent.java index 2178ecc23a..150bf46c31 100644 --- a/Core/src/org/sleuthkit/autopsy/events/TagAddedEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/TagAddedEvent.java @@ -16,26 +16,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.events; +package org.sleuthkit.autopsy.casemodule.events; +import java.io.Serializable; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; +import org.sleuthkit.autopsy.events.AutopsyEvent; import org.sleuthkit.datamodel.Tag; import org.sleuthkit.datamodel.TskCoreException; /** * Base Class for events that are fired when a Tag is added */ -abstract class TagAddedEvent extends AutopsyEvent { +abstract class TagAddedEvent extends AutopsyEvent implements Serializable { private static final long serialVersionUID = 1L; - private static final Logger LOGGER = Logger.getLogger(TagAddedEvent.class.getName()); /** * The tag that was added. This will be lost during serialization and * re-loaded from the database in getNewValue() */ private transient T tag; + /** * The id of the tag that was added. This will bu used to re-load the * transient tag from the database. @@ -83,7 +85,7 @@ abstract class TagAddedEvent extends AutopsyEvent { tag = getTagByID(); return tag; } catch (IllegalStateException | TskCoreException ex) { - LOGGER.log(Level.SEVERE, "Error doing lazy load for remote event", ex); + Logger.getLogger(TagAddedEvent.class.getName()).log(Level.SEVERE, "Error doing lazy load for remote event", ex); return null; } } diff --git a/Core/src/org/sleuthkit/autopsy/events/TagDeletedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/TagDeletedEvent.java similarity index 95% rename from Core/src/org/sleuthkit/autopsy/events/TagDeletedEvent.java rename to Core/src/org/sleuthkit/autopsy/casemodule/events/TagDeletedEvent.java index 2bf4bd363d..bac908ad88 100644 --- a/Core/src/org/sleuthkit/autopsy/events/TagDeletedEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/TagDeletedEvent.java @@ -16,10 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.events; +package org.sleuthkit.autopsy.casemodule.events; import java.io.Serializable; import javax.annotation.concurrent.Immutable; +import org.sleuthkit.autopsy.events.AutopsyEvent; import org.sleuthkit.datamodel.Tag; import org.sleuthkit.datamodel.TagName; @@ -27,7 +28,7 @@ import org.sleuthkit.datamodel.TagName; * Base Class for events that are fired when a Tag is deleted */ @Immutable -abstract class TagDeletedEvent extends AutopsyEvent { +abstract class TagDeletedEvent extends AutopsyEvent implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java index 6255d36ea4..2a617c4b9b 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java @@ -54,11 +54,11 @@ import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandleFactory; import org.openide.util.Exceptions; import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.coreutils.History; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.ThreadConfined; -import org.sleuthkit.autopsy.events.ContentTagAddedEvent; -import org.sleuthkit.autopsy.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager; import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableDB; import org.sleuthkit.autopsy.imagegallery.datamodel.DrawableFile; @@ -504,7 +504,7 @@ public final class ImageGalleryController { getTagsManager().fireTagDeletedEvent(tagDeletedEvent); } break; - + } }); } @@ -521,8 +521,6 @@ public final class ImageGalleryController { return tagsManager; } - - // @@@ REVIEW IF THIS SHOLD BE STATIC... //TODO: concept seems like the controller deal with how much work to do at a given time // @@@ review this class for synchronization issues (i.e. reset and cancel being called, add, etc.) diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java index bce9e01f33..5f277a9267 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/CategoryManager.java @@ -31,8 +31,8 @@ import java.util.logging.Level; import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.events.ContentTagAddedEvent; -import org.sleuthkit.autopsy.events.ContentTagDeletedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.imagegallery.ImageGalleryController; import org.sleuthkit.datamodel.ContentTag; import org.sleuthkit.datamodel.TagName; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java index 547ab7a858..d26e32d7f3 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableTagsManager.java @@ -31,8 +31,8 @@ import javax.annotation.Nonnull; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.sleuthkit.autopsy.casemodule.services.TagsManager; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.events.ContentTagAddedEvent; -import org.sleuthkit.autopsy.events.ContentTagDeletedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.ContentTag; import org.sleuthkit.datamodel.TagName; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java index 48ea2eda6a..ab0932359c 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java @@ -65,8 +65,8 @@ import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.LoggedTask; import org.sleuthkit.autopsy.coreutils.ThreadConfined; import org.sleuthkit.autopsy.coreutils.ThreadConfined.ThreadType; -import org.sleuthkit.autopsy.events.ContentTagAddedEvent; -import org.sleuthkit.autopsy.events.ContentTagDeletedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.imagegallery.ImageGalleryController; import org.sleuthkit.autopsy.imagegallery.ImageGalleryModule; import org.sleuthkit.autopsy.imagegallery.datamodel.Category; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java index e9f995b970..7a542c57e3 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableTileBase.java @@ -60,8 +60,8 @@ import org.sleuthkit.autopsy.datamodel.FileNode; import org.sleuthkit.autopsy.directorytree.ExternalViewerAction; import org.sleuthkit.autopsy.directorytree.ExtractAction; import org.sleuthkit.autopsy.directorytree.NewWindowViewAction; -import org.sleuthkit.autopsy.events.ContentTagAddedEvent; -import org.sleuthkit.autopsy.events.ContentTagDeletedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.imagegallery.FileIDSelectionModel; import org.sleuthkit.autopsy.imagegallery.ImageGalleryTopComponent; import org.sleuthkit.autopsy.imagegallery.actions.AddDrawableTagAction; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableView.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableView.java index 4d7f31a52a..8cb596699c 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableView.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/DrawableView.java @@ -14,8 +14,8 @@ import javafx.scene.layout.Region; import javafx.scene.paint.Color; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.ThreadConfined; -import org.sleuthkit.autopsy.events.ContentTagAddedEvent; -import org.sleuthkit.autopsy.events.ContentTagDeletedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.imagegallery.ImageGalleryController; import org.sleuthkit.autopsy.imagegallery.datamodel.Category; import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager; diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java index 17975ac667..2948f1e514 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/drawableviews/MetaDataPane.java @@ -43,8 +43,8 @@ import javafx.scene.layout.Region; import javafx.scene.text.Text; import javafx.util.Pair; import org.apache.commons.lang3.StringUtils; -import org.sleuthkit.autopsy.events.ContentTagAddedEvent; -import org.sleuthkit.autopsy.events.ContentTagDeletedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent; +import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.imagegallery.ImageGalleryController; import org.sleuthkit.autopsy.imagegallery.datamodel.Category; import org.sleuthkit.autopsy.imagegallery.datamodel.CategoryManager;