10000 migrate ServiceCreate dialog to Java8 api level · Koc/idea-php-symfony2-plugin@bf89924 · GitHub
[go: up one dir, main page]
Skip to content

Commit bf89924

Browse files
HaehnchenHaehnchen
committed
migrate ServiceCreate dialog to Java8 api level
1 parent 0925575 commit bf89924

File tree

1 file changed

+28
-76
lines changed

1 file changed

+28
-76
lines changed

‎src/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java

Lines changed: 28 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,9 @@ public void init() {
108108
setContentPane(panel1);
109109
setModal(true);
110110

111-
this.classCompletionPanelWrapper = new ClassCompletionPanelWrapper(project, panelFoo, new Consumer<String>() {
112-
@Override
113-
public void consume(String s) {
114-
update();
115-
}
116-
});
111+
this.classCompletionPanelWrapper = new ClassCompletionPanelWrapper(project, panelFoo, s -> update());
117112

118-
this.modelList = new ListTableModel<MethodParameter.MethodModelParameter>(
113+
this.modelList = new ListTableModel<>(
119114
new IconColumn(),
120115
new NamespaceColumn(),
121116
new ParameterIndexColumn(),
@@ -129,8 +124,7 @@ public void consume(String s) {
129124
radioButtonOutYaml.setSelected(true);
130125
}
131126

132-
133-
this.tableView = new TableView<MethodParameter.MethodModelParameter>();
127+
this.tableView = new TableView<>();
134128
this.tableView.setModelAndUpdateColumns(this.modelList);
135129

136130
tableViewPanel.add(ToolbarDecorator.createDecorator(this.tableView)
@@ -143,71 +137,39 @@ public void consume(String s) {
143137

144138
this.serviceClass = ContainerCollectionResolver.getServices(project);
145139

146-
this.serviceSetComplete = new TreeSet<String>();
140+
this.serviceSetComplete = new TreeSet<>();
147141
serviceSetComplete.add("");
148142
serviceSetComplete.addAll(this.serviceClass.keySet());
149143

150144
//update();
151145

152-
this.modelList.addTableModelListener(new TableModelListener() {
153-
@Override
154-
public void tableChanged(TableModelEvent e) {
155-
generateServiceDefinition();
156-
}
146+
this.modelList.addTableModelListener(e -> generateServiceDefinition());
157147

158-
});
159-
160-
this.generateButton.addActionListener(new ActionListener() {
161-
@Override
162-
public void actionPerformed(ActionEvent e) {
163-
update();
164-
}
165-
});
148+
this.generateButton.addActionListener(e -> update());
166149

167150

168-
this.closeButton.addActionListener(new ActionListener() {
169-
@Override
170-
public void actionPerformed(ActionEvent e) {
171-
setEnabled(false);
172-
dispose();
173-
}
151+
this.closeButton.addActionListener(e -> {
152+
setEnabled(false);
153+
dispose();
174154
});
175155

176-
this.buttonCopy.addActionListener(new ActionListener() {
177-
@Override
178-
public void actionPerformed(ActionEvent e) {
179-
if(StringUtils.isBlank(textAreaOutput.getText())) {
180-
return;
181-
}
182-
183-
StringSelection stringSelection = new StringSelection(textAreaOutput.getText());
184-
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard ();
185-
clipboard.setContents(stringSelection, null);
156+
this.buttonCopy.addActionListener(e -> {
157+
if(StringUtils.isBlank(textAreaOutput.getText())) {
158+
return;
186159
}
187-
});
188160

189-
this.buttonSettings.addActionListener(new ActionListener() {
190-
@Override
191-
public void actionPerformed(ActionEvent e) {
192-
SymfonyJavascriptServiceNameForm.create(SymfonyCreateService.this, project, classCompletionPanelWrapper.getClassName());
193-
}
161+
StringSelection stringSelection = new StringSelection(textAreaOutput.getText());
162+
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard ();
163+
clipboard.setContents(stringSelection, null);
194164
});
195165

166+
this.buttonSettings.addActionListener(e -> SymfonyJavascriptServiceNameForm.create(SymfonyCreateService.this, project, classCompletionPanelWrapper.getClassName()));
167+
196168
initClassName();
197169

198-
radioButtonOutXml.addChangeListener(new ChangeListener() {
199-
@Override
200-
public void stateChanged(ChangeEvent e) {
201-
generateServiceDefinition();
202-
}
203-
});
170+
radioButtonOutXml.addChangeListener(e -> generateServiceDefinition());
204171

205-
radioButtonOutYaml.addChangeListener(new ChangeListener() {
206-
@Override
207-
public void stateChanged(ChangeEvent e) {
208-
generateServiceDefinition();
209-
}
210-
});
172+
radioButtonOutYaml.addChangeListener(e -> generateServiceDefinition());
211173

212174
textFieldServiceName.getDocument().addDocumentListener(new DocumentListener() {
213175
@Override
@@ -227,9 +189,7 @@ public void changedUpdate(DocumentEvent e) {
227189
});
228190

229191
// exit on "esc" key
230-
this.getRootPane().registerKeyboardAction(e -> {
231-
dispose();
232-
}, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW);
192+
this.getRootPane().registerKeyboardAction(e -> dispose(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW);
233193

234194
// insert
235195
if(this.psiFile instanceof XmlFile || this.psiFile instanceof YAMLFile) {
@@ -358,12 +318,7 @@ private void generateServiceDefinition() {
358318
}
359319

360320
private void update() {
361-
ApplicationManager.getApplication().runReadAction(new Thread(new Runnable() {
362-
@Override
363-
public void run() {
364-
updateTask();
365-
}
366-
}));
321+
ApplicationManager.getApplication().runReadAction(new Thread(this::updateTask));
367322
}
368323

369324
private void updateTask() {
@@ -386,7 +341,7 @@ private void updateTask() {
386341

387342
textFieldServiceName.setText(generateServiceName(className));
388343

389-
List<MethodParameter.MethodModelParameter> modelParameters = new ArrayList<MethodParameter.MethodModelParameter>();
344+
List<MethodParameter.MethodModelParameter> modelParameters = new ArrayList<>();
390345

391346
for(Method method: phpClass.getMethods()) {
392347
if(method.getModifier().isPublic()) {
@@ -405,16 +360,13 @@ private void updateTask() {
405360
method.getName();
406361
}
407362

408-
Collections.sort(modelParameters, new Comparator<MethodParameter.MethodModelParameter>() {
409-
@Override
410-
public int compare(MethodParameter.MethodModelParameter o1, MethodParameter.MethodModelParameter o2) {
411-
int i = o1.getName().compareTo(o2.getName());
412-
if (i != 0) {
413-
return i;
414-
}
415-
416-
return Integer.valueOf(o1.getIndex()).compareTo(o2.getIndex());
363+
Collections.sort(modelParameters, (o1, o2) -> {
364+
int i = o1.getName().compareTo(o2.getName());
365+
if (i != 0) {
366+
return i;
417367
}
368+
369+
return Integer.valueOf(o1.getIndex()).compareTo(o2.getIndex());
418370
});
419371

420372
while(this.modelList.getRowCount() > 0) {

0 commit comments

Comments
 (0)
0