Skip to content

Commit 285c169

Browse files
committed
Merge branch 'nb120'
2 parents 4914bf3 + 96691b1 commit 285c169

14 files changed

+309
-183
lines changed

build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<property name="groupId" value="com.junichi11.netbeans.modules" />
1414
<property name="artifactId" value="netbeans-cakephp3" />
1515
<!-- also change the version of pom.xml -->
16-
<property name="version" value="0.9.0" />
16+
<property name="version" value="0.9.1" />
1717
<!-- defined maven snapshots and staging repository id and url -->
1818
<property name="ossrh-snapshots-repository-url"
1919
value="https://oss.sonatype.org/content/repositories/snapshots/" />

manifest.mf

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: true
33
OpenIDE-Module: org.netbeans.modules.php.cake3
44
OpenIDE-Module-Layer: org/netbeans/modules/php/cake3/resources/layer.xml
55
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/cake3/Bundle.properties
6-
OpenIDE-Module-Specification-Version: 0.9.0
6+
OpenIDE-Module-Specification-Version: 0.9.1

pom/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.junichi11.netbeans.modules</groupId>
55
<artifactId>netbeans-cakephp3</artifactId>
66
<!-- change the version of build.xml -->
7-
<version>0.9.0</version>
7+
<version>0.9.1</version>
88
<packaging>nbm</packaging>
99
<name>NetBeans CakePHP3/4 Framework</name>
1010
<url>https://github.com/junichi11/</url>

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

+22
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,10 @@ protected FileObject getDirectory(FileObject baseDirectory, Base base, Category
389389
sb.append(getSrcDirName(base));
390390
sb.append("/Controller"); // NOI18N
391391
break;
392+
case COMMAND:
393+
sb.append(getSrcDirName(base));
394+
sb.append("/Command"); // NOI18N
395+
break;
392396
case COMPONENT:
393397
sb.append(getSrcDirName(base));
394398
sb.append("/Controller/Component"); // NOI18N
@@ -446,6 +450,14 @@ protected FileObject getDirectory(FileObject baseDirectory, Base base, Category
446450
sb.append(getSrcDirName(base));
447451
sb.append("/Locale"); // NOI18N
448452
break;
453+
case Mailer:
454+
sb.append(getSrcDirName(base));
455+
sb.append("/Mailer"); // NOI18N
456+
break;
457+
case Middleware:
458+
sb.append(getSrcDirName(base));
459+
sb.append("/Middleware"); // NOI18N
460+
break;
449461
case MODEL:
450462
sb.append(getSrcDirName(base));
451463
sb.append("/Model"); // NOI18N
@@ -454,10 +466,20 @@ protected FileObject getDirectory(FileObject baseDirectory, Base base, Category
454466
sb.append(getSrcDirName(base));
455467
sb.append("/Template/Pages"); // NOI18N
456468
break;
469+
case PLUGINS:
470+
sb.append("plugins"); // NOI18N
471+
break;
472+
case SEEDS:
473+
sb.append("config/Seeds"); // NOI18N
474+
break;
457475
case SHELL:
458476
sb.append(getSrcDirName(base));
459477
sb.append("/Shell"); // NOI18N
460478
break;
479+
case SHELL_HELPER:
480+
sb.append(getSrcDirName(base));
481+
sb.append("/Shell/Helper"); // NOI18N
482+
break;
461483
case TABLE:
462484
sb.append(getSrcDirName(base));
463485
sb.append("/Model/Table"); // NOI18N

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

+22
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ protected FileObject getDirectory(FileObject baseDirectory, CakePHPModule.Base b
5858
sb.append(getSrcDirName(base));
5959
sb.append("/Controller"); // NOI18N
6060
break;
61+
case COMMAND:
62+
sb.append(getSrcDirName(base));
63+
sb.append("/Command"); // NOI18N
64+
break;
6165
case COMPONENT:
6266
sb.append(getSrcDirName(base));
6367
sb.append("/Controller/Component"); // NOI18N
@@ -111,17 +115,35 @@ protected FileObject getDirectory(FileObject baseDirectory, CakePHPModule.Base b
111115
sb.append(getSrcDirName(base));
112116
sb.append("/Locale"); // NOI18N
113117
break;
118+
case Mailer:
119+
sb.append(getSrcDirName(base));
120+
sb.append("/Mailer"); // NOI18N
121+
break;
122+
case Middleware:
123+
sb.append(getSrcDirName(base));
124+
sb.append("/Middleware"); // NOI18N
125+
break;
114126
case MODEL:
115127
sb.append(getSrcDirName(base));
116128
sb.append("/Model"); // NOI18N
117129
break;
118130
case PAGES:
119131
sb.append("templates/Pages"); // NOI18N
120132
break;
133+
case PLUGINS:
134+
sb.append("plugins"); // NOI18N
135+
break;
136+
case SEEDS:
137+
sb.append("config/Seeds"); // NOI18N
138+
break;
121139
case SHELL:
122140
sb.append(getSrcDirName(base));
123141
sb.append("/Shell"); // NOI18N
124142
break;
143+
case SHELL_HELPER:
144+
sb.append(getSrcDirName(base));
145+
sb.append("/Shell/Helper"); // NOI18N
146+
break;
125147
case TABLE:
126148
sb.append(getSrcDirName(base));
127149
sb.append("/Model/Table"); // NOI18N

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ public class CakePHPModule {
3939
public static String PROPERTY_CHANGE_CAKE3 = "property-change-cake3"; // NOI18N
4040

4141
public enum Category {
42-
4342
BEHAVIOR("Behavior"), // NOI18N
4443
CONFIG(""), // NOI18N
4544
CONSOLE(""), // NOI18N
4645
CONTROLLER("Controller"), // NOI18N
46+
COMMAND("Command"), // NOI18N
4747
COMPONENT("Component"), // NOI18N
4848
CSS(""), // NOI18N
4949
DIR(""), // NOI18N
@@ -59,8 +59,13 @@ public enum Category {
5959
LAYOUT(""), // NOI18N
6060
LOCALE(""), // NOI18N
6161
MODEL(""), // NOI18N
62+
Mailer("Mailer"), // NOI18N
63+
Middleware("Middleware"), // NOI18N
6264
PAGES(""), // NOI18N
65+
PLUGINS(""), // NOI18N
66+
SEEDS("Seed"), // NOI18N
6367
SHELL("Shell"), // NOI18N
68+
SHELL_HELPER("Helper"), // NOI18N
6469
TABLE("Table"), // NOI18N
6570
TASK("Task"), // NOI18N
6671
TEMPLATE(""), // NOI18N
@@ -84,7 +89,6 @@ public String getSuffix() {
8489
}
8590

8691
public enum Base {
87-
8892
APP,
8993
PLUGIN,
9094
VENDOR,

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

+10
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,23 @@ public class CakePHP3Options {
4747
public static final List<String> ALL_AVAILABLE_NODES = new ArrayList<>(DEFAULT_AVAILABLE_NODES);
4848

4949
static {
50+
ALL_AVAILABLE_NODES.add("Command"); // NOI18N
5051
ALL_AVAILABLE_NODES.add("Element"); // NOI18N
5152
ALL_AVAILABLE_NODES.add("Entity"); // NOI18N
53+
ALL_AVAILABLE_NODES.add("Fixture"); // NOI18N
5254
ALL_AVAILABLE_NODES.add("Form"); // NOI18N
55+
ALL_AVAILABLE_NODES.add("Mailer"); // NOI18N
56+
ALL_AVAILABLE_NODES.add("Middleware"); // NOI18N
5357
ALL_AVAILABLE_NODES.add("Shell"); // NOI18N
58+
ALL_AVAILABLE_NODES.add("Shell/Helper"); // NOI18N
59+
ALL_AVAILABLE_NODES.add("Shell/Task"); // NOI18N
5460
ALL_AVAILABLE_NODES.add("Table"); // NOI18N
5561
ALL_AVAILABLE_NODES.add("Template"); // NOI18N
62+
ALL_AVAILABLE_NODES.add("Template/Cell"); // NOI18N
63+
ALL_AVAILABLE_NODES.add("TestCase"); // NOI18N
64+
ALL_AVAILABLE_NODES.add("View/Cell"); // NOI18N
5665
ALL_AVAILABLE_NODES.add("app/plugins"); // NOI18N
66+
ALL_AVAILABLE_NODES.add("config/Seeds"); // NOI18N
5767
Collections.sort(ALL_AVAILABLE_NODES);
5868
}
5969

src/org/netbeans/modules/php/cake3/ui/GoToPopup.form

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
<AuxValues>
88
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
99
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
10-
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
10+
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="false"/>
1111
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
1212
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
13+
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
1314
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
1415
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
1516
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>

src/org/netbeans/modules/php/cake3/ui/GoToPopup.java

+30-23
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,14 @@
1717

1818
import java.awt.Component;
1919
import java.awt.Cursor;
20+
import java.awt.GridBagConstraints;
21+
import java.awt.GridBagLayout;
2022
import java.awt.Toolkit;
2123
import java.awt.event.FocusEvent;
2224
import java.awt.event.FocusListener;
25+
import java.awt.event.KeyAdapter;
2326
import java.awt.event.KeyEvent;
27+
import java.awt.event.MouseAdapter;
2428
import java.awt.event.MouseEvent;
2529
import java.util.ArrayList;
2630
import java.util.List;
@@ -29,7 +33,10 @@
2933
import javax.swing.JLabel;
3034
import javax.swing.JList;
3135
import javax.swing.JPanel;
36+
import javax.swing.JScrollPane;
37+
import javax.swing.JTextField;
3238
import javax.swing.ListModel;
39+
import javax.swing.SwingConstants;
3340
import javax.swing.event.DocumentEvent;
3441
import javax.swing.event.DocumentListener;
3542
import javax.swing.text.Document;
@@ -129,63 +136,63 @@ private String getFilter() {
129136
*/
130137
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
131138
private void initComponents() {
132-
java.awt.GridBagConstraints gridBagConstraints;
139+
GridBagConstraints gridBagConstraints;
133140

134-
jLabel1 = new javax.swing.JLabel();
135-
jScrollPane1 = new javax.swing.JScrollPane();
136-
jList1 = new javax.swing.JList<GoToItem>();
137-
filterTextField = new javax.swing.JTextField();
141+
jLabel1 = new JLabel();
142+
jScrollPane1 = new JScrollPane();
143+
jList1 = new JList<>();
144+
filterTextField = new JTextField();
138145

139146
setFocusCycleRoot(true);
140-
setLayout(new java.awt.GridBagLayout());
147+
setLayout(new GridBagLayout());
141148

142-
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
149+
jLabel1.setHorizontalAlignment(SwingConstants.CENTER);
143150
jLabel1.setText(caption
144151
);
145152
jLabel1.setFocusable(false);
146-
gridBagConstraints = new java.awt.GridBagConstraints();
147-
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
153+
gridBagConstraints = new GridBagConstraints();
154+
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
148155
add(jLabel1, gridBagConstraints);
149156

150157
jList1.setModel(createListModel());
151158
jList1.setCellRenderer(new RendererImpl());
152159
jList1.setSelectedIndex(0);
153160
jList1.setVisibleRowCount(items.size()
154161
);
155-
jList1.addKeyListener(new java.awt.event.KeyAdapter() {
156-
public void keyPressed(java.awt.event.KeyEvent evt) {
162+
jList1.addKeyListener(new KeyAdapter() {
163+
public void keyPressed(KeyEvent evt) {
157164
jList1KeyPressed(evt);
158165
}
159166
});
160-
jList1.addMouseListener(new java.awt.event.MouseAdapter() {
161-
public void mouseClicked(java.awt.event.MouseEvent evt) {
167+
jList1.addMouseListener(new MouseAdapter() {
168+
public void mouseClicked(MouseEvent evt) {
162169
jList1MouseClicked(evt);
163170
}
164171
});
165172
jScrollPane1.setViewportView(jList1);
166173

167-
gridBagConstraints = new java.awt.GridBagConstraints();
174+
gridBagConstraints = new GridBagConstraints();
168175
gridBagConstraints.gridx = 0;
169176
gridBagConstraints.gridy = 2;
170-
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
177+
gridBagConstraints.fill = GridBagConstraints.BOTH;
171178
gridBagConstraints.weightx = 1.0;
172179
gridBagConstraints.weighty = 1.0;
173180
add(jScrollPane1, gridBagConstraints);
174-
gridBagConstraints = new java.awt.GridBagConstraints();
181+
gridBagConstraints = new GridBagConstraints();
175182
gridBagConstraints.gridx = 0;
176183
gridBagConstraints.gridy = 1;
177-
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
184+
gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
178185
add(filterTextField, gridBagConstraints);
179186
}// </editor-fold>//GEN-END:initComponents
180187

181-
private void jList1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jList1MouseClicked
188+
private void jList1MouseClicked(MouseEvent evt) {//GEN-FIRST:event_jList1MouseClicked
182189
// TODO add your handling code here:
183190
if (evt.getButton() == MouseEvent.BUTTON1 && evt.getClickCount() == 1) {
184191
openSelected();
185192
}
186193
}//GEN-LAST:event_jList1MouseClicked
187194

188-
private void jList1KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jList1KeyPressed
195+
private void jList1KeyPressed(KeyEvent evt) {//GEN-FIRST:event_jList1KeyPressed
189196
// TODO add your handling code here:
190197
if (evt.getKeyCode() == KeyEvent.VK_ENTER && evt.getModifiers() == 0) {
191198
openSelected();
@@ -326,10 +333,10 @@ private void jList1KeyPressed(java.awt.event.KeyEvent evt) {//GEN-FIRST:event_jL
326333
}//GEN-LAST:event_jList1KeyPressed
327334

328335
// Variables declaration - do not modify//GEN-BEGIN:variables
329-
private javax.swing.JTextField filterTextField;
330-
private javax.swing.JLabel jLabel1;
331-
private javax.swing.JList<GoToItem> jList1;
332-
private javax.swing.JScrollPane jScrollPane1;
336+
private JTextField filterTextField;
337+
private JLabel jLabel1;
338+
private JList<GoToItem> jList1;
339+
private JScrollPane jScrollPane1;
333340
// End of variables declaration//GEN-END:variables
334341

335342
private void openSelected() {

src/org/netbeans/modules/php/cake3/ui/customizer/CakePHP3CustomizerPanel.form

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AuxValues>
55
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
66
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
7-
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
7+
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="false"/>
88
<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
99
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
1010
<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>

0 commit comments

Comments
 (0)