Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Hammer2019-05-21 13:32:59 -0400
committerAlexander Kurtakov2019-06-10 15:26:24 -0400
commit20b4e2973008b4b287241fc14a1eb4f8ee9ee0ad (patch)
treebb2d200827a873cafdd84ef7d0af0921010fd4df
parentac20bd173d9d6703a6a4ed50b8ede54cbe89af13 (diff)
downloadrt.equinox.p2-20b4e2973008b4b287241fc14a1eb4f8ee9ee0ad.tar.gz
rt.equinox.p2-20b4e2973008b4b287241fc14a1eb4f8ee9ee0ad.tar.xz
rt.equinox.p2-20b4e2973008b4b287241fc14a1eb4f8ee9ee0ad.zip
Remove unnecessary type specifications
Since Java 7 the diamond operator can be used instead of explicit type parameters. Change-Id: I1f4692522a6ed6429f79eea1d898f0cc4a84131a Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
-rw-r--r--bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/ProvisioningAgent.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RepositoryTracker.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Credentials.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/ProgressStatistics.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java22
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/DebugHelper.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddJVMArgumentAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/AddProgramPropertyAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/ChmodAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/CollectAction.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Configuration.java4
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationParser.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/ConfigurationWriter.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/update/Site.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml2
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/ControlListViewer.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java2
-rw-r--r--examples/org.eclipse.equinox.p2.examples.rcp.sdkui/src/org/eclipse/equinox/p2/examples/rcp/sdkui/NavigationView.java2
-rw-r--r--features/org.eclipse.equinox.p2.discovery.feature/feature.xml2
-rw-r--r--features/org.eclipse.equinox.p2.discovery.feature/pom.xml4
39 files changed, 57 insertions, 57 deletions
diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
index b55cc0a59..c9281d5f1 100644
--- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.core;singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.6.100.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator
Bundle-Vendor: %providerName
diff --git a/bundles/org.eclipse.equinox.p2.core/pom.xml b/bundles/org.eclipse.equinox.p2.core/pom.xml
index 469f5b0cb..343e06af7 100644
--- a/bundles/org.eclipse.equinox.p2.core/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.core/pom.xml
@@ -9,6 +9,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.core</artifactId>
- <version>2.6.0-SNAPSHOT</version>
+ <version>2.6.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/ProvisioningAgent.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/ProvisioningAgent.java
index b7ef6d969..26a106d47 100644
--- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/ProvisioningAgent.java
+++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/ProvisioningAgent.java
@@ -28,7 +28,7 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
*/
public class ProvisioningAgent implements IProvisioningAgent, ServiceTrackerCustomizer<IAgentServiceFactory, Object> {
- private final Map<String, Object> agentServices = Collections.synchronizedMap(new HashMap<String, Object>());
+ private final Map<String, Object> agentServices = Collections.synchronizedMap(new HashMap<>());
private BundleContext context;
private volatile boolean stopped = false;
private ServiceRegistration<IProvisioningAgent> reg;
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java
index 90ea341e1..75a264d92 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java
@@ -80,7 +80,7 @@ public class QueryUtil {
*/
@SuppressWarnings("unchecked")
public static <T> IQueryable<T> compoundQueryable(IQueryable<T> query1, IQueryable<T> query2) {
- return new CompoundQueryable<T>(new IQueryable[] {query1, query2});
+ return new CompoundQueryable<>(new IQueryable[] {query1, query2});
}
/**
diff --git a/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF
index 529a27408..237f52d39 100644
--- a/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.operations;singleton:=true
-Bundle-Version: 2.5.400.qualifier
+Bundle-Version: 2.5.500.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.equinox.internal.p2.operations;x-friends:="org.eclipse.pde.ui",
diff --git a/bundles/org.eclipse.equinox.p2.operations/pom.xml b/bundles/org.eclipse.equinox.p2.operations/pom.xml
index 5f40653e3..f42c2d080 100644
--- a/bundles/org.eclipse.equinox.p2.operations/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.operations/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.operations</artifactId>
- <version>2.5.400-SNAPSHOT</version>
+ <version>2.5.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RepositoryTracker.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RepositoryTracker.java
index aefdfdb04..a1e85a126 100644
--- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RepositoryTracker.java
+++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/RepositoryTracker.java
@@ -44,7 +44,7 @@ public abstract class RepositoryTracker {
/**
* List<URI> of repositories that have already been reported to the user as not found.
*/
- private final List<URI> reposNotFound = Collections.synchronizedList(new ArrayList<URI>());
+ private final List<URI> reposNotFound = Collections.synchronizedList(new ArrayList<>());
/**
* Return an array of repository locations known for the specified provisioning session.
diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
index 6ab61f3a0..f51877f2d 100644
--- a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.repository;singleton:=true
-Bundle-Version: 2.4.400.qualifier
+Bundle-Version: 2.4.500.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.repository.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.repository/pom.xml b/bundles/org.eclipse.equinox.p2.repository/pom.xml
index e4894c50d..6f6a6e9b2 100644
--- a/bundles/org.eclipse.equinox.p2.repository/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.repository/pom.xml
@@ -9,6 +9,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.repository</artifactId>
- <version>2.4.400-SNAPSHOT</version>
+ <version>2.4.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java
index 9450a5d52..db404cd50 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/CompositeParser.java
@@ -43,7 +43,7 @@ public class CompositeParser extends XMLParser implements XMLConstants {
public ChildrenHandler(AbstractHandler parentHandler, Attributes attributes) {
super(parentHandler, CHILDREN_ELEMENT);
String size = parseOptionalAttribute(attributes, COLLECTION_SIZE_ATTRIBUTE);
- children = (size != null ? new ArrayList<URI>(Integer.parseInt(size)) : new ArrayList<URI>(4));
+ children = (size != null ? new ArrayList<>(Integer.parseInt(size)) : new ArrayList<>(4));
}
public URI[] getChildren() {
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
index b3898b36e..3dd3c589c 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLParser.java
@@ -48,7 +48,7 @@ public abstract class XMLParser extends DefaultHandler implements XMLConstants {
private IProgressMonitor monitor;
// Store a cache of previously seen URIs to avoid GC presure
- final Map<String, URI> uris = new HashMap<String, URI>();
+ final Map<String, URI> uris = new HashMap<>();
private static ServiceTracker<SAXParserFactory, SAXParserFactory> xmlTracker = null;
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java
index 849512d39..31bf8a3e8 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/persistence/XMLWriter.java
@@ -67,7 +67,7 @@ public class XMLWriter implements XMLConstants {
public XMLWriter(OutputStream output, ProcessingInstruction[] piElements) {
this.pw = new PrintWriter(new BufferedWriter(new OutputStreamWriter(output, StandardCharsets.UTF_8)), false);
println(ProcessingInstruction.XML_UTF8);
- this.elements = new Stack<String>();
+ this.elements = new Stack<>();
this.open = false;
this.indent = " "; //$NON-NLS-1$
if (piElements != null) {
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
index 5cf7b0689..7cd469d4a 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/CacheManager.java
@@ -81,7 +81,7 @@ public class CacheManager {
private static final String JAR_EXTENSION = ".jar"; //$NON-NLS-1$
private static final String XML_EXTENSION = ".xml"; //$NON-NLS-1$
- private final HashSet<String> knownPrefixes = new HashSet<String>(5);
+ private final HashSet<String> knownPrefixes = new HashSet<>(5);
/**
* Returns a hash of the repository location.
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Credentials.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Credentials.java
index ed34c2a05..48ecf1201 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Credentials.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Credentials.java
@@ -446,7 +446,7 @@ public class Credentials {
private static synchronized Map<String, HostEntry> getRemembered() {
if (remembered == null)
- remembered = Collections.synchronizedMap(new HashMap<String, HostEntry>());
+ remembered = Collections.synchronizedMap(new HashMap<>());
return remembered;
}
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/ProgressStatistics.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/ProgressStatistics.java
index 20d82f795..0c8e37530 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/ProgressStatistics.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/ProgressStatistics.java
@@ -86,7 +86,7 @@ public class ProgressStatistics {
m_current = 0;
m_lastReportTime = 0;
m_reportInterval = DEFAULT_REPORT_INTERVAL;
- m_recentSpeedMap = new TreeMap<Long, Long>();
+ m_recentSpeedMap = new TreeMap<>();
m_recentSpeedMapKey = 0L;
m_uri = uri;
m_agent = agent;
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java
index c3113c67f..60325fd62 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/AbstractRepositoryManager.java
@@ -94,7 +94,7 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
/**
* Set used to manage exclusive load locks on repository locations.
*/
- private final Map<URI, Thread> loadLocks = new HashMap<URI, Thread>();
+ private final Map<URI, Thread> loadLocks = new HashMap<>();
private final IAgentLocation agentLocation;
protected final IProvisioningEventBus eventBus;
protected final IProvisioningAgent agent;
@@ -121,11 +121,11 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
String key = getKey(repository.getLocation());
RepositoryInfo<T> info = repositories.get(key);
if (info == null) {
- info = new RepositoryInfo<T>();
+ info = new RepositoryInfo<>();
added = true;
repositories.put(key, info);
}
- info.repository = new SoftReference<IRepository<T>>(repository);
+ info.repository = new SoftReference<>(repository);
info.name = repository.getName();
info.description = repository.getDescription();
info.location = repository.getLocation();
@@ -157,7 +157,7 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
* <code>false</code> otherwise.
*/
private boolean addRepository(URI location, boolean isEnabled, boolean signalAdd) {
- RepositoryInfo<T> info = new RepositoryInfo<T>();
+ RepositoryInfo<T> info = new RepositoryInfo<>();
info.location = location;
info.isEnabled = isEnabled;
boolean added = true;
@@ -429,7 +429,7 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
return new String[0];
}
IConfigurationElement[] elements = registry.getConfigurationElementsFor(getRepositoryProviderExtensionPointId());
- ArrayList<String> result = new ArrayList<String>(elements.length);
+ ArrayList<String> result = new ArrayList<>(elements.length);
result.add(getDefaultSuffix());
for (int i = 0; i < elements.length; i++) {
if (elements[i].getName().equals(EL_FILTER)) {
@@ -476,7 +476,7 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
synchronized (repositoryLock) {
if (repositories == null)
restoreRepositories();
- ArrayList<URI> result = new ArrayList<URI>();
+ ArrayList<URI> result = new ArrayList<>();
for (RepositoryInfo<T> info : repositories.values()) {
if (matchesFlags(info, flags))
result.add(info.location);
@@ -900,9 +900,9 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
return;
}
}
- badRepos = new ArrayList<URI>();
+ badRepos = new ArrayList<>();
badRepos.add(location);
- unavailableRepositories = new SoftReference<List<URI>>(badRepos);
+ unavailableRepositories = new SoftReference<>(badRepos);
}
@Override
@@ -966,7 +966,7 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
log("Error removing invalid repository", e); //$NON-NLS-1$
}
}
- RepositoryInfo<T> info = new RepositoryInfo<T>();
+ RepositoryInfo<T> info = new RepositoryInfo<>();
info.location = location;
info.name = child.get(KEY_NAME, null);
info.nickname = child.get(KEY_NICKNAME, null);
@@ -1000,7 +1000,7 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
*/
private void restoreRepositories() {
synchronized (repositoryLock) {
- repositories = new HashMap<String, RepositoryInfo<T>>();
+ repositories = new HashMap<>();
restoreSpecialRepositories();
restoreFromSystemProperty();
basicRestoreFromPreferences(getSharedPreferences(), false);
@@ -1143,7 +1143,7 @@ public abstract class AbstractRepositoryManager<T> implements IRepositoryManager
@Override
public IQueryResult<T> query(IQuery<T> query, IProgressMonitor monitor) {
URI[] locations = getKnownRepositories(REPOSITORIES_ALL);
- List<IRepository<T>> queryables = new ArrayList<IRepository<T>>(locations.length); // use a list since we don't know exactly how many will load
+ List<IRepository<T>> queryables = new ArrayList<>(locations.length); // use a list since we don't know exactly how many will load
SubMonitor sub = SubMonitor.convert(monitor, locations.length * 10);
for (int i = 0; i < locations.length; i++) {
try {
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/DebugHelper.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/DebugHelper.java
index ca9019fee..702ca8660 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/DebugHelper.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/DebugHelper.java
@@ -54,7 +54,7 @@ public class DebugHelper {
if (keyValueArray == null || keyValueArray.length == 0)
debug(name, message);
else {
- Map<Object, Object> params = new LinkedHashMap<Object, Object>(keyValueArray.length / 2);
+ Map<Object, Object> params = new LinkedHashMap<>(keyValueArray.length / 2);
for (int i = 0; i < keyValueArray.length; i += 2)
params.put(keyValueArray[i], keyValueArray[i + 1]);
StringBuffer buffer = new StringBuffer();
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java
index 7f22c896a..ab9469016 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java
@@ -196,7 +196,7 @@ public class LocationProperties {
private String[] getRepositoryFactoryOrder(String repositoryFactoryOrder) {
repositoryFactoryOrder = repositoryFactoryOrder == null ? "" : repositoryFactoryOrder; //$NON-NLS-1$
StringTokenizer tokenizer = new StringTokenizer(repositoryFactoryOrder, ","); //$NON-NLS-1$
- List<String> searchOrder = new ArrayList<String>();
+ List<String> searchOrder = new ArrayList<>();
while (tokenizer.hasMoreTokens()) {
searchOrder.add(tokenizer.nextToken().trim());
}
diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java
index 20af36fb0..d670bb4a7 100644
--- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java
+++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/p2/repository/artifact/ArtifactDescriptorQuery.java
@@ -39,7 +39,7 @@ public final class ArtifactDescriptorQuery extends ExpressionMatchQuery<IArtifac
if (properties == null || properties.isEmpty())
properties = Collections.singletonMap(IArtifactDescriptor.FORMAT, format);
else {
- properties = new HashMap<String, String>(properties);
+ properties = new HashMap<>(properties);
properties.put(IArtifactDescriptor.FORMAT, format);
}
} else if (properties == null)
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java
index 2f6e50cc1..409e64309 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/engine/ProvisioningEventTest.java
@@ -160,8 +160,8 @@ public class ProvisioningEventTest extends AbstractProvisioningTest {
listener.latch.await(10, TimeUnit.SECONDS);
assertNull("Published phase event with unwanted phase id.", listener.publishUnWantedPhaseEvent);
assertEquals("Published unwanted type of phase event.", 0, listener.publishUnWantedPhaseType);
- assertEquals("Expected Phase start event is not published.", new ArrayList<String>(0), listener.phaseStartEventToBePublised);
- assertEquals("Expected Phase end event is not published.", new ArrayList<String>(0), listener.phaseEndEventToBePublised);
+ assertEquals("Expected Phase start event is not published.", new ArrayList<>(0), listener.phaseStartEventToBePublised);
+ assertEquals("Expected Phase end event is not published.", new ArrayList<>(0), listener.phaseEndEventToBePublised);
} finally {
getEventBus().removeListener(listener);
}
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
index 997860b40..f154455d5 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.eclipse;singleton:=true
-Bundle-Version: 2.2.300.qualifier
+Bundle-Version: 2.2.400.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.eclipse.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
index 20cdc6030..f8b5ab049 100644
--- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/pom.xml
@@ -9,6 +9,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.touchpoint.eclipse</artifactId>
- <version>2.2.300-SNAPSHOT</version>
+ <version>2.2.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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;
}
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF
index 61805fe78..4c2747972 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.equinox.p2.ui.discovery;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.200.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml b/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
index 1b342fd65..0e0a55838 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/pom.xml
@@ -9,6 +9,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.ui.discovery</artifactId>
- <version>1.1.100-SNAPSHOT</version>
+ <version>1.1.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/ControlListViewer.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/ControlListViewer.java
index e781a708f..fa59b48d9 100644
--- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/ControlListViewer.java
+++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/util/ControlListViewer.java
@@ -425,7 +425,7 @@ public abstract class ControlListViewer extends StructuredViewer {
//see bug 423628. This should be suppressed as:
//1. it will cause warning at build time.
//2. should be possible to fix once swt/jface enables generics for good.
- HashSet<Object> elements = new HashSet<Object>(list);
+ HashSet<Object> elements = new HashSet<>(list);
Control[] children = control.getChildren();
for (Control c : children) {
ControlListItem child = (ControlListItem) c;
diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
index 24c1c4e75..c8d7a884c 100644
--- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
+++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java
@@ -533,7 +533,7 @@ public class SiteXMLAction extends AbstractPublisherAction {
for (String parentCategoryName : category.getCategoryNames()) {
SiteCategory parentCategory = nameToCategory.get(parentCategoryName);
if (categoryToNestedCategories.get(parentCategory) == null) {
- categoryToNestedCategories.put(parentCategory, new HashSet<SiteCategory>());
+ categoryToNestedCategories.put(parentCategory, new HashSet<>());
}
categoryToNestedCategories.get(parentCategory).add(category);
}
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/src/org/eclipse/equinox/p2/examples/rcp/sdkui/NavigationView.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/src/org/eclipse/equinox/p2/examples/rcp/sdkui/NavigationView.java
index f2c60ca8b..d8437c150 100644
--- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/src/org/eclipse/equinox/p2/examples/rcp/sdkui/NavigationView.java
+++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/src/org/eclipse/equinox/p2/examples/rcp/sdkui/NavigationView.java
@@ -44,7 +44,7 @@ public class NavigationView extends ViewPart {
private ArrayList<TreeObject> children;
public TreeParent(String name) {
super(name);
- children = new ArrayList<TreeObject>();
+ children = new ArrayList<>();
}
public void addChild(TreeObject child) {
children.add(child);
diff --git a/features/org.eclipse.equinox.p2.discovery.feature/feature.xml b/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
index a992c2d0b..ec46743f0 100644
--- a/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
+++ b/features/org.eclipse.equinox.p2.discovery.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.equinox.p2.discovery.feature"
label="%featureName"
- version="1.2.200.qualifier"
+ version="1.2.300.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.equinox.p2.discovery.feature/pom.xml b/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
index f12c56266..4d4d01ee9 100644
--- a/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
+++ b/features/org.eclipse.equinox.p2.discovery.feature/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.discovery.feature</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>

Back to the top