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

Modified StartupWindowProvider to support more than 2 startup windows

Browse Source
This commit is contained in:
Eugene Livis 2016-09-07 15:37:07 -04:00
parent ea46ec38cd
commit 28be2cf353
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Core/src/org/sleuthkit/autopsy/casemodule/StartupWindowProvider.java
View File

@ -59,12 +59,10 @@ public class StartupWindowProvider implements StartupWindowInterface {
= Lookup.getDefault().lookupAll(StartupWindowInterface.class); = Lookup.getDefault().lookupAll(StartupWindowInterface.class);
int windowsCount = startupWindows.size(); int windowsCount = startupWindows.size();
if (windowsCount > 2) { if (windowsCount == 1) {
logger.log(Level.WARNING, "More than 2 (" + windowsCount + ") start up windows discovered, will use the first custom one"); //NON-NLS
} else if (windowsCount == 1) {
startupWindowToUse = startupWindows.iterator().next(); startupWindowToUse = startupWindows.iterator().next();
logger.log(Level.INFO, "Will use the default startup window: " + startupWindowToUse.toString()); //NON-NLS logger.log(Level.INFO, "Will use the default startup window: " + startupWindowToUse.toString()); //NON-NLS
} else { } else if (windowsCount == 2) {
//pick the non default one //pick the non default one
Iterator<? extends StartupWindowInterface> it = startupWindows.iterator(); Iterator<? extends StartupWindowInterface> it = startupWindows.iterator();
while (it.hasNext()) { while (it.hasNext()) {
@ -73,17 +71,25 @@ public class StartupWindowProvider implements StartupWindowInterface {
startupWindowToUse = window; startupWindowToUse = window;
logger.log(Level.INFO, "Will use the custom startup window: " + startupWindowToUse.toString()); //NON-NLS logger.log(Level.INFO, "Will use the custom startup window: " + startupWindowToUse.toString()); //NON-NLS
break; break;
} }
} }
} else {
if (startupWindowToUse == null) { // select first non-Autopsy start up window
logger.log(Level.SEVERE, "Unexpected error, no custom startup window found, using the default"); //NON-NLS Iterator<? extends StartupWindowInterface> it = startupWindows.iterator();
startupWindowToUse = new org.sleuthkit.autopsy.casemodule.StartupWindow(); while (it.hasNext()) {
StartupWindowInterface window = it.next();
if (!window.getClass().getCanonicalName().startsWith("org.sleuthkit.autopsy")) {
startupWindowToUse = window;
logger.log(Level.INFO, "Will use the custom startup window: " + startupWindowToUse.toString()); //NON-NLS
break;
}
} }
} }
if (startupWindowToUse == null) {
logger.log(Level.SEVERE, "Unexpected error, no startup window chosen, using the default"); //NON-NLS
startupWindowToUse = new org.sleuthkit.autopsy.casemodule.StartupWindow();
}
} }
} }