[netbeans] branch delivery updated: Fixing a mistake in ergonomics project detection, so that it can detect OpenJDK projects.

[neilcsmith]

This is an automated email from the ASF dual-hosted git repository.

neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/delivery by this push:
     new b307259  Fixing a mistake in ergonomics project detection, so that it 
can detect OpenJDK projects.
     new 12b4f7d  Merge pull request #2720 from jlahoda/fod-openjdk-project
b307259 is described below

commit b30725993c84a943fafc1bc78d77bd7fe4332cd6
Author: Jan Lahoda <jlah...@netbeans.org>
AuthorDate: Sat Jan 30 08:25:22 2021 +0100

    Fixing a mistake in ergonomics project detection, so that it can detect 
OpenJDK projects.
---
 .../modules/ide/ergonomics/fod/FeatureProjectFactory.java  |  2 ++
 .../ide/ergonomics/fod/FeatureProjectFactoryTest.java      | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git 
a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java
 
b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java
index 6abd88d..cb6017d 100644
--- 
a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java
+++ 
b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java
@@ -150,6 +150,8 @@ implements ProjectFactory, PropertyChangeListener, Runnable 
{
                 return false;
             }
 
+            relative = relative.substring(pos);
+
             if (relative.contains("*")) {
                 for (String segment : relative.split("/")) {
                     FOUND: if (segment.contains("*")) {
diff --git 
a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactoryTest.java
 
b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactoryTest.java
index 363f240..20f68c6 100644
--- 
a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactoryTest.java
+++ 
b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactoryTest.java
@@ -43,6 +43,20 @@ public class FeatureProjectFactoryTest {
         assertTrue(isProject(yes1, relative));
     }
 
+    @Test
+    public void recognizeParentPath() throws IOException {
+        FileObject root = FileUtil.createMemoryFileSystem().getRoot();
+        FileObject src = FileUtil.createFolder(root, "src");
+        FileObject marker = FileUtil.createFolder(src, "marker");
+        FileObject other = FileUtil.createFolder(src, "other");
+
+        final String relative = "../marker";
+
+        assertFalse(isProject(src, relative));
+        assertTrue(isProject(marker, relative));
+        assertTrue(isProject(other, relative));
+    }
+
     private static FileObject prj(FileObject root, String base, String mx, 
String file) throws IOException {
         return 
root.createFolder(base).createFolder(mx).createData(file).getParent().getParent();
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists