Organized imports

[phpeclipse.git] / archive / net.sourceforge.phpeclipse.js.core / src / net / sourceforge / phpeclipse / js / core / parser / JSParser.java

diff --git a/archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSParser.java b/archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSParser.java
index 7796b4a..7db271f 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSParser.java
+++ b/archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSParser.java
@@ -9,6 +9,12 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.2  2005/04/06 18:29:29  axelcl
+ * Avoid NullPointerException
+ *
+ * Revision 1.1  2004/09/02 18:14:38  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.1  2004/02/26 02:25:42  agfitzp
  * renamed packages to match xml & css
  *
@@ -50,7 +56,14 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 
-import net.sourceforge.phpeclipse.js.core.model.*;
+import net.sourceforge.phpeclipse.js.core.model.JSClassElement;
+import net.sourceforge.phpeclipse.js.core.model.JSClassMethodElement;
+import net.sourceforge.phpeclipse.js.core.model.JSClassVariableElement;
+import net.sourceforge.phpeclipse.js.core.model.JSElement;
+import net.sourceforge.phpeclipse.js.core.model.JSFunctionElement;
+import net.sourceforge.phpeclipse.js.core.model.JSGlobalVariableElement;
+import net.sourceforge.phpeclipse.js.core.model.JSInstanceMethodElement;
+import net.sourceforge.phpeclipse.js.core.model.JSInstanceVariableElement;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.text.BadLocationException;
@@ -392,7 +405,9 @@ public class JSParser
                                        if (expression.equals("="))
                                        {
                                                JSGlobalVariableElement aVariable = addGlobalVariable(variableName, varOffset);
-                                               checkForSpecialGlobalTypes(aVariable);
+                                               if (aVariable!=null) {
+                                                 checkForSpecialGlobalTypes(aVariable);
+                                               }
                                        }
                                }
                        }