Skip to content

Commit 2f0d4ae

Browse files
junichi11junichi11
committed
Convert to lambda expressions and method reference
1 parent 15796b0 commit 2f0d4ae

9 files changed

Lines changed: 89 additions & 151 deletions

‎src/org/netbeans/modules/php/wordpress/WordPressModuleInstall.java‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,18 @@ public void restored() {
108108
WordPressOptions options = WordPressOptions.getInstance();
109109
String wpCliPath = options.getWpCliPath();
110110
if (!StringUtils.isEmpty(wpCliPath) && options.getWpCliGetCommandsOnBoot()) {
111-
RequestProcessor.getDefault().post(new Runnable() {
112-
113-
@Override
114-
public void run() {
115-
ProgressHandle handle = ProgressHandle.createHandle(Bundle.WordPressModule_get_commands());
111+
RequestProcessor.getDefault().post(() -> {
112+
ProgressHandle handle = ProgressHandle.createHandle(Bundle.WordPressModule_get_commands());
113+
try {
114+
handle.start();
116115
try {
117-
handle.start();
118-
try {
119-
WordPressCli wpCli = WordPressCli.getDefault(false);
120-
wpCli.getCommands(false);
121-
} catch (InvalidPhpExecutableException ex) {
122-
LOGGER.log(Level.WARNING, ex.getLocalizedMessage());
123-
}
124-
125-
} finally {
126-
handle.finish();
116+
WordPressCli wpCli = WordPressCli.getDefault(false);
117+
wpCli.getCommands(false);
118+
} catch (InvalidPhpExecutableException ex) {
119+
LOGGER.log(Level.WARNING, ex.getLocalizedMessage());
127120
}
121+
} finally {
122+
handle.finish();
128123
}
129124
});
130125
}

‎src/org/netbeans/modules/php/wordpress/commands/WordPressCli.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -542,12 +542,7 @@ private List<String> getAllParameters(List<String> parameters) {
542542
* @return InputProcessorFactory
543543
*/
544544
private ExecutionDescriptor.InputProcessorFactory2 getOutputProcessorFactory(final LineProcessor lineProcessor) {
545-
return new ExecutionDescriptor.InputProcessorFactory2() {
546-
@Override
547-
public InputProcessor newInputProcessor(InputProcessor defaultProcessor) {
548-
return InputProcessors.ansiStripping(InputProcessors.bridge(lineProcessor));
549-
}
550-
};
545+
return (InputProcessor defaultProcessor) -> InputProcessors.ansiStripping(InputProcessors.bridge(lineProcessor));
551546
}
552547

553548
@NbBundle.Messages({

‎src/org/netbeans/modules/php/wordpress/ui/actions/CreateChildThemeAction.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,17 @@ protected void actionPerformed(PhpModule phpModule) {
135135
Collections.sort(themes);
136136

137137
// show dialog
138-
SwingUtilities.invokeLater(new Runnable() {
139-
140-
@Override
141-
public void run() {
142-
getDescriptor().setValid(false);
143-
DialogDisplayer displayer = DialogDisplayer.getDefault();
144-
if (displayer.notify(getDescriptor()) == DialogDescriptor.OK_OPTION) {
145-
try {
146-
createChildTheme(themesDirectory);
147-
} catch (IOException ex) {
148-
Exceptions.printStackTrace(ex);
149-
}
138+
SwingUtilities.invokeLater(() -> {
139+
getDescriptor().setValid(false);
140+
DialogDisplayer displayer = DialogDisplayer.getDefault();
141+
if (displayer.notify(getDescriptor()) == DialogDescriptor.OK_OPTION) {
142+
try {
143+
createChildTheme(themesDirectory);
144+
} catch (IOException ex) {
145+
Exceptions.printStackTrace(ex);
150146
}
151-
clear();
152147
}
148+
clear();
153149
});
154150
}
155151

‎src/org/netbeans/modules/php/wordpress/ui/actions/CreateMinimumBlankThemeAction.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,14 @@ protected void actionPerformed(PhpModule phpModule) {
128128
);
129129

130130
// add ChangeListener
131-
ChangeListener changeListener = new ChangeListener() {
132-
@Override
133-
public void stateChanged(ChangeEvent e) {
134-
String themeDirectoryName = panel.getThemeDirectoryName();
135-
boolean existsDirectory = themes.contains(themeDirectoryName);
136-
dialogDescriptor.setValid(!existsDirectory);
137-
if (existsDirectory) {
138-
panel.setErrorMessage(Bundle.CreateMinimumBlankThemeAction_existing_directoryName());
139-
} else {
140-
panel.setErrorMessage(" "); // NOI18N
141-
}
131+
ChangeListener changeListener = (ChangeEvent e) -> {
132+
String themeDirectoryName = panel.getThemeDirectoryName();
133+
boolean existsDirectory = themes.contains(themeDirectoryName);
134+
dialogDescriptor.setValid(!existsDirectory);
135+
if (existsDirectory) {
136+
panel.setErrorMessage(Bundle.CreateMinimumBlankThemeAction_existing_directoryName());
137+
} else {
138+
panel.setErrorMessage(" "); // NOI18N
142139
}
143140
};
144141
panel.addChangeListener(changeListener);

‎src/org/netbeans/modules/php/wordpress/ui/actions/CreateThemeBaseAction.java‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -173,25 +173,17 @@ protected void unzip(final String url, final File themeDirectory) throws Malform
173173
}
174174

175175
// display progress bar
176-
RequestProcessor.getDefault().post(new Runnable() {
177-
@Override
178-
public void run() {
179-
ProgressHandle handle = ProgressHandle.createHandle(Bundle.LBL_CreatingTheme(), new Cancellable() {
180-
@Override
181-
public boolean cancel() {
182-
return true;
183-
}
184-
});
185-
try {
186-
handle.start();
187-
WPFileUtils.unzip(url, themeDirectory, entryFilter);
188-
} catch (MalformedURLException ex) {
189-
Exceptions.printStackTrace(ex);
190-
} catch (IOException | WordPressUnzipException ex) {
191-
LOGGER.log(Level.WARNING, null, ex);
192-
} finally {
193-
handle.finish();
194-
}
176+
RequestProcessor.getDefault().post(() -> {
177+
ProgressHandle handle = ProgressHandle.createHandle(Bundle.LBL_CreatingTheme(), () -> true);
178+
try {
179+
handle.start();
180+
WPFileUtils.unzip(url, themeDirectory, entryFilter);
181+
} catch (MalformedURLException ex) {
182+
Exceptions.printStackTrace(ex);
183+
} catch (IOException | WordPressUnzipException ex) {
184+
LOGGER.log(Level.WARNING, null, ex);
185+
} finally {
186+
handle.finish();
195187
}
196188
});
197189

‎src/org/netbeans/modules/php/wordpress/ui/actions/CreateUnderscoresThemeAction.java‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -155,24 +155,15 @@ protected void actionPerformed(PhpModule pm) {
155155
final FileObject theme = themeFolder;
156156

157157
// display progress bar
158-
RequestProcessor.getDefault().post(new Runnable() {
159-
@Override
160-
public void run() {
161-
ProgressHandle handle = ProgressHandle.createHandle("Createing theme", new Cancellable() {
162-
@Override
163-
public boolean cancel() {
164-
return true;
165-
}
166-
});
167-
try {
168-
handle.start();
169-
if (!unzipAndReplace(theme)) {
170-
LOGGER.log(Level.WARNING, "fail: create wp theme");
171-
}
172-
173-
} finally {
174-
handle.finish();
158+
RequestProcessor.getDefault().post(() -> {
159+
ProgressHandle handle = ProgressHandle.createHandle("Createing theme", () -> true);
160+
try {
161+
handle.start();
162+
if (!unzipAndReplace(theme)) {
163+
LOGGER.log(Level.WARNING, "fail: create wp theme");
175164
}
165+
} finally {
166+
handle.finish();
176167
}
177168
});
178169
}

‎src/org/netbeans/modules/php/wordpress/ui/logicalview/MVCNodeFactory.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,7 @@ public void removeNotify() {
156156
@Override
157157
public void propertyChange(PropertyChangeEvent evt) {
158158
if (WordPressModule.PROPERTY_CHANGE_WP.equals(evt.getPropertyName())) {
159-
SwingUtilities.invokeLater(new Runnable() {
160-
161-
@Override
162-
public void run() {
163-
fireChange();
164-
}
165-
});
159+
SwingUtilities.invokeLater(this::fireChange);
166160
}
167161
}
168162

‎src/org/netbeans/modules/php/wordpress/ui/status/DebugStatusLineElement.java‎

Lines changed: 28 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -144,19 +144,16 @@ public void mouseClicked(MouseEvent e) {
144144
if (popup == null) {
145145
popup = PopupFactory.getSharedInstance().getPopup(debugLabel, list, x, y);
146146
}
147-
list.addListSelectionListener(new ListSelectionListener() {
148-
@Override
149-
public void valueChanged(ListSelectionEvent e) {
150-
String debugLv = list.getSelectedValue();
151-
// write file
152-
if (!debugLv.equals(level)) {
153-
writeConfig(debugLv);
154-
}
155-
popupFlg = false;
156-
if (popup != null) {
157-
popup.hide();
158-
popup = null;
159-
}
147+
list.addListSelectionListener((ListSelectionEvent e1) -> {
148+
String debugLv = list.getSelectedValue();
149+
// write file
150+
if (!debugLv.equals(level)) {
151+
writeConfig(debugLv);
152+
}
153+
popupFlg = false;
154+
if (popup != null) {
155+
popup.hide();
156+
popup = null;
160157
}
161158
});
162159
if (!popupFlg) {
@@ -203,15 +200,12 @@ private void writeConfig(final String debugLv) {
203200
final int startOffset = NbDocument.findLineOffset(docment, lineNumber);
204201
final int removeLength = line.length();
205202

206-
NbDocument.runAtomic(docment, new Runnable() {
207-
@Override
208-
public void run() {
209-
try {
210-
docment.remove(startOffset, removeLength);
211-
docment.insertString(startOffset, String.format(WP_DEBUG_FORMAT, debugLv), null);
212-
} catch (BadLocationException ex) {
213-
Exceptions.printStackTrace(ex);
214-
}
203+
NbDocument.runAtomic(docment, () -> {
204+
try {
205+
docment.remove(startOffset, removeLength);
206+
docment.insertString(startOffset, String.format(WP_DEBUG_FORMAT, debugLv), null);
207+
} catch (BadLocationException ex) {
208+
Exceptions.printStackTrace(ex);
215209
}
216210
});
217211
}
@@ -303,15 +297,11 @@ public String getDebugLevel(FileObject config) {
303297
* @param debugLv true or false
304298
*/
305299
private void setDebugLevelLabel(final String debugLv) {
306-
SwingUtilities.invokeLater(new Runnable() {
307-
308-
@Override
309-
public void run() {
310-
if (debugLv.matches("^(true|false)$")) { // NOI18N
311-
debugLabel.setText(debugLevel.get(debugLv));
312-
} else {
313-
debugLabel.setText(debugLv);
314-
}
300+
SwingUtilities.invokeLater(() -> {
301+
if (debugLv.matches("^(true|false)$")) { // NOI18N
302+
debugLabel.setText(debugLevel.get(debugLv));
303+
} else {
304+
debugLabel.setText(debugLv);
315305
}
316306
});
317307
}
@@ -322,28 +312,20 @@ public void run() {
322312
* @param versionNumber
323313
*/
324314
private void setVersionLabel(final String versionNumber) {
325-
SwingUtilities.invokeLater(new Runnable() {
326-
327-
@Override
328-
public void run() {
329-
versionLabel.setText(versionNumber);
330-
versionLabel.setIcon(icon);
331-
}
315+
SwingUtilities.invokeLater(() -> {
316+
versionLabel.setText(versionNumber);
317+
versionLabel.setIcon(icon);
332318
});
333319
}
334320

335321
/**
336322
* Clear debug label
337323
*/
338324
private void clearLabel() {
339-
SwingUtilities.invokeLater(new Runnable() {
340-
341-
@Override
342-
public void run() {
343-
debugLabel.setText(""); //NOI18N
344-
versionLabel.setText(""); // NOI18N
345-
versionLabel.setIcon(null);
346-
}
325+
SwingUtilities.invokeLater(() -> {
326+
debugLabel.setText(""); //NOI18N
327+
versionLabel.setText(""); // NOI18N
328+
versionLabel.setIcon(null);
347329
});
348330
}
349331

‎src/org/netbeans/modules/php/wordpress/update/WordPressCoreUpgradeChecker.java‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -218,24 +218,20 @@ public void actionPerformed(ActionEvent e) {
218218
return;
219219
}
220220

221-
new Thread(new Runnable() {
222-
223-
@Override
224-
public void run() {
225-
try {
226-
// core update, update-db
227-
WordPressCli wpCli = WordPressCli.getDefault(true);
228-
Future<Integer> result = wpCli.coreUpdate(phpModule, Collections.<String>emptyList());
229-
if (result != null) {
230-
result.get();
231-
}
232-
result = wpCli.coreUpdateDb(phpModule);
233-
if (result != null) {
234-
result.get();
235-
}
236-
} catch (InvalidPhpExecutableException | InterruptedException | ExecutionException ex) {
237-
Exceptions.printStackTrace(ex);
221+
new Thread(() -> {
222+
try {
223+
// core update, update-db
224+
WordPressCli wpCli = WordPressCli.getDefault(true);
225+
Future<Integer> result = wpCli.coreUpdate(phpModule, Collections.<String>emptyList());
226+
if (result != null) {
227+
result.get();
228+
}
229+
result = wpCli.coreUpdateDb(phpModule);
230+
if (result != null) {
231+
result.get();
238232
}
233+
} catch (InvalidPhpExecutableException | InterruptedException | ExecutionException ex) {
234+
Exceptions.printStackTrace(ex);
239235
}
240236
}).start();
241237
}

0 commit comments

Comments
 (0)