[CIShell-SVN] SF.net SVN: cishell:[819] trunk/clients/gui/org.cishell.reference.gui. scheduler/src/org/cishell/reference/gui/scheduler/Activator.java

[<fu...@us...>]

Revision: 819
          http://cishell.svn.sourceforge.net/cishell/?rev=819&view=rev
Author:   fugu13
Date:     2008-09-24 16:47:38 +0000 (Wed, 24 Sep 2008)

Log Message:
-----------
Added maximally tentative checks for null in area that was throwing null pointer exceptions.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.scheduler/src/org/cishell/reference/gui/scheduler/Activator.java

Modified: trunk/clients/gui/org.cishell.reference.gui.scheduler/src/org/cishell/reference/gui/scheduler/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.scheduler/src/org/cishell/reference/gui/scheduler/Activator.java	2008-09-23 21:11:14 UTC (rev 818)
+++ trunk/clients/gui/org.cishell.reference.gui.scheduler/src/org/cishell/reference/gui/scheduler/Activator.java	2008-09-24 16:47:38 UTC (rev 819)
@@ -82,9 +82,13 @@
 		if (context != null) {
 			Display.getDefault().asyncExec(new Runnable() {
 				public void run() {
+					/* 
+					 * 
+					 */
 					Action scheduler = new SchedulerAction();
 					IMenuManager manager = CIShellApplication.getMenuManager();
 					
+					
 					IMenuManager newManager = null;
 					for (int i = 0; i < ATTEMPTS_TO_FIND_TOOLBAR && newManager == null; i++) {
 						try {
@@ -99,16 +103,21 @@
 					
 					if (manager == null) {
 						System.err.println( "Unable to add Scheduler to Tools menu, since Tools menu does not exist.");
+					} else {
+						manager.appendToGroup("start", scheduler);
 					}
-					
-					manager.appendToGroup("start", scheduler);
 					SchedulerView view = SchedulerView.getDefault();
 					boolean visible = view != null
 							&& PlatformUI.getWorkbench()
 									.getActiveWorkbenchWindow().getActivePage()
 									.isPartVisible(view);
 					scheduler.setChecked(visible);
-					CIShellApplication.getMenuManager().update(true);
+					IMenuManager otherManagerReference = CIShellApplication.getMenuManager();
+					if(otherManagerReference == null) {
+						System.err.println("The menu manager is still null. Surprise.");
+					} else {
+						otherManagerReference.update(true);
+					}
 				}
 			});
 			waitForBundleContext = false;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.