diff options
author | Alexander Kurtakov | 2019-10-15 12:07:58 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-10-15 12:07:58 +0000 |
commit | c62cfc44a2074e798d24660e4e1af7f0214854c4 (patch) | |
tree | bba1fb9e1af465df2ea243b5de62a5b19c30f26c | |
parent | c9a044f10e7d7189d2322068ee345c7db555b146 (diff) | |
download | rt.equinox.p2-c62cfc44a2074e798d24660e4e1af7f0214854c4.tar.gz rt.equinox.p2-c62cfc44a2074e798d24660e4e1af7f0214854c4.tar.xz rt.equinox.p2-c62cfc44a2074e798d24660e4e1af7f0214854c4.zip |
Fix warnings in official build.
Change-Id: If186493044b9fc3dcbecbd6673d4b32b08486a9e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2 files changed, 9 insertions, 19 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java index efe677a31..68ecb28e3 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java @@ -705,14 +705,14 @@ public class EquinoxBundlesState implements BundlesState { sb.append("\n"); //$NON-NLS-1$ } sb.append("PlatformProperties:\n"); //$NON-NLS-1$ - @SuppressWarnings("rawtypes") - Dictionary[] dics = state.getPlatformProperties(); - for (Dictionary dic : dics) { + @SuppressWarnings("unchecked") + Dictionary<String, String>[] dics = state.getPlatformProperties(); + for (Dictionary<String, String> dic : dics) { // don't disable this warning because it will cause build-time warning. // see bug 423628 and 423625. for (Enumeration<String> enumeration = dic.keys(); enumeration.hasMoreElements();) { String key = enumeration.nextElement(); - String value = (String) dic.get(key); + String value = dic.get(key); sb.append(" (" + key + "," + value + ")\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/GarbageCollector.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/GarbageCollector.java index 2a169d3d2..0487aae50 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/GarbageCollector.java +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/GarbageCollector.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2017 IBM Corporation and others. + * Copyright (c) 2007, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -193,15 +193,10 @@ public class GarbageCollector implements SynchronousProvisioningListener, IAgent //First we collect all repos and keys for the profile being GC'ed for (IConfigurationElement configElt : configElts) { - if (!(configElt.getName().equals("run"))) { - //$NON-NLS-1$ + if (configElt == null || !(configElt.getName().equals("run"))) { //$NON-NLS-1$ continue; } - IConfigurationElement runAttribute = configElt; - if (runAttribute == null) { - continue; - } - contributeMarkSets(runAttribute, profile, true); + contributeMarkSets(configElt, profile, true); } return true; } @@ -210,12 +205,7 @@ public class GarbageCollector implements SynchronousProvisioningListener, IAgent IExtensionRegistry registry = RegistryFactory.getRegistry(); IConfigurationElement[] configElts = registry.getConfigurationElementsFor(PT_MARKSET); for (IConfigurationElement configElt : configElts) { - if (!(configElt.getName().equals("run"))) { - //$NON-NLS-1$ - continue; - } - IConfigurationElement runAttribute = configElt; - if (runAttribute == null) { + if (configElt == null || !(configElt.getName().equals("run"))) { //$NON-NLS-1$ continue; } IProfileRegistry profileRegistry = agent.getService(IProfileRegistry.class); @@ -223,7 +213,7 @@ public class GarbageCollector implements SynchronousProvisioningListener, IAgent return; IProfile[] registeredProfiles = profileRegistry.getProfiles(); for (IProfile registeredProfile : registeredProfiles) { - contributeMarkSets(runAttribute, registeredProfile, false); + contributeMarkSets(configElt, registeredProfile, false); } } } |