Bug 545253 - Moving baseline to 4.11
Change-Id: Ic5bde8f5b879d657599d633f5dca4add984dd38a
diff --git a/org.eclipse.jdt.debug.ui/.settings/.api_filters b/org.eclipse.jdt.debug.ui/.settings/.api_filters
index 8e822e4..2a6baac 100644
--- a/org.eclipse.jdt.debug.ui/.settings/.api_filters
+++ b/org.eclipse.jdt.debug.ui/.settings/.api_filters
@@ -1,19 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.debug.ui" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter comment="API was backported to 4.7.1a" id="926941240">
- <message_arguments>
- <message_argument value="3.9.0"/>
- <message_argument value="3.8.50"/>
- </message_arguments>
- </filter>
- <filter comment="Photon changes" id="926941240">
- <message_arguments>
- <message_argument value="3.9.0"/>
- <message_argument value="3.8.51"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="ui/org/eclipse/jdt/debug/ui/launchConfigurations/JavaClasspathTab.java" type="org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab">
<filter comment="Known illegal extension" id="576720909">
<message_arguments>
diff --git a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
index b8a192b..cc761b1 100644
--- a/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true
-Bundle-Version: 3.10.200.qualifier
+Bundle-Version: 3.10.300.qualifier
Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml
index 0aad3ae..fb3ffce 100644
--- a/org.eclipse.jdt.debug.ui/pom.xml
+++ b/org.eclipse.jdt.debug.ui/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2018 Eclipse Foundation and others.
+ Copyright (c) 2012, 2019 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.ui</artifactId>
- <version>3.10.200-SNAPSHOT</version>
+ <version>3.10.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<code.ignoredWarnings>-warn:+resource,-deprecation,unavoidableGenericProblems</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
index 378cb9e..3999734 100644
--- a/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching.ui.macosx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching.ui.macosx;singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.300.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.launching.ui.macosx/pom.xml b/org.eclipse.jdt.launching.ui.macosx/pom.xml
index 27740cb..0520450 100644
--- a/org.eclipse.jdt.launching.ui.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.ui.macosx/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2017 Eclipse Foundation and others.
+ Copyright (c) 2012, 2019 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching.ui.macosx</artifactId>
- <version>1.2.200-SNAPSHOT</version>
+ <version>1.2.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
index da4a8f3..89a9eaf 100644
--- a/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
+++ b/org.eclipse.jdt.launching.ui.macosx/src/org/eclipse/jdt/internal/ui/macbundler/BundleDescription.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -13,19 +13,27 @@
*******************************************************************************/
package org.eclipse.jdt.internal.ui.macbundler;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jface.util.*;
import org.eclipse.core.runtime.ListenerList;
-
-import org.eclipse.debug.core.*;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchDelegate;
+import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
class BundleDescription implements BundleAttributes {
@@ -59,21 +67,24 @@
}
void addResource(ResourceInfo ri, boolean onClasspath) {
- if (onClasspath)
+ if (onClasspath) {
fClassPath.add(ri);
- else
+ } else {
fResources.add(ri);
+ }
}
boolean removeResource(ResourceInfo ri, boolean onClasspath) {
- if (onClasspath)
+ if (onClasspath) {
return fClassPath.remove(ri);
+ }
return fResources.remove(ri);
}
ResourceInfo[] getResources(boolean onClasspath) {
- if (onClasspath)
+ if (onClasspath) {
return fClassPath.toArray(new ResourceInfo[fClassPath.size()]);
+ }
return fResources.toArray(new ResourceInfo[fResources.size()]);
}
@@ -95,8 +106,9 @@
public boolean get(String key, boolean dflt) {
Boolean v= (Boolean) fProperties.get(key);
- if (v == null)
+ if (v == null) {
return dflt;
+ }
return v.booleanValue();
}
@@ -114,6 +126,7 @@
throw new CoreException(new Status(IStatus.ERROR, MacOSXUILaunchingPlugin.getUniqueIdentifier(), "Internal Error: missing Java launcher")); //$NON-NLS-1$
}
+ @SuppressWarnings("deprecation")
void inititialize(ILaunchConfiguration lc) {
AbstractJavaLaunchConfigurationDelegate lcd;
try {
@@ -151,8 +164,9 @@
try {
String[] classpath= lcd.getClasspath(lc);
- for (int i= 0; i < classpath.length; i++)
+ for (int i= 0; i < classpath.length; i++) {
addResource(new ResourceInfo(classpath[i]), true);
+ }
} catch (CoreException e) {
//
}
@@ -173,8 +187,9 @@
String key= token.substring(2, pos).trim();
String value= token.substring(pos+1).trim();
int l= value.length();
- if (l >= 2 && value.charAt(0) == '"' && value.charAt(l-1) == '"')
+ if (l >= 2 && value.charAt(0) == '"' && value.charAt(l-1) == '"') {
value= value.substring(1, l-1);
+ }
if ("java.library.path".equals(key)) { //$NON-NLS-1$
addDllDir(wd, value);
} else {
@@ -201,7 +216,9 @@
String launcher= null;
if (isSWT)
+ {
launcher= System.getProperty("org.eclipse.swtlauncher"); //$NON-NLS-1$
+ }
if (launcher == null) {
setValue(JVMVERSION, "1.4*"); //$NON-NLS-1$
@@ -216,10 +233,12 @@
} catch (CoreException e) {
// ignore
}
- if (p != null)
+ if (p != null) {
fProperties.put(IDENTIFIER, p.getElementName());
- else
+ }
+ else {
fProperties.put(IDENTIFIER, ""); //$NON-NLS-1$
+ }
fireChange();
}
@@ -243,8 +262,9 @@
for (int j= 0; j < dlls.length; j++) {
try {
String name= dlls[j].getCanonicalPath();
- if (name.endsWith(".jnilib")) //$NON-NLS-1$
+ if (name.endsWith(".jnilib")) { //$NON-NLS-1$
addResource(new ResourceInfo(name), false);
+ }
} catch (IOException e) {
// NeedWork Auto-generated catch block
e.printStackTrace();
@@ -255,13 +275,15 @@
static boolean verify(ILaunchConfiguration lc) {
String name= lc.getName();
- if (name.indexOf("jpage") >= 0) //$NON-NLS-1$
+ if (name.indexOf("jpage") >= 0) { //$NON-NLS-1$
return false;
+ }
AbstractJavaLaunchConfigurationDelegate lcd;
try {
lcd= getDelegate(lc);
- if (lcd.getMainTypeName(lc) == null)
+ if (lcd.getMainTypeName(lc) == null) {
return false;
+ }
return true;
} catch (CoreException e) {
return false;
diff --git a/org.eclipse.jdt.launching/.settings/.api_filters b/org.eclipse.jdt.launching/.settings/.api_filters
index d50c85d..0da98d6 100644
--- a/org.eclipse.jdt.launching/.settings/.api_filters
+++ b/org.eclipse.jdt.launching/.settings/.api_filters
@@ -1,36 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.launching" version="2">
- <resource path="">
- <filter comment="No API Changes" id="665845798">
- <message_arguments>
- <message_argument value="org.eclipse.jdt.launching"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="META-INF/MANIFEST.MF">
- <filter comment="No API Changes" id="926941240">
- <message_arguments>
- <message_argument value="3.13.0"/>
- <message_argument value="3.12.0"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="launching/org/eclipse/jdt/launching/IRuntimeClasspathEntryResolver.java" type="org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver">
- <filter comment="New method is a default method that delegates to an existing method" id="404000815">
- <message_arguments>
- <message_argument value="org.eclipse.jdt.launching.IRuntimeClasspathEntryResolver"/>
- <message_argument value="resolveRuntimeClasspathEntry(IRuntimeClasspathEntry, IJavaProject, boolean)"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="launching/org/eclipse/jdt/launching/IVMRunner.java" type="org.eclipse.jdt.launching.IVMRunner">
- <filter comment="added default method" id="404000815">
- <message_arguments>
- <message_argument value="org.eclipse.jdt.launching.IVMRunner"/>
- <message_argument value="showCommandLine(VMRunnerConfiguration, ILaunch, IProgressMonitor)"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="launching/org/eclipse/jdt/launching/sourcelookup/LocalFileStorage.java" type="org.eclipse.jdt.launching.sourcelookup.LocalFileStorage">
<filter comment="Known illegal extension" id="571473929">
<message_arguments>
diff --git a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
index 7c2d3c3..ced2072 100644
--- a/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.launching/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.launching; singleton:=true
-Bundle-Version: 3.13.0.qualifier
+Bundle-Version: 3.13.100.qualifier
Bundle-Activator: org.eclipse.jdt.internal.launching.LaunchingPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
index aff1441..17d1866 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaLaunchDelegate.java
@@ -61,6 +61,7 @@
}
}
+ @SuppressWarnings("deprecation")
private VMRunnerConfiguration getVMRunnerConfiguration(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
monitor.beginTask(NLS.bind("{0}...", new String[]{configuration.getName()}), 3); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index 54fe735..7403461 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.13.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
