[jbosstools-commits] JBoss Tools SVN: r39913 - trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test.

[jbosstools-commits at lists.jboss.org]

Author: dmaliarevich
Date: 2012-03-29 06:05:17 -0400 (Thu, 29 Mar 2012)
New Revision: 39913

Modified:
   trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-11360 - TestUtil was updated: check for null was added.

Modified: trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java	2012-03-29 08:59:20 UTC (rev 39912)
+++ trunk/vpe/tests/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java	2012-03-29 10:05:17 UTC (rev 39913)
@@ -99,13 +99,12 @@
 		return null;
 	}
 
-	public static IResource getResource(String path,
-			String projectName) throws CoreException, IOException {
+	public static IResource getResource(String path, String projectName) 
+			throws CoreException, IOException {
 		IProject project = ProjectsLoader.getInstance().getProject(projectName);
 		if (project != null) {
 			return project.findMember(path);
 		}
-
 		return null;
 	}
 
@@ -306,11 +305,14 @@
      * @return nsIDOMDocument
      */
     public static nsIDOMDocument getVpeVisualDocument(JSPMultiPageEditor part) {
+    	nsIDOMDocument document = null;
         VpeController vpeController = TestUtil.getVpeController(part);
-        // get xulRunner editor
-        XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor();
-        // get dom document
-        nsIDOMDocument document = xulRunnerEditor.getDOMDocument();
+        if (vpeController != null) {
+        	XulRunnerEditor xulRunnerEditor = vpeController.getXulRunnerEditor();
+        	if (xulRunnerEditor != null) {
+    			document = xulRunnerEditor.getDOMDocument();
+    		}
+		} 
         return document;
     }