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 2898f142d6..ff3890c0f4 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); } }); } @@ -906,6 +911,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); @@ -914,7 +920,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) { 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 f1bbaf3610..ca5499cf1e 100644 --- a/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java +++ b/Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java @@ -99,7 +99,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)