Merge branch 'netbeans73dev' into netbeans73

Author: junichi11

README.md

@@ -6,15 +6,20 @@ This plugin provides support for CakePHP.
 
 - 2010/07/16
 - 2012/09/08 Support for NetBeans7.3
-- 2013/06/03 last update
+- 2013/07/12 last update
 
 ## ENVIRONMENT
 
 - NetBeans 7.3+
 - CakePHP 1.3.x
 - CakePHP 2.x
+- CakePHP 3.x (early support)
 
-## WHAT WORKS:
+## About CakePHP 3.x
+
+This plugin recognizes CakePHP3. But many features might not work yet.
+
+## WHAT WORKS
 
 - badge icon ![badge icon](https://raw.github.com/junichi11/cakephp-netbeans/cakephp2/src/org/cakephp/netbeans/ui/resources/cakephp_badge_8.png) (displayed on project folder)
 - configuration files (add app/config files to important files)
@@ -23,6 +28,7 @@ This plugin provides support for CakePHP.
 - ignored files (hide app/tmp directory)
 - cake commands support [*1]
 - go to view, go to action
+- smart go to [v0.9.0]
 - clear cache action [*1]
 - install plugins action (from zip file URL)[*1]
 - template files (ctp, helper, component, behavior, shell, task)
@@ -36,8 +42,9 @@ This plugin provides support for CakePHP.
 - check default action [v0.6.15]
 - image and element code completion [v0.6.16]
 - support for PHPUnit settings and create test case [v0.6.17]
-- code generate [v0.8.1]
+- code generation [v0.8.1]
 - run action action
+- fix namespace action (only CakePHP3.x)
 
 [*1] right-click in project node > CakePHP > (Run Command | Clear Cache | Install Plugins)
 
@@ -271,6 +278,49 @@ Similar to Go to view action.
 1. Right-click on the view file (in editor)
 2. Navigate > Go to action
 
+### Smart Go To [v0.9.0]
+
+You can go to specific files relate to a current file.
+e.g. In case of current file is Controller, you can go to existing view, model, component, helper and test.
+![go to navigations matrix](https://dl.dropboxusercontent.com/u/10953443/netbeans-cakephp-plugin/go-to-navigagions-matrix.png)
+
+#### how to run
+
+There are three ways.
+
+- Shortcuts
+- Editor Toolbar Menu
+- Context Menu
+
+#### shortcuts
+
+Pattern : [Ctrl + Shift + G] [*] \(or [Ctrl + J] [*]\)
+
+- **[Ctrl + Shift + G] [S]** : Smart Go To
+- **[Ctrl + Shift + G] [M]** : Go To Model
+- **[Ctrl + Shift + G] [V]** : Go To View
+- **[Ctrl + Shift + G] [C]** : Go To Controller
+- **[Ctrl + Shift + G] [B]** : Go To Behavior
+- **[Ctrl + Shift + G] [H]** : Go To Helper
+- **[Ctrl + Shift + G] [P]** : Go To Component
+- **[Ctrl + Shift + G] [T]** : Go To Test Case
+- **[Ctrl + Shift + G] [F]** : Go To Fixture
+
+Of course, if you don't like these shortcuts, you are able to change them in Options (KeyMap).
+
+#### settings
+
+project properties > Frameworks > CakePHP
+Please uncheck the following if you would like to go to it soon (without popup) when candidate file is only one.
+
+- Show the popup for one candidate item.
+
+#### notice
+
+- Core helpers, components and behaviors are not contained in popup items.
+- Go To View / Action Action is not changed yet.
+- Automatic creation option is not available in this feature.
+
 ### Format+ Action (Format for CakePHP)
 
 This action run the following.
@@ -341,7 +391,7 @@ If you run this action, you can test using fixture with NetBeans.
 
 https://gist.github.com/2055307 ([nojimage](https://github.com/nojimage))
 
-### Code Generate
+### Code Generation
 #### How to run
 `Alt` + `Insert` or Right-click on editor, select `Insert Code`.
 
@@ -409,12 +459,22 @@ Currently, this is available for the simple situation.
 
 Please also see the following: https://github.com/junichi11/cakephp-netbeans/issues/16
 
-## HOW TO RUN:
+### Fix Namespace Action (CakePHP 3.x)
+
+Add namespace to top of file if it doesn't exist.
+
+```php
+// e.g.
+<?php 
+namespace App\Controller;
+```
+
+## HOW TO RUN
 
 - download NBM file or manually create NBM file
 - manually install NBM file
 
-## HOW TO DEVELOP:
+## HOW TO DEVELOP
 
 - read this page [1] for the general overview but notice that current sources need to be used, then
 - checkout NB sources via Mercurial (preferred, easy updates)[2] or download archive with latest NB sources from NB download site [3]

manifest.mf

@@ -2,4 +2,4 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.cakephp.netbeans
 OpenIDE-Module-Layer: org/cakephp/netbeans/resources/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/cakephp/netbeans/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.8.8
+OpenIDE-Module-Specification-Version: 0.9.0

src/org/cakephp/netbeans/CakePhp.java

@@ -52,5 +52,15 @@ public class CakePhp {
     public static final String CAKE_ICON_16 = "org/cakephp/netbeans/ui/resources/cakephp_icon_16.png";
     public static final String CAKE_SUCCESS_ICON_16 = "org/cakephp/netbeans/ui/resources/cakephp_success_icon_16.png";
     public static final String CAKE_FAIL_ICON_16 = "org/cakephp/netbeans/ui/resources/cakephp_fail_icon_16.png";
+    public static final String PHP_ICON = "org/cakephp/netbeans/resources/php_icon.png";
+    public static final String CTP_ICON = "org/cakephp/netbeans/resources/ctp_icon.png";
+    public static final String GOTO_CONTROLLER_ICON = "org/cakephp/netbeans/ui/resources/goto_controller_icon.png";
+    public static final String GOTO_MODEL_ICON = "org/cakephp/netbeans/ui/resources/goto_model_icon.png";
+    public static final String GOTO_VIEW_ICON = "org/cakephp/netbeans/ui/resources/goto_view_icon.png";
+    public static final String GOTO_COMPONENT_ICON = "org/cakephp/netbeans/ui/resources/goto_component_icon.png";
+    public static final String GOTO_HELPER_ICON = "org/cakephp/netbeans/ui/resources/goto_helper_icon.png";
+    public static final String GOTO_BEHAVIOR_ICON = "org/cakephp/netbeans/ui/resources/goto_behavior_icon.png";
+    public static final String GOTO_TESTCASE_ICON = "org/cakephp/netbeans/ui/resources/goto_testcase_icon.png";
+    public static final String GOTO_FIXTURE_ICON = "org/cakephp/netbeans/ui/resources/goto_fixture_icon.png";
     public static final String CTP = "ctp";
 }

src/org/cakephp/netbeans/CakePhpActionsExtender.java

@@ -47,6 +47,8 @@
 import org.cakephp.netbeans.ui.actions.*;
 import org.cakephp.netbeans.ui.wizards.InstallPluginsWizardAction;
 import org.cakephp.netbeans.util.CakePhpUtils;
+import org.cakephp.netbeans.util.CakeVersion;
+import org.netbeans.modules.php.api.phpmodule.PhpModule;
 import org.netbeans.modules.php.spi.framework.PhpModuleActionsExtender;
 import org.netbeans.modules.php.spi.framework.actions.GoToActionAction;
 import org.netbeans.modules.php.spi.framework.actions.GoToViewAction;
@@ -66,8 +68,11 @@ public List<? extends Action> getActions() {
         List<Action> list = new ArrayList<Action>();
         list.add(ClearCacheAction.getInstance());
         list.add(InstallPluginsWizardAction.getInstance());
-        list.add(CheckDefault.getInstance());
-        list.add(PHPUnitInitAction.getInstance());
+        list.add(CheckDefaultAction.getInstance());
+        PhpModule phpModule = PhpModule.inferPhpModule();
+        if (CakeVersion.getInstance(phpModule).getMajor() >= 2) {
+            list.add(PHPUnitInitAction.getInstance());
+        }
         return list;
     }
 

src/org/cakephp/netbeans/CakePhpFrameworkProvider.java

@@ -48,7 +48,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import org.cakephp.netbeans.commands.CakePhpCommandSupport;
-import org.cakephp.netbeans.editor.CakePhpEditorExtender;
+import org.cakephp.netbeans.editor.codecompletion.CakePhpEditorExtenderFactory;
 import org.cakephp.netbeans.module.CakePhpModule;
 import org.cakephp.netbeans.module.CakePhpModule.DIR_TYPE;
 import org.netbeans.modules.php.api.framework.BadgeIcon;
@@ -83,11 +83,11 @@ public int compare(File o1, File o2) {
 
     private CakePhpFrameworkProvider() {
         super("cakephp", // NOI18N
-            NbBundle.getMessage(CakePhpFrameworkProvider.class, "LBL_CakePhpFramework"),
-            NbBundle.getMessage(CakePhpFrameworkProvider.class, "LBL_CakePhpDescription"));
+                NbBundle.getMessage(CakePhpFrameworkProvider.class, "LBL_CakePhpFramework"),
+                NbBundle.getMessage(CakePhpFrameworkProvider.class, "LBL_CakePhpDescription"));
         badgeIcon = new BadgeIcon(
-            ImageUtilities.loadImage(ICON_PATH),
-            CakePhpFrameworkProvider.class.getResource("/" + ICON_PATH)); // NOI18N
+                ImageUtilities.loadImage(ICON_PATH),
+                CakePhpFrameworkProvider.class.getResource("/" + ICON_PATH)); // NOI18N
     }
 
     @PhpFrameworkProvider.Registration(position = 500)
@@ -177,6 +177,6 @@ public FrameworkCommandSupport getFrameworkCommandSupport(PhpModule phpModule) {
 
     @Override
     public EditorExtender getEditorExtender(PhpModule phpModule) {
-        return new CakePhpEditorExtender();
+        return CakePhpEditorExtenderFactory.create(phpModule);
     }
 }

src/org/cakephp/netbeans/CakePhpModuleCustomizerExtender.java

@@ -63,13 +63,15 @@ public class CakePhpModuleCustomizerExtender extends PhpModuleCustomizerExtender
     private final String cakePhpDirPath;
     private final boolean isProjectDir;
     private final boolean originalIgnoreTmpDirectory;
+    private final boolean isShowPopupForOneItem;
 
     CakePhpModuleCustomizerExtender(PhpModule phpModule) {
         appName = CakePreferences.getAppName(phpModule);
         originalAutoCreateState = CakePreferences.getAutoCreateView(phpModule);
         cakePhpDirPath = CakePreferences.getCakePhpDirPath(phpModule);
         isProjectDir = CakePreferences.useProjectDirectory(phpModule);
         originalIgnoreTmpDirectory = CakePreferences.ignoreTmpDirectory(phpModule);
+        isShowPopupForOneItem = CakePreferences.isShowPopupForOneItem(phpModule);
     }
 
     @Override
@@ -118,6 +120,9 @@ public EnumSet<Change> save(PhpModule phpModule) {
         if (isProjectDir != getPanel().isUseProjectDirectory()) {
             CakePreferences.setUseProjectDirectory(phpModule, !isProjectDir);
         }
+        if (isShowPopupForOneItem != getPanel().isShowPopupForOneItem()) {
+            CakePreferences.setShowPopupForOneItem(phpModule, !isShowPopupForOneItem);
+        }
         if (!cakePhpDirPath.equals(newCakePhpDirPath)) {
             CakePreferences.setCakePhpDirPath(phpModule, newCakePhpDirPath);
         }
@@ -141,6 +146,7 @@ private CakePhpCustomizerPanel getPanel() {
             component.setCakePhpDirTextField(cakePhpDirPath);
             component.setUseProjectDirectory(isProjectDir);
             component.setIgnoreTmpDirectory(originalIgnoreTmpDirectory);
+            component.setShowPopupForOneItem(isShowPopupForOneItem);
         }
         return component;
     }