Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions platform/core.startup/src/org/netbeans/core/startup/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public final class Main extends Object {
private static boolean moduleSystemInitialized;

/** Prints the text to splash screen or to status line, if available.
* @param msg
*/
public static void setStatusText (String msg) {
Splash.getInstance().print (msg);
Expand All @@ -67,6 +68,8 @@ public static void setStatusText (String msg) {

/** Starts TopThreadGroup which properly overrides uncaughtException
* Further - new thread in the group execs main
* @param argv
* @throws java.lang.Exception
*/
public static void main (String[] argv) throws Exception {
TopThreadGroup tg = new TopThreadGroup ("IDE Main", argv); // NOI18N - programatic name
Expand All @@ -90,7 +93,7 @@ public static void initUICustomizations() {
return;
}

Class<?> uiClass = CLIOptions.uiClass;
Class<?> uiClass;
// try again loading L&F class, this time with full module system.
if (CLIOptions.uiClassName != null && CLIOptions.uiClass == null) {
// try again
Expand All @@ -109,7 +112,7 @@ public static void initUICustomizations() {

URL themeURL = null;
boolean wantTheme = Boolean.getBoolean ("netbeans.useTheme") ||
CLIOptions.uiClass != null && CLIOptions.uiClass.getName().indexOf("MetalLookAndFeel") >= 0;
CLIOptions.uiClass != null && CLIOptions.uiClass.getName().contains("MetalLookAndFeel");

try {
if (wantTheme) {
Expand Down Expand Up @@ -138,7 +141,9 @@ public static void initUICustomizations() {
}
StartLog.logProgress("Fonts updated"); // NOI18N
}
/** Get and initialize module subsystem. */
/** Get and initialize module subsystem.
* @return ModuleSystem
*/
public static ModuleSystem getModuleSystem() {
return getModuleSystem(true);
}
Expand Down Expand Up @@ -517,11 +522,7 @@ public boolean canContinue () {
if (shouldDisplayLicense()) {
try {
SwingUtilities.invokeAndWait(this);
if (executedOk) {
return true;
} else {
return false;
}
return executedOk;
} catch (java.lang.reflect.InvocationTargetException ex) {
return false;
} catch (InterruptedException ex) {
Expand Down