From b3936e8ec0754a16da392a8d207f3a4c5745d421 Mon Sep 17 00:00:00 2001 From: Brian Sweeney Date: Wed, 20 Jun 2018 15:51:43 -0600 Subject: [PATCH] dropped noaction in favor of literal null --- .../autopsy/commonfilesearch/NoAction.java | 38 ------------------- .../directorytree/DataResultFilterNode.java | 7 ++-- 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 Core/src/org/sleuthkit/autopsy/commonfilesearch/NoAction.java diff --git a/Core/src/org/sleuthkit/autopsy/commonfilesearch/NoAction.java b/Core/src/org/sleuthkit/autopsy/commonfilesearch/NoAction.java deleted file mode 100644 index e62f62138b..0000000000 --- a/Core/src/org/sleuthkit/autopsy/commonfilesearch/NoAction.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * - * Autopsy Forensic Browser - * - * Copyright 2018 Basis Technology Corp. - * Contact: carrier sleuthkit 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.commonfilesearch; - -import java.awt.event.ActionEvent; -import javax.swing.AbstractAction; - -/** - * Default action for nodes which do not represent files, such as - * InstanceCountNode and Md5Node. - */ -public class NoAction extends AbstractAction { - - private static final long serialVersionUID = 1L; - - @SuppressWarnings("PMD") - @Override - public void actionPerformed(ActionEvent e) { - //intentionally does nothing - } -} diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java index a23f045f48..7c0937c67e 100644 --- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java +++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java @@ -41,7 +41,6 @@ import org.sleuthkit.autopsy.actions.AddBlackboardArtifactTagAction; import org.sleuthkit.autopsy.actions.AddContentTagAction; import org.sleuthkit.autopsy.actions.DeleteFileBlackboardArtifactTagAction; import org.sleuthkit.autopsy.actions.DeleteFileContentTagAction; -import org.sleuthkit.autopsy.commonfilesearch.NoAction; import org.sleuthkit.autopsy.core.UserPreferences; import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint; import org.sleuthkit.autopsy.coreutils.Logger; @@ -532,17 +531,17 @@ public class DataResultFilterNode extends FilterNode { @Override public AbstractAction visit(InstanceCountNode icn){ - return new NoAction(); + return null; } @Override public AbstractAction visit(Md5Node md5n){ - return new NoAction(); + return null; } @Override public AbstractAction visit(FileInstanceNode fin){ - return new NoAction(); + return null; } @Override