Updates for

(1) project discover (#3) and 
(2) execution ( #4)

Author: ebresie

SECURITY.md

@@ -1,7 +1,7 @@
 # Security Policy
 
 
-Python4NB is in early development so limited sercurity support is available at
+Python4NB is in early development so limited security support is available at
 the moment.
 
 The Python4NB project leverages github workflow dependabot checks 

src/main/java/org/apache/netbeans/modules/python4nb/editor/file/MIMETypes.java

@@ -1,20 +1,17 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
+ * Copyright 2022 Eric Bresie and friends. All rights reserved.
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.netbeans.modules.python4nb.editor.file;
 
@@ -35,4 +32,7 @@ private MIMETypes() {
     public static final String PY_EXT = "py";
     public static final String PYC_EXT = "pyc";
     public static final String PYO_EXT = "pyo";
+    
+    public static final String PYTHON_MIME_TYPE = "text/x-python"; // NOI18N
+    public static final String PYTHON_EXTENSION ="py";
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 ebres.
+ * Copyright 2022 Eric Bresie and friends. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,13 +25,7 @@
 import org.openide.util.Exceptions;
 import org.openide.util.Utilities;
 
-/**
- * The code here is based on nbPython Code.  
- * 
- * TODO: Need to determine how to handle this.  This code is available from
- * nbpython sourceforge repository (as well as Oracle donation) but need to
- * ensure inclusion is within appropriate licensing constraints.
- */
+// Portions of this code are based on nbPython Code.  
 
 class PythonAutoDetector {
       private static final Logger LOGGER = Logger.getLogger(PythonAutoDetector.class.getName());
@@ -265,8 +259,9 @@ private static boolean isPythonExecutableFile(String spath) {
                 spath.toLowerCase().contains("python3") ||
                 spath.toLowerCase().contains("anaconda") ||
                 spath.toLowerCase().contains("pypy")||
-                spath.toLowerCase().contains("pypy3")) && 
-                !(spath.toLowerCase().contains("uninstall"));
+                spath.toLowerCase().contains("pypy3")) && !(
+                (spath.toLowerCase().contains("uninstall")) || 
+                (spath.toLowerCase().contains("pythonw")));
     }
 
     public void traverse(File dir, boolean recersive) {

src/main/java/org/apache/netbeans/modules/python4nb/project/PythonActionProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 ebres.
+ * Copyright 2022 Eric Bresie and friends. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,22 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.netbeans.modules.python4nb.project;
 
-import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import org.netbeans.api.lsp.Command;
+import org.apache.netbeans.modules.python4nb.ui.actions.Command;
+//import org.netbeans.api.lsp.Command;
 import org.netbeans.spi.project.ActionProvider;
 import org.apache.netbeans.modules.python4nb.ui.actions.RunCommand;
 import org.openide.LifecycleManager;
 import org.openide.util.Lookup;
 import org.openide.util.RequestProcessor;
 
+// Portions of this code are based on nbPython Code.  
+
 /**
- *
- * TODO: Based on nbPython code
+ * This code identified possible actions provided for use in 
+ * project actions.
+ * 
+ * As more functionality is implemented additional commands will
+ * be added.
  */
 public class PythonActionProvider implements ActionProvider {
     PythonProject project;
@@ -39,24 +45,25 @@ public PythonActionProvider(PythonProject project) {
         assert project != null;
         commands = new LinkedHashMap<>();
         Command[] commandArray = new Command[] {
-//            new DeleteCommand(project),
-//            new CopyCommand(project),
-//            new MoveCommand(project),
-//            new RenameCommand(project),
-//            new CleanCommand(project),
-//            new RunSingleCommand(project, false),
-//            new RunSingleCommand(project, true), // Run as Test
             new RunCommand(project, false),
             new RunCommand(project, true), // Run project as Test
-//            new DebugCommand(project) ,
-//            new DebugSingleCommand(project, false),
-//            new DebugSingleCommand(project, true), // Debug as Test
-//            new BuildCommand(project), //Build Egg
-//            new CleanBuildCommand(project) //Clean and Build Egg
+            // TODO: Add applicable commands for additional functionality
+            // new DeleteCommand(project),
+            // new CopyCommand(project),
+            // new MoveCommand(project),
+            // new RenameCommand(project),
+            // new CleanCommand(project),
+            // new RunSingleCommand(project, false),
+            // new RunSingleCommand(project, true), // Run as Test
+            // new DebugCommand(project) ,
+            // new DebugSingleCommand(project, false),
+            // new DebugSingleCommand(project, true), // Debug as Test
+            // new BuildCommand(project), //Build Egg
+            // new CleanBuildCommand(project) //Clean and Build Egg
         };
         for (Command command : commandArray) {
-//            commands.put(command.getCommandId(), command);
-            commands.put(command.getTitle(), command);
+            commands.put(command.getCommandId(), command);
+//            commands.put(command.getTitle(), command);
         }
     }
 

src/main/java/org/apache/netbeans/modules/python4nb/project/PythonProject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 ebres.
+ * Copyright 2022 Eric Bresie and friends. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,24 +15,26 @@
  */
 package org.apache.netbeans.modules.python4nb.project;
 
-/**
- *
- * @author ebres
- */
 import java.awt.Image;
 import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.util.Map;
 import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
+import org.apache.netbeans.modules.python4nb.project.PythonSources;
 import org.netbeans.api.annotations.common.StaticResource;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectInformation;
+import org.netbeans.spi.project.AuxiliaryConfiguration;
 import org.netbeans.spi.project.ProjectState;
 import org.netbeans.spi.project.support.ant.AntProjectHelper;
 import org.netbeans.spi.project.support.ant.PropertyEvaluator;
+import org.netbeans.spi.project.support.ant.ReferenceHelper;
 import org.netbeans.spi.project.ui.LogicalViewProvider;
 import org.netbeans.spi.project.ui.support.CommonProjectActions;
 import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataFolder;
 import org.openide.loaders.DataObjectNotFoundException;
 import org.openide.nodes.AbstractNode;
@@ -45,22 +47,45 @@
 import org.openide.util.lookup.Lookups;
 import org.openide.util.lookup.ProxyLookup;
 
+// Portions of this code are based on nbPython Code.  
+
+/**
+ * This class is to reflect details and applicable attributes 
+ * about a given Python Project for use in NetBeans IDE.
+ */
 public class PythonProject implements  Project {
 
+        public static final String SOURCES_TYPE_PYTHON = "python"; //NOI18N
+    
     private final FileObject projectDir;
-    private final ProjectState state;
     protected SourceRoots sourceRoots;
     protected SourceRoots testRoots;
-    private Lookup lkp;
-    
-    protected PropertyEvaluator evaluator;
-    protected AntProjectHelper helper;
+    protected Lookup lkp;
+    protected PythonProjectProperties properties;
+    //TODO Determine if needed for future enhancements; remove if not needed
+//    private final ProjectState state;  // XXX May need
+//    protected AntProjectHelper helper; // XXX May need some form of Helper
+//    protected UpdateHelper updateHelper;
+//    protected LogicalViewProvider logicalView = new PythonLogicalView(this);
+//    protected PropertyEvaluator evaluator;
+//    protected ReferenceHelper refHelper;
+//    protected AuxiliaryConfiguration aux;
 
     @StaticResource()
     public static final String PYTHON_PROJECT_ICON = "org/apache/netbeans/modules/python4nb/editor/py_module.png";
     PythonProject(FileObject dir, ProjectState state) {
         this.projectDir = dir;
-        this.state = state;
+        this.lkp = getLookup();
+        this.sourceRoots = getSourceRoots();
+        this.properties = getProperties();
+//        this.state = state;
+    }
+    
+     PythonProject(File  dir) {
+        this.projectDir = FileUtil.toFileObject(dir);
+        this.lkp = getLookup(); //createLookup();    
+        this.sourceRoots = getSourceRoots();
+//        this.state = ProjectState.state;
     }
 
     @Override
@@ -75,7 +100,9 @@ public Lookup getLookup() {
                 this,
                 new PythonActionProvider(this),
                 new PythonInfo(),
-                new PythonProjectLogicalView(this)
+                new PythonProjectLogicalView(this),
+                new PythonSources(this)
+//TODO Determine if needed for future enhancements; remove if not needed
 //                , new CustomizerProvider() {
 //                        @Override
 //                        public void showCustomizer() {
@@ -85,34 +112,68 @@ public Lookup getLookup() {
 //                                    getProjectDirectory().getName());
 //                        }
 //                }
+//            new ClassPathProviderImpl(this),
+//            new Info(), // Project information Implementation
+//            logicalView, // Logical view if project implementation
+//            new PythonOpenedHook(), //Called by project framework when project is opened (closed)
+//            new PythonProjectXmlSavedHook(), //Called when project.xml changes
+//            new PythonSources(this, helper, evaluator, sourceRoots, testRoots), //Python source grops - used by package view, factories, refactoring, ...
+//            new PythonProjectOperations(this), //move, rename, copy of project
+//            new RecommendedTemplatesImpl(this.updateHelper), // Recommended Templates
+//            new PythonCustomizerProvider(this), //Project custmoizer
+//            new PythonFileEncodingQuery(),
+//            new PythonProjectTemplateAttributesProvider(getEvaluator()),
+//            new PythonSharabilityQuery(helper, getEvaluator(), getSourceRoots(), getTestRoots()), //Sharabilit info - used by VCS
+//            helper.createCacheDirectoryProvider(), //Cache provider
+//            helper.createAuxiliaryProperties(), // AuxiliaryConfiguraion provider - used by bookmarks, project Preferences, etc
+//            new PythonPlatformProvider(getEvaluator()),
+//            new PythonCoverageProvider(this),
+//            new PythonProjectSourceLevelQuery(evaluator, "")
             });
         }
         return lkp;
     }
 
-    public PropertyEvaluator getEvaluator() {
-        return evaluator;
+    public SourceRoots getSourceRoots() {
+        // if source root has not been established yet, try to set based on project directory
+        if (this.sourceRoots == null) {
+            this.sourceRoots = SourceRoots.create(this);
+        }
+        return this.sourceRoots;
+    }
+
+    public SourceRoots getTestRoots() {
+        return this.testRoots;
     }
 
-    AntProjectHelper getHelper() {
-        return this.helper;
+    public FileObject[] getSourceRootFiles() {
+        return getSourceRoots().getRoots();
     }
 
-    public SourceRoots getSourceRoots() {
-        return this.sourceRoots;
+    public FileObject[] getTestSourceRootFiles() {
+        return getTestRoots().getRoots();
     }
+
+    public Object getName() {
+        PythonInfo pi = lkp.lookup(PythonInfo.class);
+        return pi.getName();
+   }
+
+    public PythonProjectProperties getProperties() {
+        if (this.properties == null) {
+            this.properties = new PythonProjectProperties(this);
+            this.properties.loadProperties();
+        }
+        return properties;
+     }
 
 
 
    private final class PythonInfo implements  ProjectInformation {
 
-//@StaticResource()
-//    public static final String PYTHON_ICON = "org/apache/netbeans/modules/python4nb/editor/py.png";
-
     @Override
     public Icon getIcon() {
         return new ImageIcon(ImageUtilities.loadImage(PYTHON_PROJECT_ICON));
-//        return new ImageIcon(ImageUtilities.loadImage(PYTHON_ICON));
     }
 
     @Override
@@ -143,12 +204,6 @@ public Project getProject() {
 
    class PythonProjectLogicalView implements  LogicalViewProvider {
 
-//    @StaticResource()
-//    public static final String PYTHON_ICON = "org/apache/netbeans/modules/python4nb/editor/py.png";
-//
-//        @StaticResource()
-//    public static final String PYTHON_PROJECT_ICON = "org/apache/netbeans/modules/python4nb/editor/py_module.png";
-
     private final PythonProject project;
 
     public PythonProjectLogicalView(PythonProject project) {
@@ -203,7 +258,6 @@ public Action[] getActions(boolean arg0) {
 
         @Override
         public Image getIcon(int type) {
-//            return ImageUtilities.loadImage(PYTHON_ICON);
             return ImageUtilities.loadImage(PYTHON_PROJECT_ICON);
         }