mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 16:06:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Sean-M 2013-02-13 15:56:58 -05:00
commit 81aaae09e0
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
View File

@ -1,3 +1,3 @@
OpenIDE-Module-Name=Timeline OpenIDE-Module-Name=Timeline
CTL_MakeTimeline="Make Timeline (Beta)" CTL_MakeTimeline="Make Timeline (Beta)"
TimelineProgressDialog.jLabel1.text=Computing timeline . . . TimelineProgressDialog.jLabel1.text=Creating timeline . . .

9
Timeline/src/org/sleuthkit/autopsy/timeline/Simile2.java
View File

@ -431,6 +431,7 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar,
BarChart.Series<String, Number> series = new BarChart.Series(bcData); BarChart.Series<String, Number> series = new BarChart.Series(bcData);
series.setName(me.getMonthName() + " " + ye.getYear()); series.setName(me.getMonthName() + " " + ye.getYear());
ObservableList<BarChart.Series<String, Number>> ol = FXCollections.observableArrayList(series); ObservableList<BarChart.Series<String, Number>> ol = FXCollections.observableArrayList(series);
final BarChart<String, Number> bc = new BarChart<String, Number>(xAxis, yAxis, ol); final BarChart<String, Number> bc = new BarChart<String, Number>(xAxis, yAxis, ol);
@ -457,6 +458,10 @@ public class Simile2 extends CallableSystemAction implements Presenter.Toolbar,
dataResult.setNode(d); 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) { private String makeMacTime(String pathToBodyFile) {
String macpath = ""; String macpath = "";
final String machome = macRoot.getAbsolutePath(); final String machome = macRoot.getAbsolutePath();
pathToBodyFile = PlatformUtil.getOSFilePath(pathToBodyFile);
if (PlatformUtil.isWindowsOS()) { if (PlatformUtil.isWindowsOS()) {
macpath = machome + java.io.File.separator + "mactime.exe"; macpath = machome + java.io.File.separator + "mactime.exe";
macpath = PlatformUtil.getOSFilePath(macpath); 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; String macfile = moduleDir.getAbsolutePath() + java.io.File.separator + mactimeFileName;
macfile = PlatformUtil.getOSFilePath(macfile); macfile = PlatformUtil.getOSFilePath(macfile);
String command = macpath + " -b " + "\"" + pathToBodyFile + "\"" + " -d " + " -y " + ">" + "\"" + macfile + "\""; String command = macpath + " -b " + pathToBodyFile + " -d " + " -y " + "> " + macfile;
try { try {
JavaSystemCaller.Exec.execute("\"" + command + "\""); JavaSystemCaller.Exec.execute("\"" + command + "\"");
} catch (InterruptedException ie) { } catch (InterruptedException ie) {

2
Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.form
View File

@ -26,7 +26,7 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="51" max="-2" attributes="0"/> <EmptySpace min="-2" pref="51" max="-2" attributes="0"/>
<Component id="jLabel1" min="-2" max="-2" attributes="0"/> <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="121" max="32767" attributes="0"/> <EmptySpace pref="131" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>

2
Timeline/src/org/sleuthkit/autopsy/timeline/TimelineProgressDialog.java
View File

@ -99,7 +99,7 @@ public class TimelineProgressDialog extends javax.swing.JDialog {
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGap(51, 51, 51) .addGap(51, 51, 51)
.addComponent(jLabel1) .addComponent(jLabel1)
.addContainerGap(121, Short.MAX_VALUE)) .addContainerGap(131, Short.MAX_VALUE))
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)