diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org')
10 files changed, 16 insertions, 16 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java index e11dc1d83..df9228b51 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java @@ -69,7 +69,7 @@ public class EclipseMarkSetProvider extends MarkSetProvider { if (cfg == null) return Collections.emptyList(); List<Site> sites = cfg.getSites(); - ArrayList<Feature> result = new ArrayList<Feature>(); + ArrayList<Feature> result = new ArrayList<>(); for (Site object : sites) { Feature[] features = object.getFeatures(); for (int i = 0; i < features.length; i++) { diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java index 2f0aabfd5..5edba125f 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java @@ -93,7 +93,7 @@ public class Util { } try { String repositoryName = Messages.BundlePool; - Map<String, String> properties = new HashMap<String, String>(1); + Map<String, String> properties = new HashMap<>(1); properties.put(IRepository.PROP_SYSTEM, Boolean.TRUE.toString()); return (IFileArtifactRepository) manager.createRepository(location, repositoryName, REPOSITORY_TYPE, properties); } catch (ProvisionException e) { @@ -174,7 +174,7 @@ public class Util { } private static List<String> getListProfileProperty(IProfile profile, String key) { - List<String> listProperty = new ArrayList<String>(); + List<String> listProperty = new ArrayList<>(); String dropinRepositories = profile.getProperty(key); if (dropinRepositories != null) { StringTokenizer tokenizer = new StringTokenizer(dropinRepositories, PIPE); diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java index 065531168..f324b3e80 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java @@ -220,7 +220,7 @@ public class AddJVMArgumentAction extends ProvisioningAction { if (argString == null || argString.length() == 0) return new String[0]; - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); int i = 0; String arg = ""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java index 284deafe5..c53cdff30 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java @@ -28,7 +28,7 @@ public class AddProgramPropertyAction extends ProvisioningAction { // treat the given string as a comma-separated list and parse and // convert it to a real list protected static List<String> convertToList(String value) { - List<String> result = new ArrayList<String>(); + List<String> result = new ArrayList<>(); for (StringTokenizer tokenizer = new StringTokenizer(value, ","); tokenizer.hasMoreTokens();) //$NON-NLS-1$ result.add(tokenizer.nextToken()); return result; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java index 8b777284a..bdd2abf00 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java @@ -61,7 +61,7 @@ public class ChmodAction extends ProvisioningAction { String options[] = null; if (optionsString != null) { - ArrayList<String> collect = new ArrayList<String>(); + ArrayList<String> collect = new ArrayList<>(); String r = optionsString.trim(); while (r.length() > 0) { int spaceIdx = r.indexOf(' '); diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java index 53862d62c..279addd8b 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java @@ -64,7 +64,7 @@ public class CollectAction extends ProvisioningAction { public static Map<String, String> createArtifactDescriptorProperties(IInstallableUnit installableUnit) { Map<String, String> descriptorProperties = null; if (CollectAction.isZipped(installableUnit.getTouchpointData())) { - descriptorProperties = new HashMap<String, String>(); + descriptorProperties = new HashMap<>(); descriptorProperties.put(CollectAction.ARTIFACT_FOLDER, Boolean.TRUE.toString()); } return descriptorProperties; diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java index 2e4bed719..1e3e258be 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java @@ -31,7 +31,7 @@ import org.eclipse.equinox.p2.core.ProvisionException; */ public class Configuration { - private List<Site> sites = new ArrayList<Site>(); + private List<Site> sites = new ArrayList<>(); String date; boolean transientProperty; String version; @@ -67,7 +67,7 @@ public class Configuration { String shared = getSharedUR(); if (shared == null) return sites; - List<Site> result = new ArrayList<Site>(sites); + List<Site> result = new ArrayList<>(sites); try { URL url = new URL(shared); File location = URLUtil.toFile(url); diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java index 1e8af28bb..de0ccdd28 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java @@ -83,7 +83,7 @@ public class ConfigurationParser implements ConfigurationConstants { String locations = getAttribute(node, ATTRIBUTE_ROOT); if (locations != null) { StringTokenizer tokenizer = new StringTokenizer(locations, ","); //$NON-NLS-1$ - ArrayList<URL> rootList = new ArrayList<URL>(); + ArrayList<URL> rootList = new ArrayList<>(); while (tokenizer.hasMoreTokens()) { try { URL rootEntry = new URL(tokenizer.nextToken().trim()); diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java index 07adbb6e9..b7a6aa7ea 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java @@ -36,7 +36,7 @@ public class ConfigurationWriter implements ConfigurationConstants { try { OutputStream output = new BufferedOutputStream(new FileOutputStream(location)); writer = new XMLWriter(output); - Map<String, String> args = new HashMap<String, String>(); + Map<String, String> args = new HashMap<>(); // always write out an up-to-date timestamp args.put(ATTRIBUTE_DATE, Long.toString(new Date().getTime())); @@ -74,7 +74,7 @@ public class ConfigurationWriter implements ConfigurationConstants { * Write out the given site. */ private static void write(XMLWriter writer, Site site, URL osgiInstallArea) { - Map<String, String> args = new HashMap<String, String>(); + Map<String, String> args = new HashMap<>(); String value = site.getLinkFile(); if (value != null) @@ -149,7 +149,7 @@ public class ConfigurationWriter implements ConfigurationConstants { return; for (int i = 0; i < features.length; i++) { Feature feature = features[i]; - Map<String, String> args = new HashMap<String, String>(); + Map<String, String> args = new HashMap<>(); String value = feature.getId(); if (value != null) args.put(ATTRIBUTE_ID, value); diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java index cf81ec4b9..32fd7d58e 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java @@ -30,8 +30,8 @@ public class Site { private boolean updateable = true; private String url; private String linkFile; - private Collection<Feature> features = new HashSet<Feature>(); - private List<String> list = new ArrayList<String>(); + private Collection<Feature> features = new HashSet<>(); + private List<String> list = new ArrayList<>(); public void addFeature(Feature feature) { this.features.add(feature); @@ -47,7 +47,7 @@ public class Site { public void setPluginList(List<String> plugins) { if (plugins == null) - this.list = new ArrayList<String>(); + this.list = new ArrayList<>(); else this.list = plugins; } |