Update projectType in some files, leverage PythonOptions for python location.

Author: ebresie

src/main/java/org/apache/netbeans/modules/python4nb/editor/lsp/PythonLsp.java

@@ -28,11 +28,16 @@
 //import org.apache.netbeans.api.project.Project;
 //import org.netbeans.modules.cpplite.editor.Utils;
 import org.apache.netbeans.modules.python4nb.editor.file.MIMETypes;
+import org.apache.netbeans.modules.python4nb.editor.options.PythonOptions;
+import static org.apache.netbeans.modules.python4nb.exec.PythonExecutable.getDefault;
+import org.apache.netbeans.modules.python4nb.platform.PythonSupport;
+import org.apache.netbeans.modules.python4nb.preferences.PythonPreferences;
 import org.openide.util.Exceptions;
 import org.openide.util.Pair;
 import org.netbeans.api.project.Project;
 import org.netbeans.modules.lsp.client.spi.LanguageServerProvider;
 import org.openide.util.Lookup;
+import org.openide.util.NbPreferences;
 
 /**
  *
@@ -62,17 +67,23 @@ public LanguageServerDescription startServer(Lookup lookup) {
         }
 
         try {
-            /* TODO: Retrieve location of python based on global configuration 
-            or per project configuration.
-            */
-//            final String python = "C:\\Apps\\python\\Python39\\python.exe";
-            final String python = "C:\\Python310\\python.exe";
+            // get python location
+            PythonOptions options = PythonOptions.getInstance();
+            final String python = options.getPython();
+            // TODO: get python support from project
+            // PythonSupport support = PythonSupport.forProject(prj);
+            // support = PythonSupport.forProject(prj);
+            // PythonPreferences pyPreferences = support.getPreferences();
+
             LOG.log(Level.INFO, "Starting up Python LSP Server using {0}", python);
 
             // TODO: Check if Python LSP available to be run
             Process pythonServer = new ProcessBuilder(python,
                     "-m", "pyls").start();
-            LOG.log(Level.INFO, "Started up Python LSP Server");
+            
+            // TODO: If unable to start pyls support need to error out and/or notify user for setup
+            
+            LOG.log(Level.INFO, "Started up Python LSP Server" );
 
             LOG.log(Level.INFO, "Python LSP establish input-output for server.");
             return LanguageServerDescription.create(pythonServer.getInputStream(),

src/main/java/org/apache/netbeans/modules/python4nb/editor/options/PythonOptions.java

@@ -38,15 +38,15 @@ public final class PythonOptions {
 
     // Do not change arbitrary - consult with layer's folder OptionsExport
     // Path to Preferences node for storing these preferences
-    private static final String PREFERENCES_PATH = "python"; // NOI18N
+    public static final String PREFERENCES_PATH = "python.preferences"; // NOI18N
 
     private static final PythonOptions INSTANCE = new PythonOptions();
 
     private final Preferences preferences;
 
     private volatile boolean nodeSearched = false;
     private volatile boolean pipSearched = false;
-    private volatile boolean expressSearched = false;
+//    private volatile boolean expressSearched = false;
 
 
     private PythonOptions() {

src/main/java/org/apache/netbeans/modules/python4nb/platform/PythonSupport.java

@@ -53,6 +53,7 @@
 import org.openide.filesystems.FileChangeListener;
 import org.openide.filesystems.FileEvent;
 import org.openide.filesystems.FileUtil;
+import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
 import org.openide.util.Pair;
 import org.openide.util.RequestProcessor;
@@ -85,7 +86,7 @@ private PythonSupport(Project project) {
         pythonPackage =  new PythonPackage(project.getProjectDirectory());
     }
 
-    @ProjectServiceProvider(service = PythonSupport.class, projectType = "org-netbeans-modules-web-clientproject") // NOI18N
+    @ProjectServiceProvider(service = PythonSupport.class, projectType = "org-netbeans-modules-python4nb-project") // NOI18N
     public static PythonSupport create(Project project) {
         PythonSupport support = new PythonSupport(project);
         // listeners
@@ -95,7 +96,10 @@ public static PythonSupport create(Project project) {
     }
 
     public static PythonSupport forProject(Project project) {
-        PythonSupport support = project.getLookup().lookup(PythonSupport.class);
+        // TODO: FIgure out why lookup not working right
+        Lookup lookup = project.getLookup();
+        PythonSupport support = lookup.lookup(PythonSupport.class);
+//        PythonSupport support = project.getLookup().lookup(PythonSupport.class);
         if (support == null) {
             throw new IllegalArgumentException("Python Support not available or configured.");
         }

src/main/java/org/apache/netbeans/modules/python4nb/project/node/PythonNodeFactory.java

@@ -37,7 +37,7 @@
 
 
 
-@NodeFactory.Registration(projectType = "python-project", position = 10)
+@NodeFactory.Registration(projectType = "org-netbeans-modules-python4nb-project", position = 10)
 public class PythonNodeFactory implements  NodeFactory {
 
     @Override

src/main/java/org/apache/netbeans/modules/python4nb/ui/PythonCustomizerProvider.java

@@ -49,7 +49,8 @@ public JComponent createComponent(ProjectCustomizer.Category category, Lookup co
     }
 
     @ProjectCustomizer.CompositeCategoryProvider.Registration(
-            projectType = "org.netbeans.modules.web.clientproject", // NOI18N
+           projectType = "org-netbeans-modules-python4nb-project", // NOI18N
+            
             position = 320)
     public static PythonCustomizerProvider createCustomizer() {
         return new PythonCustomizerProvider();