Merge branch 'nb73dev'

Author: junichi11

manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.php.wordpress
 OpenIDE-Module-Layer: org/netbeans/modules/php/wordpress/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/wordpress/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.4.7
+OpenIDE-Module-Specification-Version: 0.4.8
 

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=4bf0d9e8
+build.xml.data.CRC32=69bd7669
 build.xml.script.CRC32=f6cbff90
 build.xml.stylesheet.CRC32=a56c6a5b@2.56.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=4bf0d9e8
+nbproject/build-impl.xml.data.CRC32=69bd7669
 nbproject/build-impl.xml.script.CRC32=bfa38a5f
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1

nbproject/project.xml

@@ -24,6 +24,15 @@
                         <specification-version>2.33.1.2.1.1.6</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.editor</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>3</release-version>
+                        <specification-version>1.71.2.5.21.40</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
                     <build-prerequisite/>

src/org/netbeans/modules/php/wordpress/editor/completion/WordPressCompletionProvider.java

@@ -43,7 +43,7 @@
 
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
-import org.netbeans.modules.parsing.api.Source;
+import org.netbeans.modules.editor.NbEditorUtilities;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.wordpress.util.WPUtils;
 import org.netbeans.spi.editor.completion.CompletionProvider;
@@ -74,8 +74,10 @@ public int getAutoQueryTypes(JTextComponent component, String typedText) {
 
     private PhpModule getPhpModule(JTextComponent component) {
         Document doc = component.getDocument();
-        Source source = Source.create(doc);
-        FileObject fo = source.getFileObject();
-        return PhpModule.forFileObject(fo);
+        FileObject fileObject = NbEditorUtilities.getFileObject(doc);
+        if (fileObject == null) {
+            return null;
+        }
+        return PhpModule.forFileObject(fileObject);
     }
 }

src/org/netbeans/modules/php/wordpress/editor/navi/WordPressHyperlinkProviderExt.java

@@ -53,7 +53,7 @@
 import org.netbeans.lib.editor.hyperlink.spi.HyperlinkProviderExt;
 import org.netbeans.lib.editor.hyperlink.spi.HyperlinkType;
 import org.netbeans.modules.csl.api.UiUtils;
-import org.netbeans.modules.parsing.api.Source;
+import org.netbeans.modules.editor.NbEditorUtilities;
 import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.editor.api.ElementQuery;
@@ -65,6 +65,7 @@
 import org.netbeans.modules.php.editor.lexer.PHPTokenId;
 import org.netbeans.modules.php.editor.nav.NavUtils;
 import org.netbeans.modules.php.wordpress.util.WPUtils;
+import org.openide.filesystems.FileObject;
 
 /**
  *
@@ -91,8 +92,11 @@ public Set<HyperlinkType> getSupportedHyperlinkTypes() {
 
     @Override
     public boolean isHyperlinkPoint(Document doc, int offset, HyperlinkType ht) {
-        Source source = Source.create(doc);
-        phpModule = PhpModule.forFileObject(source.getFileObject());
+        FileObject fileObject = NbEditorUtilities.getFileObject(doc);
+        if (fileObject == null) {
+            return false;
+        }
+        phpModule = PhpModule.forFileObject(fileObject);
         if (phpModule == null || !WPUtils.isWP(phpModule)) {
             return false;
         }