Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=574134 along with
version increments
Change-Id: I6a6a660220774d51e45998070fc2a63cf6304787
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
index f4cb66c..3ea041e 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %plugin.name
Bundle-SymbolicName: org.eclipse.ecf.provider.filetransfer;singleton:=true
Automatic-Module-Name: org.eclipse.ecf.provider.filetransfer
-Bundle-Version: 3.2.601.qualifier
+Bundle-Version: 3.2.700.qualifier
Bundle-Activator: org.eclipse.ecf.internal.provider.filetransfer.Activator
Bundle-Vendor: %plugin.provider
Bundle-Localization: plugin
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml b/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
index 2d7f645..92eacd1 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.ecf</groupId>
<artifactId>org.eclipse.ecf.provider.filetransfer</artifactId>
- <version>3.2.601-SNAPSHOT</version>
+ <version>3.2.700-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
index 39f1c72..3c42122 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/internal/provider/filetransfer/Activator.java
@@ -129,10 +129,10 @@
final IExtensionDelta retrieveDelta[] = event.getExtensionDeltas(PLUGIN_ID, RETRIEVE_FILETRANSFER_PROTOCOL_FACTORY_EPOINT_NAME);
for (IExtensionDelta r : retrieveDelta) {
switch (r.getKind()) {
- case IExtensionDelta.ADDED:
+ case IExtensionDelta.ADDED :
addRetrieveExtensions(r.getExtension().getConfigurationElements());
break;
- case IExtensionDelta.REMOVED:
+ case IExtensionDelta.REMOVED :
removeRetrieveExtensions(r.getExtension().getConfigurationElements());
break;
}
@@ -140,10 +140,10 @@
final IExtensionDelta sendDelta[] = event.getExtensionDeltas(PLUGIN_ID, SEND_FILETRANSFER_PROTOCOL_FACTORY_EPOINT_NAME);
for (IExtensionDelta s : sendDelta) {
switch (s.getKind()) {
- case IExtensionDelta.ADDED:
+ case IExtensionDelta.ADDED :
addSendExtensions(s.getExtension().getConfigurationElements());
break;
- case IExtensionDelta.REMOVED:
+ case IExtensionDelta.REMOVED :
removeSendExtensions(s.getExtension().getConfigurationElements());
break;
}
@@ -151,10 +151,10 @@
final IExtensionDelta browseDelta[] = event.getExtensionDeltas(PLUGIN_ID, BROWSE_FILETRANSFER_PROTOCOL_FACTORY_EPOINT_NAME);
for (IExtensionDelta b : browseDelta) {
switch (b.getKind()) {
- case IExtensionDelta.ADDED:
+ case IExtensionDelta.ADDED :
addBrowseExtensions(b.getExtension().getConfigurationElements());
break;
- case IExtensionDelta.REMOVED:
+ case IExtensionDelta.REMOVED :
removeBrowseExtensions(b.getExtension().getConfigurationElements());
break;
}
@@ -210,10 +210,15 @@
return null;
}
+ static boolean proxyWarningGiven = false;
+
public static void logNoProxyWarning(Throwable e) {
Activator a = getDefault();
if (a != null) {
- a.log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.ERROR, "Warning: Platform proxy API not available", e)); //$NON-NLS-1$
+ if (!proxyWarningGiven) {
+ a.log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, IStatus.WARNING, "Warning: Platform proxy API not available", null)); //$NON-NLS-1$
+ proxyWarningGiven = true;
+ }
}
}
@@ -355,14 +360,14 @@
final Set protocols = new HashSet();
if (refs != null)
for (ServiceReference ref : refs) {
- final Object protocol = ref.getProperty(URL_HANDLER_PROTOCOL_NAME);
- if (protocol instanceof String) {
- protocols.add(protocol);
- } else if (protocol instanceof String[]) {
- final String[] ps = (String[]) protocol;
- protocols.addAll(Arrays.asList(ps));
+ final Object protocol = ref.getProperty(URL_HANDLER_PROTOCOL_NAME);
+ if (protocol instanceof String) {
+ protocols.add(protocol);
+ } else if (protocol instanceof String[]) {
+ final String[] ps = (String[]) protocol;
+ protocols.addAll(Arrays.asList(ps));
+ }
}
- }
handlers.close();
protocols.addAll(Arrays.asList(jvmSchemes));
return (String[]) protocols.toArray(new String[] {});
@@ -459,7 +464,7 @@
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing retrieve factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
- }catch (final CoreException e) {
+ } catch (final CoreException e) {
Activator.getDefault().log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, NLS.bind("Error loading from {0} extension point", RETRIEVE_FILETRANSFER_PROTOCOL_FACTORY_EPOINT), e)); //$NON-NLS-1$
}
}
@@ -496,7 +501,7 @@
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing send factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
- }catch (final CoreException e) {
+ } catch (final CoreException e) {
Activator.getDefault().log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, NLS.bind("Error loading from {0} extension point", SEND_FILETRANSFER_PROTOCOL_FACTORY_EPOINT), e)); //$NON-NLS-1$
}
}
@@ -533,7 +538,7 @@
} else {
Activator.getDefault().log(new Status(IStatus.WARNING, PLUGIN_ID, IStatus.WARNING, "Plugin " + pluginId + " excluded from contributing browse factory", null)); //$NON-NLS-1$ //$NON-NLS-2$
}
- }catch (final CoreException e) {
+ } catch (final CoreException e) {
Activator.getDefault().log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, NLS.bind("Error loading from {0} extension point", BROWSE_FILETRANSFER_PROTOCOL_FACTORY_EPOINT), e)); //$NON-NLS-1$
}
}
diff --git a/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml b/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml
index 586e139..1449109 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.ecf.filetransfer.feature"
label="%featureName"
- version="3.14.1703.qualifier"
+ version="3.14.1800.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml b/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
index bc21671..96bd686 100644
--- a/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.filetransfer.feature/pom.xml
@@ -9,6 +9,6 @@
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.eclipse.ecf.filetransfer.feature</artifactId>
- <version>3.14.1703-SNAPSHOT</version>
+ <version>3.14.1800-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/org.eclipse.ecf.releng.target/pom.xml b/releng/org.eclipse.ecf.releng.target/pom.xml
index e396d55..83f5508 100644
--- a/releng/org.eclipse.ecf.releng.target/pom.xml
+++ b/releng/org.eclipse.ecf.releng.target/pom.xml
@@ -31,9 +31,9 @@
<configuration>
<artifacts>
<artifact>
- <file>ecf-2019-09.target</file>
+ <file>ecf-2020-09.target</file>
<type>target</type>
- <classifier>ecf-2019-09</classifier>
+ <classifier>ecf-2020-09</classifier>
</artifact>
</artifacts>
</configuration>
