Skip to content

Commit e452035

Browse files
junichi11junichi11
committed
Merge branch 'nb120' into nb122
2 parents 78708f7 + 3981c4a commit e452035

File tree

6 files changed

+197
-176
lines changed

6 files changed

+197
-176
lines changed

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

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 30 additions & 23 deletions
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‎

Lines changed: 1 addition & 1 deletion
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)