Merge branch 'netbeans73dev' into netbeans73

junichi11 · junichi11 · commit 767da7c13582 · 2013-07-23T22:55:05.000+09:00
diff --git a/manifest.mf b/manifest.mf
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.cakephp.netbeans
 OpenIDE-Module-Layer: org/cakephp/netbeans/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/cakephp/netbeans/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.9.0
+OpenIDE-Module-Specification-Version: 0.9.1
diff --git a/src/org/cakephp/netbeans/editor/codecompletion/CakePhpCompletionProvider.java b/src/org/cakephp/netbeans/editor/codecompletion/CakePhpCompletionProvider.java
@@ -88,6 +88,9 @@ public int getAutoQueryTypes(JTextComponent jtc, String string) {
      */
     protected PhpModule getPhpModule(JTextComponent jtc) {
         FileObject fo = NbEditorUtilities.getFileObject(jtc.getDocument());
+        if (fo == null) {
+            return null;
+        }
         return PhpModule.forFileObject(fo);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,9 @@ public int getAutoQueryTypes(JTextComponent jtc, String string) {`
`88`	`88`	`*/`
`89`	`89`	`protected PhpModule getPhpModule(JTextComponent jtc) {`
`90`	`90`	`FileObject fo = NbEditorUtilities.getFileObject(jtc.getDocument());`
	`91`	`+ if (fo == null) {`
	`92`	`+ return null;`
	`93`	`+ }`
`91`	`94`	`return PhpModule.forFileObject(fo);`
`92`	`95`	`}`
`93`	`96`	`}`