Pulled static strings into Bundle.properties.

Added empty ja properties file.
This commit is contained in:
Nick Davis 2014-02-21 16:03:39 -05:00
parent 77ba2e8c5f
commit 6d1ccd6b34
3 changed files with 16 additions and 10 deletions

View File

@ -1 +1,3 @@
OpenIDE-Module-Name=CoreComponentInterfaces OpenIDE-Module-Name=CoreComponentInterfaces
CoreComponentControl.CTL_DirectoryTreeTopComponent=Directory Tree
CoreComponentControl.CTL_FavoritesTopComponent=Favorites

View File

@ -22,6 +22,8 @@ import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.openide.util.Lookup; import org.openide.util.Lookup;
import org.openide.windows.Mode; import org.openide.windows.Mode;
@ -37,6 +39,10 @@ import org.sleuthkit.autopsy.corecomponents.DataContentTopComponent;
public class CoreComponentControl { public class CoreComponentControl {
private static final Logger logger = Logger.getLogger(CoreComponentControl.class.getName()); private static final Logger logger = Logger.getLogger(CoreComponentControl.class.getName());
private static final String DIRECTORY_TREE = NbBundle.getMessage(CoreComponentControl.class,
"CoreComponentControl.CTL_DirectoryTreeTopComponent");
private static final String FAVORITES = NbBundle.getMessage(CoreComponentControl.class,
"CoreComponentControl.CTL_FavoritesTopComponent");
/** /**
* Opens all TopComponent windows that are needed ({@link DataExplorer}, {@link DataResult}, and * Opens all TopComponent windows that are needed ({@link DataExplorer}, {@link DataResult}, and
@ -83,6 +89,7 @@ public class CoreComponentControl {
Set<? extends Mode> modes = wm.getModes(); Set<? extends Mode> modes = wm.getModes();
Iterator<? extends Mode> iter = wm.getModes().iterator(); Iterator<? extends Mode> iter = wm.getModes().iterator();
TopComponent directoryTree = null; TopComponent directoryTree = null;
TopComponent favorites = null; TopComponent favorites = null;
String tcName = ""; String tcName = "";
@ -94,16 +101,13 @@ public class CoreComponentControl {
logger.log(Level.INFO, "tcName was null"); logger.log(Level.INFO, "tcName was null");
tcName = ""; tcName = "";
} }
switch (tcName) { // switch requires constant strings, so converted to if/else.
case "Directory Tree": if (DIRECTORY_TREE.equals(tcName)) {
directoryTree = tc; directoryTree = tc;
break; } else if (FAVORITES.equals(tcName)) {
case "Favorites": favorites = tc;
favorites = tc; } else {
break; tc.close();
default:
tc.close();
break;
} }
} }
} }