Merge branch 'develop' into 6329-implementUnspecifiedType

Core/src/org/sleuthkit/autopsy/geolocation/AbstractWaypointFetcher.java

@@ -257,6 +257,6 @@ abstract class AbstractWaypointFetcher implements WaypointBuilder.WaypointFilter
             return waypointMostRecent;
         }
 
-        return null;
+        return -1L;
     }
 }

Core/src/org/sleuthkit/autopsy/persona/Bundle.properties

@@ -0,0 +1,3 @@
+CTL_OpenPersonas=Personas
+CTL_PersonasTopComponentAction=PersonasTopComponent
+CTL_PersonasTopComponent=Personas

Core/src/org/sleuthkit/autopsy/persona/Bundle.properties-MERGED

@@ -0,0 +1,5 @@
+CTL_OpenPersonas=Personas
+CTL_PersonasTopComponentAction=PersonasTopComponent
+CTL_PersonasTopComponent=Personas
+OpenPersonasAction.displayName=Personas
+PTopComponent_Name=Personas

Core/src/org/sleuthkit/autopsy/persona/OpenPersonasAction.java

@@ -0,0 +1,93 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.persona;
+
+import javax.swing.JMenuItem;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
+import org.openide.util.actions.CallableSystemAction;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+import org.sleuthkit.autopsy.coreutils.ThreadConfined;
+
+/**
+ * An Action that opens the Personas window.
+ */
+
+@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.persona.Personas")
+@ActionRegistration(displayName = "#CTL_OpenPersonas", lazy = false)
+@ActionReferences(value = {
+    @ActionReference(path = "Menu/Tools", position = 105)
+})
+public final class OpenPersonasAction extends CallableSystemAction {
+
+    private static final long serialVersionUID = 1L;
+
+    private final JMenuItem menuItem;
+
+
+    public OpenPersonasAction() {
+        menuItem = super.getMenuPresenter();
+        this.setEnabled(true);
+    }
+
+    @Override
+    @ThreadConfined(type = ThreadConfined.ThreadType.AWT)
+    public void performAction() {
+        final TopComponent topComponent = WindowManager.getDefault().findTopComponent("PersonasTopComponent");
+        if (topComponent != null) {
+            if (topComponent.isOpened() == false) {
+                topComponent.open();
+            }
+            topComponent.toFront();
+            topComponent.requestActive();
+        }
+    }
+
+    @Override
+    @NbBundle.Messages("OpenPersonasAction.displayName=Personas")
+    public String getName() {
+        return Bundle.OpenPersonasAction_displayName();
+    }
+
+    @Override
+    public HelpCtx getHelpCtx() {
+        return HelpCtx.DEFAULT_HELP;
+    }
+
+    @Override
+    public boolean asynchronous() {
+        return false; // run on edt
+    }
+
+    @Override
+    public void setEnabled(boolean enable) {
+        super.setEnabled(enable);
+        menuItem.setEnabled(enable);
+    }
+
+    @Override
+    public JMenuItem getMenuPresenter() {
+        return menuItem;
+    }
+}

Core/src/org/sleuthkit/autopsy/persona/PersonasTopComponent.form

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you 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.
+
+-->
+
+<Form version="1.3" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <EmptySpace min="0" pref="400" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <EmptySpace min="0" pref="300" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+</Form>

Core/src/org/sleuthkit/autopsy/persona/PersonasTopComponent.java

@@ -0,0 +1,66 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2020 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.persona;
+
+import org.openide.util.NbBundle.Messages;
+import org.openide.windows.RetainLocation;
+import org.openide.windows.TopComponent;
+
+/**
+ * Top component for the Personas tool
+ *
+ */
+@TopComponent.Description(preferredID = "PersonasTopComponent", persistenceType = TopComponent.PERSISTENCE_NEVER)
+@TopComponent.Registration(mode = "personas", openAtStartup = false)
+@RetainLocation("personas")
+@SuppressWarnings("PMD.SingularField")
+public final class PersonasTopComponent extends TopComponent {
+    
+    @Messages({
+        "PTopComponent_Name=Personas"
+    })
+    public PersonasTopComponent() {
+        initComponents();
+        setName(Bundle.PTopComponent_Name());
+    }
+
+    /**
+     * This method is called from within the constructor to initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
+     */
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 400, Short.MAX_VALUE)
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 300, Short.MAX_VALUE)
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    // End of variables declaration//GEN-END:variables
+
+}