Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry BLIND2019-04-12 06:30:00 -0400
committerThierry BLIND2019-04-12 08:11:39 -0400
commit6c94be435827235b90a54e2ed067f1fe6b635c7a (patch)
tree727dd36932aa6e92f108e3f25cdffb37eb887b84
parent0a4d0fba1f12cb9de6a565d9b2fe583541ffce17 (diff)
downloadorg.eclipse.pdt-6c94be435827235b90a54e2ed067f1fe6b635c7a.tar.gz
org.eclipse.pdt-6c94be435827235b90a54e2ed067f1fe6b635c7a.tar.xz
org.eclipse.pdt-6c94be435827235b90a54e2ed067f1fe6b635c7a.zip
No bug - cleanup composer api
Signed-off-by: Thierry BLIND <thierryblind@msn.com>
-rw-r--r--plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncDownloader.java2
-rw-r--r--plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageDownloader.java2
-rw-r--r--plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageSearch.java2
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/DownloadListenerAdapter.java (renamed from plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/DownloadListenerAdapater.java)2
-rw-r--r--plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/Downloader.java2
-rwxr-xr-xtests/org.eclipse.php.composer.api.tests/src/org/eclipse/php/composer/api/test/PackagesTest.java4
6 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncDownloader.java b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncDownloader.java
index 0861cf336..206c1f7a8 100644
--- a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncDownloader.java
+++ b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncDownloader.java
@@ -39,11 +39,11 @@ import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
import org.apache.http.protocol.HttpRequestExecutor;
+import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.util.EntityUtils;
public class AsyncDownloader extends AbstractDownloader {
diff --git a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageDownloader.java b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageDownloader.java
index 102cc1129..197ad19c3 100644
--- a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageDownloader.java
+++ b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageDownloader.java
@@ -49,7 +49,7 @@ public class AsyncPackageDownloader extends AsyncDownloadClient {
public int loadPackage(String packageName) {
downloader.setUrl(createUrl(packageName));
if (downloadListener == null) {
- downloadListener = new DownloadListenerAdapater() {
+ downloadListener = new DownloadListenerAdapter() {
@Override
public void dataReceived(InputStream content, String url) {
try {
diff --git a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageSearch.java b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageSearch.java
index f1b31d332..9a097dce6 100644
--- a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageSearch.java
+++ b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/AsyncPackageSearch.java
@@ -44,7 +44,7 @@ public class AsyncPackageSearch extends AsyncDownloadClient {
}
private void init() {
- downloader.addDownloadListener(new DownloadListenerAdapater() {
+ downloader.addDownloadListener(new DownloadListenerAdapter() {
private String getQuery(String url) {
try {
return URLDecoder.decode(url.replaceFirst(".+q=([^?&]+).*", "$1"), StandardCharsets.UTF_8.name()); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/DownloadListenerAdapater.java b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/DownloadListenerAdapter.java
index 4f7d6ec4d..024bea16d 100755..100644
--- a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/DownloadListenerAdapater.java
+++ b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/DownloadListenerAdapter.java
@@ -14,7 +14,7 @@ package org.eclipse.php.composer.api.packages;
import java.io.InputStream;
-public class DownloadListenerAdapater implements DownloadListenerInterface {
+public class DownloadListenerAdapter implements DownloadListenerInterface {
@Override
public void aborted(String url) {
diff --git a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/Downloader.java b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/Downloader.java
index b881b8270..06dec9280 100644
--- a/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/Downloader.java
+++ b/plugins/org.eclipse.php.composer.api/src/org/eclipse/php/composer/api/packages/Downloader.java
@@ -24,10 +24,10 @@ import org.apache.http.config.RegistryBuilder;
import org.apache.http.conn.socket.ConnectionSocketFactory;
import org.apache.http.conn.socket.PlainConnectionSocketFactory;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLContextBuilder;
import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.BasicHttpClientConnectionManager;
+import org.apache.http.ssl.SSLContextBuilder;
public class Downloader extends AbstractDownloader {
diff --git a/tests/org.eclipse.php.composer.api.tests/src/org/eclipse/php/composer/api/test/PackagesTest.java b/tests/org.eclipse.php.composer.api.tests/src/org/eclipse/php/composer/api/test/PackagesTest.java
index f53b47214..20d7cec08 100755
--- a/tests/org.eclipse.php.composer.api.tests/src/org/eclipse/php/composer/api/test/PackagesTest.java
+++ b/tests/org.eclipse.php.composer.api.tests/src/org/eclipse/php/composer/api/test/PackagesTest.java
@@ -52,7 +52,7 @@ public class PackagesTest extends TestCase {
public void testAsyncDownloader() {
try {
AsyncDownloader downloader = new AsyncDownloader(ComposerConstants.PHAR_URL);
- downloader.addDownloadListener(new DownloadListenerAdapater() {
+ downloader.addDownloadListener(new DownloadListenerAdapter() {
@Override
public void dataReceived(InputStream content, String url) {
asyncResult = content;
@@ -91,7 +91,7 @@ public class PackagesTest extends TestCase {
public void testAsyncComposerDownload() {
try {
AsyncPharDownloader downloader = new AsyncPharDownloader();
- downloader.addDownloadListener(new DownloadListenerAdapater() {
+ downloader.addDownloadListener(new DownloadListenerAdapter() {
@Override
public void dataReceived(InputStream content, String url) {
asyncResult = content;

Back to the top