Merge branch 'nb82'

Author: junichi11

manifest.mf

@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.netbeans.modules.php.cake3
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/cake3/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.5.0
+OpenIDE-Module-Specification-Version: 0.5.1
 

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

@@ -43,6 +43,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.prefs.Preferences;
 import org.netbeans.modules.php.api.util.StringUtils;
@@ -72,7 +73,13 @@ public class CakePHP3Options {
     public static final List<String> ALL_AVAILABLE_NODES = new ArrayList<>(DEFAULT_AVAILABLE_NODES);
 
     static {
+        ALL_AVAILABLE_NODES.add("Element"); // NOI18N
+        ALL_AVAILABLE_NODES.add("Entity"); // NOI18N
+        ALL_AVAILABLE_NODES.add("Shell"); // NOI18N
+        ALL_AVAILABLE_NODES.add("Table"); // NOI18N
+        ALL_AVAILABLE_NODES.add("Template"); // NOI18N
         ALL_AVAILABLE_NODES.add("app/plugins"); // NOI18N
+        Collections.sort(ALL_AVAILABLE_NODES);
     }
 
     private CakePHP3Options() {

src/org/netbeans/modules/php/cake3/ui/logicalview/MVCNodeFactory.java

@@ -148,6 +148,21 @@ private List<Object> getAvailableCustomNodeList() {
                     case "Helper": // NOI18N
                         list.add(Category.HELPER);
                         break;
+                    case "Element": // NOI18N
+                        list.add(Category.ELEMENT);
+                        break;
+                    case "Entity": // NOI18N
+                        list.add(Category.ENTITY);
+                        break;
+                    case "Shell": // NOI18N
+                        list.add(Category.SHELL);
+                        break;
+                    case "Table": // NOI18N
+                        list.add(Category.TABLE);
+                        break;
+                    case "Template": // NOI18N
+                        list.add(Category.TEMPLATE);
+                        break;
                     case "app/plugins": // NOI18N
                         // XXX this is not proper
                         list.add(Base.PLUGIN);