From 335f581d336e2fe866aa60504b264eb4782b01f8 Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 13 Feb 2013 13:00:41 -0500 Subject: [PATCH 1/3] timeline set result view path with current date. Rename progress dialog to "Creating Timeline" for consistency with progress bar --- .../src/org/sleuthkit/autopsy/timeline/Bundle.properties | 2 +- Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java | 5 +++++ .../sleuthkit/autopsy/timeline/TimelineProgressDialog.form | 2 +- .../sleuthkit/autopsy/timeline/TimelineProgressDialog.java | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties index 65071f9662..ca18728167 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties @@ -1,3 +1,3 @@ OpenIDE-Module-Name=Timeline CTL_MakeTimeline="Make Timeline (Beta)" -TimelineProgressDialog.jLabel1.text=Computing timeline . . . +TimelineProgressDialog.jLabel1.text=Creating timeline . . . diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java b/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java index fee14f5a53..5f5771b43a 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java @@ -430,6 +430,7 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar, ObservableList bcData = makeObservableListByMonthAllDays(me, ye.getYear()); BarChart.Series series = new BarChart.Series(bcData); series.setName(me.getMonthName() + " " + ye.getYear()); + ObservableList> ol = FXCollections.observableArrayList(series); @@ -457,6 +458,10 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar, dataResult.setNode(d); } }); + + //set result viewer title path with the current date + String dateString = ye.getYear() + "-" + 1+me.getMonthInt() + "-" + + de.dayNum; + dataResult.setPath(dateString); } }); } diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form index 0d37383f5a..4811094954 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form @@ -26,7 +26,7 @@ - + diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java index 833abfea15..940111d922 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java @@ -100,7 +100,7 @@ public class TimelineProgressDialog extends javax.swing.JDialog { .addGroup(layout.createSequentialGroup() .addGap(51, 51, 51) .addComponent(jLabel1) - .addContainerGap(121, Short.MAX_VALUE)) + .addContainerGap(131, Short.MAX_VALUE)) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) From 02697c2a1c0c8cd2e0e821a418009eaa208a8174 Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 13 Feb 2013 13:03:50 -0500 Subject: [PATCH 2/3] fix setting month in result view --- Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java b/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java index 5f5771b43a..94c60fb663 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java @@ -460,7 +460,7 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar, }); //set result viewer title path with the current date - String dateString = ye.getYear() + "-" + 1+me.getMonthInt() + "-" + + de.dayNum; + String dateString = ye.getYear() + "-" + (1+me.getMonthInt()) + "-" + + de.dayNum; dataResult.setPath(dateString); } }); From ec6c92519d37c1adf8de414c65b0282bbf6ea413 Mon Sep 17 00:00:00 2001 From: Tim McIver Date: Wed, 13 Feb 2013 15:27:31 -0500 Subject: [PATCH 3/3] Fixes for problem caused for mactime file creation when path has spaces in it (again). --- Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java b/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java index 9be6f10e59..3da50cc9b2 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java @@ -923,6 +923,7 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar, private String makeMacTime(String pathToBodyFile) { String macpath = ""; final String machome = macRoot.getAbsolutePath(); + pathToBodyFile = PlatformUtil.getOSFilePath(pathToBodyFile); if (PlatformUtil.isWindowsOS()) { macpath = machome + java.io.File.separator + "mactime.exe"; macpath = PlatformUtil.getOSFilePath(macpath); @@ -931,7 +932,8 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar, } String macfile = moduleDir.getAbsolutePath() + java.io.File.separator + mactimeFileName; macfile = PlatformUtil.getOSFilePath(macfile); - String command = macpath + " -b " + "\"" + pathToBodyFile + "\"" + " -d " + " -y " + ">" + "\"" + macfile + "\""; + String command = macpath + " -b " + pathToBodyFile + " -d " + " -y " + "> " + macfile; + try { JavaSystemCaller.Exec.execute("\"" + command + "\""); } catch (InterruptedException ie) {