MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 16:36:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup: explicit types replaced by diamonds in JPS modules

Browse Source
This commit is contained in:
nik
2017-02-15 16:15:14 +03:00
parent feb00bc4eb
commit b76477b1ef
215 changed files with 615 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/packaging/AbstractJavaFxPackager.java
View File

@@ -175,7 +175,7 @@ public abstract class AbstractJavaFxPackager {
}
private void sign(String binPath, boolean selfSigning, final String jar2Sign) {
final List<String> signCommandLine = new ArrayList<String>();
final List<String> signCommandLine = new ArrayList<>();
addParameter(signCommandLine, FileUtil.toSystemDependentName(binPath + File.separator + "jarsigner"));
collectStoreParams(selfSigning, signCommandLine);
@@ -196,7 +196,7 @@ public abstract class AbstractJavaFxPackager {
FileUtil.delete(keyStoreFile);
}
final List<String> genCommandLine = new ArrayList<String>();
final List<String> genCommandLine = new ArrayList<>();
addParameter(genCommandLine, FileUtil.toSystemDependentName(binPath + File.separator + "keytool"));
addParameter(genCommandLine, "-genkeypair");
@@ -276,7 +276,7 @@ public abstract class AbstractJavaFxPackager {
registerJavaFxPackagerError("Bundled ant not found.");
return -1;
}
final ArrayList<String> commands = new ArrayList<String>();
final ArrayList<String> commands = new ArrayList<>();
commands.add(javaHome + File.separator + "bin" + File.separator + "java");
commands.add("-Dant.home=" + antHome);

16
plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/packaging/JavaFxAntGenerator.java
View File

@@ -38,7 +38,7 @@ public class JavaFxAntGenerator {
String tempDirDeployPath,
String relativeToBaseDirPath) {
final String artifactFileNameWithoutExtension = FileUtil.getNameWithoutExtension(artifactFileName);
final List<SimpleTag> topLevelTagsCollector = new ArrayList<SimpleTag>();
final List<SimpleTag> topLevelTagsCollector = new ArrayList<>();
final String preloaderJar = packager.getPreloaderJar();
final String preloaderClass = packager.getPreloaderClass();
String preloaderFiles = null;
@@ -105,7 +105,7 @@ public class JavaFxAntGenerator {
Couple.of("destfile", tempDirPath + "/" + artifactFileName));
createJarTag.add(new SimpleTag("fx:application", Couple.of("refid", appId)));
final List<Pair> fileset2Jar = new ArrayList<Pair>();
final List<Pair> fileset2Jar = new ArrayList<>();
fileset2Jar.add(Couple.of("dir", tempDirPath));
fileset2Jar.add(Couple.of("excludes", "**/*.jar"));
createJarTag.add(new SimpleTag("fileset", fileset2Jar.toArray(new Pair[fileset2Jar.size()])));
@@ -148,7 +148,7 @@ public class JavaFxAntGenerator {
deployTag.add(new SimpleTag("fx:application", Couple.of("refid", appId)));
final List<Pair> infoPairs = new ArrayList<Pair>();
final List<Pair> infoPairs = new ArrayList<>();
appendIfNotEmpty(infoPairs, "title", packager.getTitle());
appendIfNotEmpty(infoPairs, "vendor", packager.getVendor());
appendIfNotEmpty(infoPairs, "description", packager.getDescription());
@@ -167,7 +167,7 @@ public class JavaFxAntGenerator {
@NotNull
private static List<JavaFxManifestAttribute> getManifestAttributes(@NotNull AbstractJavaFxPackager packager) {
final List<JavaFxManifestAttribute> manifestAttributes = new ArrayList<JavaFxManifestAttribute>();
final List<JavaFxManifestAttribute> manifestAttributes = new ArrayList<>();
final String title = packager.getTitle();
if (title != null) {
manifestAttributes.add(new JavaFxManifestAttribute("Implementation-Title", title));
@@ -309,24 +309,24 @@ public class JavaFxAntGenerator {
public static class SimpleTag {
private final String myName;
private final List<Pair> myPairs;
private final List<SimpleTag> mySubTags = new ArrayList<SimpleTag>();
private final List<SimpleTag> mySubTags = new ArrayList<>();
private final String myValue;
public SimpleTag(String name, Pair... pairs) {
myName = name;
myPairs = new ArrayList<Pair>(Arrays.asList(pairs));
myPairs = new ArrayList<>(Arrays.asList(pairs));
myValue = null;
}
public SimpleTag(String name, Collection<Pair> pairs) {
myName = name;
myPairs = new ArrayList<Pair>(pairs);
myPairs = new ArrayList<>(pairs);
myValue = null;
}
public SimpleTag(String name, String value) {
myName = name;
myPairs = new ArrayList<Pair>();
myPairs = new ArrayList<>();
myValue = value;
}