diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/Bundle.properties b/Core/src/com/basistech/df/cybertriage/autopsy/Bundle.properties index 4d7a376395a35ffa93e53f94bb946df1128abe12..caab36116de9c8116301e01c385b5dbd5c654edd 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/Bundle.properties +++ b/Core/src/com/basistech/df/cybertriage/autopsy/Bundle.properties @@ -5,6 +5,5 @@ CTIntegrationMissingDialog.title=Cyber Triage Importer Module Required CTIntegrationMissingDialog.descriptionLabel.text=<html><body><p>The Cyber Triage Importer Module is required to open this case. </p><p>To open this case:</p><ul><li>Extract the module from the Integrations tab in the Cyber Triage options panel.</li><li>Select the 'Plugins' option from the 'Tools' menu, and go to the 'Downloaded' tab.</li><li>Click 'Add Plugins...' and select the path of the plugin.</li><li>Press 'Install' to finish the installation.</li></ul></body></html> -CTIntegrationMissingDialog.link.text=<html><span style="color: blue; text-decoration: underline">http://docs.cybertriage.com</span></html> CTIntegrationMissingDialog.docsLabel.text=<html>For more information, refer to the Cyber Triage Users Guide</html> CTIntegrationMissingDialog.okButton.text=OK diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/CTIntegrationMissingDialog.form b/Core/src/com/basistech/df/cybertriage/autopsy/CTIntegrationMissingDialog.form index 59955cb3ddbdb46d8940def88a4294d5bb0ec724..e61f2f6cbdf1ba9d4e1c665bae3a9e278efab40f 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/CTIntegrationMissingDialog.form +++ b/Core/src/com/basistech/df/cybertriage/autopsy/CTIntegrationMissingDialog.form @@ -68,8 +68,8 @@ </Component> <Component class="javax.swing.JLabel" name="link"> <Properties> - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> - <ResourceString bundle="com/basistech/df/cybertriage/autopsy/Bundle.properties" key="CTIntegrationMissingDialog.link.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> + <Connection code=""<html><span style=\"color: blue; text-decoration: underline\">" + DOCS_PAGE_URL + "</span></html>"" type="code"/> </Property> <Property name="cursor" type="java.awt.Cursor" editor="org.netbeans.modules.form.editors2.CursorEditor"> <Color id="Hand Cursor"/> @@ -78,10 +78,6 @@ <Events> <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="linkMouseClicked"/> </Events> - <AuxValues> - <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/> - <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/> - </AuxValues> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"> <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="5" insetsBottom="5" insetsRight="5" anchor="18" weightX="1.0" weightY="0.0"/> diff --git a/Core/src/com/basistech/df/cybertriage/autopsy/CTIntegrationMissingDialog.java b/Core/src/com/basistech/df/cybertriage/autopsy/CTIntegrationMissingDialog.java index 98690ced575e3511e0251fe495f5f2a423f7999b..8fbec4abefc35740bbe7844b0913d037770efbdc 100644 --- a/Core/src/com/basistech/df/cybertriage/autopsy/CTIntegrationMissingDialog.java +++ b/Core/src/com/basistech/df/cybertriage/autopsy/CTIntegrationMissingDialog.java @@ -56,7 +56,7 @@ private void initComponents() { javax.swing.JLabel descriptionLabel = new javax.swing.JLabel(); javax.swing.JLabel docsLabel = new javax.swing.JLabel(); - javax.swing.JLabel link = new javax.swing.JLabel(); + link = new javax.swing.JLabel(); javax.swing.JPanel paddingPanel = new javax.swing.JPanel(); javax.swing.JButton okButton = new javax.swing.JButton(); @@ -87,7 +87,7 @@ private void initComponents() { gridBagConstraints.insets = new java.awt.Insets(0, 5, 5, 0); getContentPane().add(docsLabel, gridBagConstraints); - org.openide.awt.Mnemonics.setLocalizedText(link, org.openide.util.NbBundle.getMessage(CTIntegrationMissingDialog.class, "CTIntegrationMissingDialog.link.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(link, "<html><span style=\"color: blue; text-decoration: underline\">" + DOCS_PAGE_URL + "</span></html>"); link.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)); link.addMouseListener(new java.awt.event.MouseAdapter() { public void mouseClicked(java.awt.event.MouseEvent evt) { @@ -160,5 +160,6 @@ public void showDialog(JComponent parentComp) { } // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JLabel link; // End of variables declaration//GEN-END:variables } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index 45a4d6dff64fa3b2db71c802c8ce90eb6add12a6..b1d2f28c3137d176830956aa7bd2a13b983760b3 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -178,7 +178,7 @@ public class Case { private static final String CASE_ACTION_THREAD_NAME = "%s-case-action"; private static final String CASE_RESOURCES_THREAD_NAME = "%s-manage-case-resources"; private static final String NO_NODE_ERROR_MSG_FRAGMENT = "KeeperErrorCode = NoNode"; - private static final String CT_PROVIDER_PREFIX = "CTCustomContentProvider_"; + private static final String CT_PROVIDER_PREFIX = "CTStandardContentProvider_"; private static final Logger logger = Logger.getLogger(Case.class.getName()); private static final AutopsyEventPublisher eventPublisher = new AutopsyEventPublisher(); private static final Object caseActionSerializationLock = new Object();