Merge branch 'logicalview-feature' into nb82

Author: junichi11

README.md

@@ -78,6 +78,7 @@ Support them using `.cake` file.
 - Support for a `.cake` file
 - Resolve mime-types for a ctp extension and a `.cake` file
 - Show a parent directory name of a ctp file in the multi-row tabs(see Tools > Options > Appearance > Document Tabs) e.g. `home.ctp [Pages]`
+- Custom nodes
 
 ### Code Completion
 
@@ -241,5 +242,10 @@ Just run `cake server`. If you want to set details, please use `Run Configuratio
 Please run this action after you changed the `.cake` file or you updated the version of CakePHP.
 Refresh the version number and category paths.
 
+### Custom nodes
+
+You can add some directories(nodes) under the your project tree. Controller, Model, e.t.c. are shown by default.
+If you want to hide/show them, please change the options.(Tools > Options > PHP > Frameworks and Tools > CakePHP3 > Custom nodes)
+
 ## License
 [Common Development and Distribution License (CDDL) v1.0 and GNU General Public License (GPL) v2](http://netbeans.org/cddl-gplv2.html)

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e8c34427
+build.xml.data.CRC32=26a6082c
 build.xml.script.CRC32=99224ca9
 build.xml.stylesheet.CRC32=a56c6a5b@2.72.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=e8c34427
+nbproject/build-impl.xml.data.CRC32=26a6082c
 nbproject/build-impl.xml.script.CRC32=3e0b9a07
 nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.72.1

nbproject/project.xml

@@ -243,6 +243,15 @@
                         <implementation-version/>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.66.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
                     <build-prerequisite/>
@@ -252,6 +261,15 @@
                         <specification-version>1.78.1.8</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.85.1.9</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.swing.tabcontrol</code-name-base>
                     <build-prerequisite/>
@@ -260,6 +278,14 @@
                         <specification-version>1.54.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.actions</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>6.39.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>

src/org/netbeans/modules/php/cake3/modules/CakePHP3Module.java

@@ -41,8 +41,12 @@
  */
 package org.netbeans.modules.php.cake3.modules;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 import java.util.List;
 import java.util.Set;
+import javax.swing.SwingUtilities;
 import org.netbeans.api.annotations.common.CheckForNull;
 import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.cake3.CakePHP3FrameworkProvider;
@@ -57,6 +61,9 @@
  */
 public class CakePHP3Module {
 
+    private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+    public static String PROPERTY_CHANGE_CAKE3 = "property-change-cake3"; // NOI18N
+
     public enum Category {
 
         BEHAVIOR("Behavior"), // NOI18N
@@ -225,4 +232,32 @@ public Dotcake getDotcake() {
         return impl.getDotcake();
     }
 
+    public void addPropertyChangeListener(PropertyChangeListener listener) {
+        propertyChangeSupport.addPropertyChangeListener(listener);
+    }
+
+    public void removePropertyChangeListener(PropertyChangeListener listener) {
+        propertyChangeSupport.removePropertyChangeListener(listener);
+    }
+
+    public void notifyPropertyChanged(PropertyChangeEvent event) {
+        if (PROPERTY_CHANGE_CAKE3.equals(event.getPropertyName())) {
+            SwingUtilities.invokeLater(new Runnable() {
+
+                @Override
+                public void run() {
+                    refreshNodes();
+//                    reset();
+                }
+            });
+        }
+    }
+
+//    void reset() {
+//        CakePHP3ModuleFactory.getInstance().reset(this);
+//    }
+    void refreshNodes() {
+        propertyChangeSupport.firePropertyChange(PROPERTY_CHANGE_CAKE3, null, null);
+    }
+
 }

src/org/netbeans/modules/php/cake3/options/CakePHP3Options.java

@@ -41,7 +41,11 @@
  */
 package org.netbeans.modules.php.cake3.options;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.prefs.Preferences;
+import org.netbeans.modules.php.api.util.StringUtils;
 import org.netbeans.modules.php.composer.api.Composer;
 import org.openide.util.NbPreferences;
 
@@ -53,8 +57,23 @@ public class CakePHP3Options {
 
     private static final String PREFERENCES_PATH = "cakephp3"; // NOI18N
     private static final String EXTERNAL_DRAG_AND_DROP = "external.drop"; // NOI18N
+    private static final String AVAILABLE_CUSTOM_NODES = "available-custom-nodes"; // NOI18N
     private static final String COMPOSER_PREFERENCES_PATH = "composer"; // NOI18N
     private static final CakePHP3Options INSTANCE = new CakePHP3Options();
+    public static final List<String> DEFAULT_AVAILABLE_NODES = Arrays.asList(
+            "Console", // NOI18N
+            "Controller", // NOI18N
+            "Component", // NOI18N
+            "Model", // NOI18N
+            "View", // NOI18N
+            "Helper", // NOI18N
+            "webroot" // NOI18N
+    );
+    public static final List<String> ALL_AVAILABLE_NODES = new ArrayList<>(DEFAULT_AVAILABLE_NODES);
+
+    static {
+        ALL_AVAILABLE_NODES.add("app/plugins"); // NOI18N
+    }
 
     private CakePHP3Options() {
     }
@@ -75,6 +94,18 @@ public String getComposerPath() {
         return getComposerPreferences().get("composer.path", ""); // NOI18N
     }
 
+    public List<String> getAvailableCustomNodes() {
+        String nodes = getPreferences().get(AVAILABLE_CUSTOM_NODES, null);
+        if (nodes == null) {
+            return DEFAULT_AVAILABLE_NODES;
+        }
+        return StringUtils.explode(nodes, "|"); // NOI18N
+    }
+
+    public void setAvailableCustomNodes(List<String> nodes) {
+        getPreferences().put(AVAILABLE_CUSTOM_NODES, StringUtils.implode(nodes, "|")); // NOI18N
+    }
+
     private Preferences getPreferences() {
         return NbPreferences.forModule(CakePHP3Options.class).node(PREFERENCES_PATH);
     }