Remove not used code.
Change-Id: I510d92f51dc77b5dbe09d38e19c861f786566e97
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/transport/httpclient/HttpClientFactory.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/transport/httpclient/HttpClientFactory.java
index d779f17..dd7fbca 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/transport/httpclient/HttpClientFactory.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/transport/httpclient/HttpClientFactory.java
@@ -12,8 +12,6 @@
*******************************************************************************/
package org.eclipse.epp.internal.mpc.core.transport.httpclient;
-import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.apache.http.HttpRequestInterceptor;
@@ -25,12 +23,8 @@
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.ProxyAuthenticationStrategy;
import org.apache.http.impl.client.TargetAuthenticationStrategy;
-import org.eclipse.epp.internal.mpc.core.MarketplaceClientCore;
import org.eclipse.userstorage.internal.StorageProperties;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceReference;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.FieldOption;
import org.osgi.service.component.annotations.Reference;
@@ -210,21 +204,4 @@
CredentialsProvider customCredentialsProvider = customizer.customizeCredentialsProvider(credentialsProvider);
return customCredentialsProvider == null ? credentialsProvider : customCredentialsProvider;
}
-
- private static BundleContext getBundleContext() {
- return FrameworkUtil.getBundle(HttpClientTransport.class).getBundleContext();
- }
-
- private static Collection<ServiceReference<HttpClientCustomizer>> getClientBuilderCustomizers(
- BundleContext context) {
- Collection<ServiceReference<HttpClientCustomizer>> serviceReferences;
- try {
- serviceReferences = context.getServiceReferences(HttpClientCustomizer.class,
- /*TransportFactory.computeDisabledTransportsFilter()*/null);
- } catch (InvalidSyntaxException e) {
- MarketplaceClientCore.error(e);
- serviceReferences = Collections.emptySet();
- }
- return serviceReferences;
- }
}
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/util/FallbackTransportFactory.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/util/FallbackTransportFactory.java
index 87a4d7f..0f1a022 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/util/FallbackTransportFactory.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/util/FallbackTransportFactory.java
@@ -40,7 +40,7 @@
private static final class FallbackTransport implements ITransport {
private final ITransport primaryTransport;
- private ITransport fallbackTransport;
+ private final ITransport fallbackTransport;
private boolean primaryDisabled = false;
@@ -154,10 +154,6 @@
return null;
}
- void setFallbackTransport(ITransport fallbackTransport) {
- this.fallbackTransport = fallbackTransport;
- }
-
public ITransport getPrimaryTransport() {
return primaryTransport;
}
diff --git a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/LambdaMatchers.java b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/LambdaMatchers.java
index 8ead86e..df0cdb6 100644
--- a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/LambdaMatchers.java
+++ b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/LambdaMatchers.java
@@ -12,7 +12,6 @@
*******************************************************************************/
package org.eclipse.epp.mpc.tests;
-import java.util.Optional;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -77,24 +76,6 @@
}
}
- private static final class OptionalFunction<S, T> implements Function<Optional<S>, Optional<T>> {
- private final Function<S, T> function;
-
- public OptionalFunction(Function<S, T> function) {
- super();
- this.function = function;
- }
-
- @Override
- public Optional<T> apply(Optional<S> value) {
- if (!value.isPresent()) {
- return Optional.empty();
- }
- T result = function.apply(value.get());
- return Optional.ofNullable(result);
- }
- }
-
public static class OngoingTransformation<S, T> {
private final Function<S, T> transformation;
diff --git a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/service/SolutionCompatibilityFilterTest.java b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/service/SolutionCompatibilityFilterTest.java
index 1a72a68..b6981ff 100644
--- a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/service/SolutionCompatibilityFilterTest.java
+++ b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/service/SolutionCompatibilityFilterTest.java
@@ -108,8 +108,6 @@
private static final String JAVA_PRODUCT_ID = "epp.package.java";
- private static final String SDK_PRODUCT_ID = "org.eclipse.sdk.ide";
-
public static enum EclipseRelease {
UNKNOWN(null, null, null), //
KEPLER(JAVA_PRODUCT_ID, "2.0.0.20130613-0530", "4.3.0.v20130605-2000"), //
diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverNatureSupportJob.java b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverNatureSupportJob.java
index 86e97bc..dd0d89f 100644
--- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverNatureSupportJob.java
+++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverNatureSupportJob.java
@@ -21,7 +21,6 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.epp.internal.mpc.ui.MarketplaceClientUi;
-import org.eclipse.epp.internal.mpc.ui.MarketplaceClientDebug;
import org.eclipse.epp.internal.mpc.ui.Messages;
import org.eclipse.epp.mpc.core.model.INode;
import org.eclipse.epp.mpc.core.model.ISearchResult;
diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplacePage.java b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplacePage.java
index dd9bc74..d5e1666 100644
--- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplacePage.java
+++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplacePage.java
@@ -888,7 +888,6 @@
disableTabSelection = true;
updateTitle();
CatalogDescriptor descriptor = configuration.getCatalogDescriptor();
- ICatalogBranding oldBranding = currentBranding;
ICatalogBranding branding = descriptor == null ? null : descriptor.getCatalogBranding();
if (branding == null) {
branding = getDefaultBranding();
diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizardDialog.java b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizardDialog.java
index 3ddf427..c81937d 100644
--- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizardDialog.java
+++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/MarketplaceWizardDialog.java
@@ -16,7 +16,6 @@
import java.util.Arrays;
import org.eclipse.epp.internal.mpc.ui.css.StyleHelper;
-import org.eclipse.epp.mpc.ui.CatalogDescriptor;
import org.eclipse.epp.mpc.ui.MarketplaceUrlHandler;
import org.eclipse.epp.mpc.ui.MarketplaceUrlHandler.SolutionInstallationInfo;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -51,7 +50,6 @@
@Override
protected void proceedInstallation(String url) {
SolutionInstallationInfo info = MarketplaceUrlHandler.createSolutionInstallInfo(url);
- CatalogDescriptor catalogDescriptor = info.getCatalogDescriptor();
String installItem = info.getInstallId();
//we ignore previous wizard state here, since the wizard is still open...
if (installItem != null && installItem.length() > 0) {
