Skip to content

Commit eff8ba2

Browse files
junichi11junichi11
committed
Use diamond inference
1 parent f9f56ef commit eff8ba2

21 files changed

Lines changed: 45 additions & 45 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public RunCommandAction getRunCommandAction() {
8585

8686
@Override
8787
public List<? extends Action> getActions() {
88-
List<Action> actions = new ArrayList<Action>();
88+
List<Action> actions = new ArrayList<>();
8989
actions.add(CreateThemeAction.getInstance());
9090
actions.add(CreateChildThemeAction.getInstance());
9191
actions.add(CreatePluginAction.getInstance());

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ public class WordPressPhpModuleExtender extends PhpModuleExtender {
108108
private static final String DB_HOST = "DB_HOST"; // NOI18N
109109
private static final String DB_CHARSET = "DB_CHARSET"; // NOI18N
110110
private static final String DB_COLLATE = "DB_COLLATE"; // NOI18N
111-
private static final Set<String> SECRET_KEYS = new HashSet<String>();
112-
private static final Set<String> CONFIG_KEYS = new HashSet<String>();
113-
private static final Map<String, String> CONFIG_MAP = new HashMap<String, String>();
111+
private static final Set<String> SECRET_KEYS = new HashSet<>();
112+
private static final Set<String> CONFIG_KEYS = new HashSet<>();
113+
private static final Map<String, String> CONFIG_MAP = new HashMap<>();
114114
private boolean isInternetReachable = true;
115115
private String errorMessage;
116116
private static final Logger LOGGER = Logger.getLogger(WordPressPhpModuleExtender.class.getName());
@@ -218,7 +218,7 @@ public Set<FileObject> extend(PhpModule pm) throws ExtendingException {
218218
} else if (panel.useWpCli()) {
219219
try {
220220
// params
221-
ArrayList<String> params = new ArrayList<String>(2);
221+
ArrayList<String> params = new ArrayList<>(2);
222222
WordPressOptions options = WordPressOptions.getInstance();
223223
String locale = options.getWpCliDownloadLocale();
224224
if (!StringUtils.isEmpty(locale)) {
@@ -254,7 +254,7 @@ public Set<FileObject> extend(PhpModule pm) throws ExtendingException {
254254
WordPressPreferences.setWordPressFormat(pm);
255255
}
256256

257-
Set<FileObject> files = new HashSet<FileObject>();
257+
Set<FileObject> files = new HashSet<>();
258258
if (sourceDirectory != null) {
259259
// create wp-config.php
260260
if (panel.isSelectedCreateConfig()) {
@@ -377,7 +377,7 @@ private String getLocalFile() {
377377
* @return
378378
*/
379379
private List<String> getSecretKey() {
380-
List<String> keys = new ArrayList<String>();
380+
List<String> keys = new ArrayList<>();
381381
try {
382382
URL url = new URL(HTTPS_API_WORDPRESS_ORG_SECRET_KEY);
383383
URLConnection connection = url.openConnection();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public class WordPressPhpProvider extends PhpFrameworkProvider {
8989
private static final WordPressPhpProvider INSTANCE = new WordPressPhpProvider();
9090
private static final String ICON_PATH = "org/netbeans/modules/php/wordpress/resources/wordpress_badge_8.png"; // NOI18N
9191
private final BadgeIcon badgeIcon;
92-
public static final Set<String> WP_DIRS = new HashSet<String>();
92+
public static final Set<String> WP_DIRS = new HashSet<>();
9393

9494
static {
9595
WP_DIRS.add("wp-admin"); // NOI18N

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public final class WordPressVersion {
6666
private int minor;
6767
private int revision;
6868
private String developmentSuffix; // e.g. RC1, beta, ...
69-
private static final Map<PhpModule, WordPressVersion> VERSIONS = new HashMap<PhpModule, WordPressVersion>();
69+
private static final Map<PhpModule, WordPressVersion> VERSIONS = new HashMap<>();
7070

7171
public static WordPressVersion create(PhpModule phpModule) {
7272
WordPressVersion version = VERSIONS.get(phpModule);

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public final class WordPressCli {
108108

109109
// XXX default?
110110
private final List<String> DEFAULT_PARAMS = Collections.emptyList();
111-
private static final List<FrameworkCommand> commandsCache = new ArrayList<FrameworkCommand>();
111+
private static final List<FrameworkCommand> commandsCache = new ArrayList<>();
112112

113113
private WordPressCli(String wpCliPath) {
114114
this.wpCliPath = wpCliPath;
@@ -146,7 +146,7 @@ public static String validate(String path) {
146146
* @param options (--locale, --version)
147147
*/
148148
public Future<Integer> download(PhpModule phpModule, List<String> options) {
149-
ArrayList<String> allCommands = new ArrayList<String>(options.size() + 2);
149+
ArrayList<String> allCommands = new ArrayList<>(options.size() + 2);
150150
allCommands.add(CORE_COMMAND);
151151
allCommands.add(DOWNLOAD_COMMAND);
152152
allCommands.addAll(options);
@@ -161,7 +161,7 @@ public Future<Integer> download(PhpModule phpModule, List<String> options) {
161161
* @return
162162
*/
163163
public Future<Integer> coreUpdate(PhpModule phpModule, List<String> options) {
164-
ArrayList<String> allCommands = new ArrayList<String>(options.size() + 2);
164+
ArrayList<String> allCommands = new ArrayList<>(options.size() + 2);
165165
allCommands.add(CORE_COMMAND);
166166
allCommands.add(UPDATE_COMMAND);
167167
allCommands.addAll(options);
@@ -175,7 +175,7 @@ public Future<Integer> coreUpdate(PhpModule phpModule, List<String> options) {
175175
* @return
176176
*/
177177
public Future<Integer> coreUpdateDb(PhpModule phpModule) {
178-
ArrayList<String> allCommands = new ArrayList<String>(2);
178+
ArrayList<String> allCommands = new ArrayList<>(2);
179179
allCommands.add(CORE_COMMAND);
180180
allCommands.add(UPDATE_DB_COMMAND);
181181
return runCommand(phpModule, allCommands);
@@ -189,7 +189,7 @@ public Future<Integer> coreUpdateDb(PhpModule phpModule) {
189189
* @return
190190
*/
191191
public Future<Integer> pluginUpdate(PhpModule phpModule, List<String> options) {
192-
ArrayList<String> allCommands = new ArrayList<String>(options.size() + 2);
192+
ArrayList<String> allCommands = new ArrayList<>(options.size() + 2);
193193
allCommands.add(PLUGIN_COMMAND);
194194
allCommands.add(UPDATE_COMMAND);
195195
allCommands.addAll(options);
@@ -204,7 +204,7 @@ public Future<Integer> pluginUpdate(PhpModule phpModule, List<String> options) {
204204
* @return
205205
*/
206206
public Future<Integer> themeUpdate(PhpModule phpModule, List<String> options) {
207-
ArrayList<String> allCommands = new ArrayList<String>(options.size() + 2);
207+
ArrayList<String> allCommands = new ArrayList<>(options.size() + 2);
208208
allCommands.add(THEME_COMMAND);
209209
allCommands.add(UPDATE_COMMAND);
210210
allCommands.addAll(options);
@@ -288,7 +288,7 @@ private List<String> getStatus(String command, PhpModule phpModule) {
288288
* @return help for command
289289
*/
290290
public String getHelp(List<String> commands) {
291-
List<String> params = new ArrayList<String>(commands.size() + 1);
291+
List<String> params = new ArrayList<>(commands.size() + 1);
292292
params.addAll(commands);
293293
params.add(HELP_PARAM);
294294

@@ -376,7 +376,7 @@ public void updateCommands() {
376376

377377
// XXX get help later?
378378
private void getCommands(List<String> subcommands, List<FrameworkCommand> commands) {
379-
ArrayList<String> params = new ArrayList<String>(subcommands.size() + 1);
379+
ArrayList<String> params = new ArrayList<>(subcommands.size() + 1);
380380
params.add(HELP_COMMAND);
381381
params.addAll(subcommands);
382382
HelpLineProcessor helpLineProcessor = new HelpLineProcessor();
@@ -415,7 +415,7 @@ private void getCommands(List<String> subcommands, List<FrameworkCommand> comman
415415
// add command
416416
String subcommand = line.substring(0, indexOf);
417417
String description = line.substring(indexOf + 1);
418-
ArrayList<String> nextSubcommands = new ArrayList<String>(subcommands.size() + 1);
418+
ArrayList<String> nextSubcommands = new ArrayList<>(subcommands.size() + 1);
419419
nextSubcommands.addAll(subcommands);
420420
nextSubcommands.add(subcommand);
421421
String help = getHelp(nextSubcommands);
@@ -523,7 +523,7 @@ private ExecutionDescriptor getSilentDescriptor() {
523523
* @return all parameters
524524
*/
525525
private List<String> getAllParameters(List<String> parameters) {
526-
List<String> allParams = new ArrayList<String>(DEFAULT_PARAMS.size() + parameters.size());
526+
List<String> allParams = new ArrayList<>(DEFAULT_PARAMS.size() + parameters.size());
527527
allParams.addAll(DEFAULT_PARAMS);
528528
allParams.addAll(parameters);
529529
return allParams;
@@ -556,7 +556,7 @@ private String getDisplayName(PhpModule phpModule, String command) {
556556
private static class HelpLineProcessor implements LineProcessor {
557557

558558
private final StringBuilder sb = new StringBuilder();
559-
private final List<String> list = new ArrayList<String>();
559+
private final List<String> list = new ArrayList<>();
560560

561561
@Override
562562
public void processLine(String line) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public String getFrameworkName() {
7777
public void runCommand(CommandDescriptor commandDescriptor, Runnable postExecution) {
7878
String[] commands = commandDescriptor.getFrameworkCommand().getCommands();
7979
String[] commandParams = commandDescriptor.getCommandParams();
80-
List<String> params = new ArrayList<String>(commands.length + commandParams.length);
80+
List<String> params = new ArrayList<>(commands.length + commandParams.length);
8181
params.addAll(Arrays.asList(commands));
8282
params.addAll(Arrays.asList(commandParams));
8383
try {

‎src/org/netbeans/modules/php/wordpress/editor/WordPressEditorExtender.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public class WordPressEditorExtender extends EditorExtender {
6666
* @see <a href="http://codex.wordpress.org/Global_Variables">Global
6767
* Variables</a>
6868
*/
69-
private static final Map<String, String> globalMap = new HashMap<String, String>();
70-
private static final List<PhpBaseElement> elements = new LinkedList<PhpBaseElement>();
69+
private static final Map<String, String> globalMap = new HashMap<>();
70+
private static final List<PhpBaseElement> elements = new LinkedList<>();
7171

7272
static {
7373
// object
@@ -139,7 +139,7 @@ public List<PhpBaseElement> getElementsForCodeCompletion(FileObject fo) {
139139
PhpModule phpModule = PhpModule.Factory.forFileObject(fo);
140140
// check whether project is WordPress
141141
if (!WPUtils.isWP(phpModule)) {
142-
return new LinkedList<PhpBaseElement>();
142+
return new LinkedList<>();
143143
}
144144
return elements;
145145
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void resetNode() {
131131
//~ Inner class
132132
public static class Factory {
133133

134-
private static final Map<PhpModule, WordPressModule> modules = new HashMap<PhpModule, WordPressModule>();
134+
private static final Map<PhpModule, WordPressModule> modules = new HashMap<>();
135135

136136
public static WordPressModule forPhpModule(PhpModule phpModule) {
137137
WordPressModule module = modules.get(phpModule);

‎src/org/netbeans/modules/php/wordpress/preferences/WordPressPreferences.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
*/
5555
public class WordPressPreferences {
5656

57-
private static final List<String> WITHIN_OPTIONS = new ArrayList<String>();
57+
private static final List<String> WITHIN_OPTIONS = new ArrayList<>();
5858
private static final String ENABLED = "enabled"; // NOI18N
5959
private static final String CUSTOM_CONTENT_NAME = "custom-content-name"; // NOI18N
6060
private static final String WP_ROOT = "wp-root"; // NOI18N

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public final class CreateChildThemeAction extends BaseAction implements ChangeLi
7878

7979
private CreateChildThemePanel panel;
8080
private DialogDescriptor descriptor;
81-
private final List<String> themes = new ArrayList<String>();
81+
private final List<String> themes = new ArrayList<>();
8282
private static final CreateChildThemeAction INSTANCE = new CreateChildThemeAction();
8383
private static final Logger LOGGER = Logger.getLogger(CreateChildThemeAction.class.getName());
8484
private static final long serialVersionUID = -2231810352652363996L;
@@ -168,7 +168,7 @@ private void createChildTheme(FileObject themesDirectory) throws IOException, Da
168168
}
169169
DataObject templateDataObject = DataObject.find(template);
170170
DataFolder targetFolder = DataFolder.findFolder(childThemeDirectory);
171-
Map<String, String> parameters = new HashMap<String, String>();
171+
Map<String, String> parameters = new HashMap<>();
172172
parameters.put("name", getPanel().getChildThemeName()); // NOI18N
173173
parameters.put("parent", getPanel().getParentThemeName()); // NOI18N
174174
parameters.put("uri", getPanel().getChildThemeUri()); // NOI18N

0 commit comments

Comments
 (0)