codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:sleuthkit/autopsy

Browse Source
This commit is contained in:
Dick Fickling
2012-02-01 10:00:24 -05:00
parent fae5528cf6 54d1d50322
commit 73dc7de2aa
3 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@@ -65,6 +65,7 @@ public class IngestManager {
//workers
private IngestFsContentThread fsContentIngester;
private List<IngestImageThread> imageIngesters;
private SwingWorker queueWorker;
//services
final Collection<IngestServiceImage> imageServices = enumerateImageServices();
final Collection<IngestServiceFsContent> fsContentServices = enumerateFsContentServices();
@@ -123,7 +124,7 @@ public class IngestManager {
}
tc.enableStartButton(false);
SwingWorker queueWorker = new EnqueueWorker(services, images);
queueWorker = new EnqueueWorker(services, images);
queueWorker.execute();
//logger.log(Level.INFO, "Queues: " + imageQueue.toString() + " " + fsContentQueue.toString());
@@ -218,12 +219,17 @@ public class IngestManager {
* stop currently running threads if any (e.g. when changing a case)
*/
void stopAll() {
//stop queue worker
if (queueWorker != null) {
queueWorker.cancel(true);
queueWorker = null;
}
//empty queues
emptyFsContents();
emptyImages();
//stop workers
//stop service workers
if (fsContentIngester != null) {
boolean cancelled = fsContentIngester.cancel(true);
if (!cancelled) {
@@ -252,6 +258,7 @@ public class IngestManager {
} catch (InterruptedException e) {
}
logger.log(Level.INFO, "stopped all");
}
/**

20
Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.form
View File

@@ -47,16 +47,12 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<Component id="controlPanel" max="32767" attributes="1"/>
<EmptySpace min="-2" pref="71" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="messageFrame" min="-2" max="-2" attributes="1"/>
<EmptySpace min="-2" pref="48" max="-2" attributes="0"/>
</Group>
</Group>
<Component id="controlPanel" max="32767" attributes="1"/>
<EmptySpace min="-2" pref="71" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="messageFrame" min="-2" max="-2" attributes="1"/>
<EmptySpace pref="58" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -65,9 +61,9 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="controlPanel" min="-2" pref="357" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="30" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="messageFrame" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="127" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="123" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>

53
Ingest/src/org/sleuthkit/autopsy/ingest/IngestTopComponent.java
View File

@@ -140,7 +140,7 @@ public final class IngestTopComponent extends TopComponent implements DataExplor
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(Case.CASE_CURRENT_CASE)) {
Case oldCase = (Case) evt.getOldValue();
if (oldCase == null) //nothing to do, not case had been opened
if (oldCase == null) //nothing to do, new case had been opened
{
return;
}
@@ -273,35 +273,28 @@ public final class IngestTopComponent extends TopComponent implements DataExplor
controlPanelLayout.setHorizontalGroup(
controlPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(controlPanelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(controlPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(controlPanelLayout.createSequentialGroup()
.addComponent(topLable)
.addContainerGap(198, Short.MAX_VALUE))
.addContainerGap()
.addGroup(controlPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(topLable)
.addComponent(servicesPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(startButton)
.addGroup(controlPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(mainProgressBar, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(freqSlider, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
.addGroup(controlPanelLayout.createSequentialGroup()
.addComponent(servicesPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(115, 115, 115))
.addGap(59, 59, 59)
.addComponent(refreshFrequencyLabel))
.addGroup(controlPanelLayout.createSequentialGroup()
.addComponent(startButton)
.addContainerGap(258, Short.MAX_VALUE))
.addGroup(controlPanelLayout.createSequentialGroup()
.addGroup(controlPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(mainProgressBar, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(freqSlider, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(115, Short.MAX_VALUE))))
.addGroup(controlPanelLayout.createSequentialGroup()
.addGap(59, 59, 59)
.addComponent(refreshFrequencyLabel)
.addContainerGap(174, Short.MAX_VALUE))
.addGroup(controlPanelLayout.createSequentialGroup()
.addGap(59, 59, 59)
.addComponent(ingestProgressLabel)
.addContainerGap(171, Short.MAX_VALUE))
.addGap(59, 59, 59)
.addComponent(ingestProgressLabel)))
.addContainerGap(47, Short.MAX_VALUE))
.addGroup(controlPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(controlPanelLayout.createSequentialGroup()
.addGap(74, 74, 74)
.addComponent(refreshFreqLabel)
.addContainerGap(161, Short.MAX_VALUE)))
.addContainerGap(93, Short.MAX_VALUE)))
);
controlPanelLayout.setVerticalGroup(
controlPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -334,22 +327,20 @@ public final class IngestTopComponent extends TopComponent implements DataExplor
mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(mainPanelLayout.createSequentialGroup()
.addContainerGap()
.addGroup(mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, mainPanelLayout.createSequentialGroup()
.addComponent(controlPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(71, 71, 71))
.addGroup(mainPanelLayout.createSequentialGroup()
.addComponent(messageFrame, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(48, 48, 48))))
.addComponent(controlPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(71, 71, 71))
.addGroup(mainPanelLayout.createSequentialGroup()
.addComponent(messageFrame, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(58, Short.MAX_VALUE))
);
mainPanelLayout.setVerticalGroup(
mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(mainPanelLayout.createSequentialGroup()
.addContainerGap()
.addComponent(controlPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 357, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(30, 30, 30)
.addGap(18, 18, 18)
.addComponent(messageFrame, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(127, 127, 127))
.addGap(123, 123, 123))
);
mainScrollPane.setViewportView(mainPanel);