Bug 545576 - [12] Push Java 12 work to master
Change-Id: I9309f442fdda724aa31eae1b345209c2da66cdb5
diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml
index 88b3780..152a3af 100644
--- a/org.eclipse.jdt.debug.tests/pom.xml
+++ b/org.eclipse.jdt.debug.tests/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.tests</artifactId>
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 33a073c..4d3289d 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 ea497b6..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
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</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.debug.ui/ui/org/eclipse/jdt/debug/ui/actions/package.html b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/actions/package.html
index f709bf1..6a94374 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/actions/package.html
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/actions/package.html
@@ -8,10 +8,10 @@
<body link="#0000FF" vlink="#800080">
-<p align="left">Provides reuseable actions for the Java debugger.</p>
+Provides reusable actions for the Java debugger.
-<h2 align="left">Package Specification</h2>
+<h2>Package Specification</h2>
-<p>This package provides reuseable actions for the Java debugger. </p>
+This package provides reuseable actions for the Java debugger.
</body>
</html>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/package.html b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/package.html
index 8d6add6..fcbee58 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/package.html
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/package.html
@@ -8,10 +8,10 @@
<body link="#0000FF" vlink="#800080">
-<p align="left">Provides an editor for breakpoint conditions.</p>
+Provides an editor for breakpoint conditions.
-<h2 align="left">Package Specification</h2>
+<h2>Package Specification</h2>
-<p>This package provides an editor for breakpoint conditions.</p>
+This package provides an editor for breakpoint conditions.
</body>
</html>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/package.html b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/package.html
index 5ab2011..2bd824b 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/package.html
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/launchConfigurations/package.html
@@ -8,13 +8,12 @@
<body link="#0000FF" vlink="#800080">
-<p align="left">Provides an implementation launch configuration tabs for local and remote
- Java applications.</p>
+Provides an implementation launch configuration tabs for local and remote Java applications.
<h2 align="left">Package Specification</h2>
-<p>This package provides user interface classes supporting the launching of local
+ This package provides user interface classes supporting the launching of local
and remote Java applications. Launch configuration tabs and launch shortcuts
- are provided.</p>
+ are provided.
</body>
</html>
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/package.html b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/package.html
index 044cc4d..cfbba6f 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/package.html
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/package.html
@@ -8,17 +8,17 @@
<body link="#0000FF" vlink="#800080">
-<p align="left">Provides an implementation of a source locator for the Java debug model.</p>
+Provides an implementation of a source locator for the Java debug model.
-<h2 align="left">Package Specification</h2>
+<h2>Package Specification</h2>
-<p>This package provides a source locator for the Java debug model. The source
+ This package provides a source locator for the Java debug model. The source
locator prompts the user for source, when source cannot be found on the source
- lookup path. </p>
-<p>These <code>JavaUISourceLocator</code> and <code>JavaSourceLookupDialog</code>
+ lookup path.
+ These <code>JavaUISourceLocator</code> and <code>JavaSourceLookupDialog</code>
have been <b>deprecated</b> in Eclipse 3.0. Source lookup facilities are now
provided by the debug platform - see <code>org.eclipse.debug.core.sourcelookup</code>.
Source lookup support specific to the Java debugger is now provided in <code>org.eclipse.jdt.launching.sourcelookup.containers</code>.
- The user interface for source lookup is provided by <code>org.eclipse.debug.ui.sourcelookup</code>.</p>
+ The user interface for source lookup is provided by <code>org.eclipse.debug.ui.sourcelookup</code>.
</body>
</html>
diff --git a/org.eclipse.jdt.debug/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
index 28e1022..7ccf309 100644
--- a/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug; singleton:=true
-Bundle-Version: 3.12.200.qualifier
+Bundle-Version: 3.12.300.qualifier
Bundle-ClassPath: jdi.jar,
jdimodel.jar,
tools.jar
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/debug/eval/package.html b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/debug/eval/package.html
index 0ea338f..0b63b63 100644
--- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/debug/eval/package.html
+++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/debug/eval/package.html
@@ -8,15 +8,14 @@
<body link="#0000FF" vlink="#800080">
-<p align="left">Provides a set classes and interfaces that support evaluations
- in the Java debugger.</p>
+Provides a set classes and interfaces that support evaluations in the Java debugger.
-<h2 align="left">Package Specification</h2>
+<h2>Package Specification</h2>
-<p>This package defines a set of classes and interfaces that support evaluations
+ This package defines a set of classes and interfaces that support evaluations
in the Java debugger. Two evaluation engines are provided - one that performs
evaluations by compiling and deploying class files locally for execution, and
one that performs an interpretation over an abstract syntax tree. The later
- supports remote evaluation via JDI.</p>
+ supports remote evaluation via JDI.
</body>
</html>
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaArray.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaArray.java
index 84e8884..ffb2618 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaArray.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaArray.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 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
@@ -66,10 +66,9 @@
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <li>Failure communicating with the VM. The
- * DebugException's status code contains the underlying
- * exception responsible for the failure.</li>
- * </ul
+ * <li>Failure communicating with the VM. The DebugException's status code contains the underlying exception responsible for the
+ * failure.</li>
+ * </ul>
*/
public int getLength() throws DebugException;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaDebugTarget.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaDebugTarget.java
index fb2c9da..df65d0d 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaDebugTarget.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaDebugTarget.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 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
@@ -191,32 +191,30 @@
public abstract IJavaValue voidValue();
/**
- * Returns whether any of the threads associated with this debug target are
- * running code in the VM that is out of synch with the code in the
+ * Returns whether any of the threads associated with this debug target are running code in the VM that is out of synch with the code in the
* workspace.
*
* @return whether this debug target is out of synch with the workspace.
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <li>Failure communicating with the VM. The
- * DebugException's status code contains the underlying
- * exception responsible for the failure.</li>
+ * <li>Failure communicating with the VM. The DebugException's status code contains the underlying exception responsible for the
+ * failure.</li>
+ * </ul>
*/
public abstract boolean isOutOfSynch() throws DebugException;
/**
- * Returns whether any of the threads associated with this debug target may
- * be running code in the VM that is out of synch with the code in the
+ * Returns whether any of the threads associated with this debug target may be running code in the VM that is out of synch with the code in the
* workspace.
*
* @return whether this debug target may be out of synch with the workspace.
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <li>Failure communicating with the VM. The
- * DebugException's status code contains the underlying
- * exception responsible for the failure.</li>
+ * <li>Failure communicating with the VM. The DebugException's status code contains the underlying exception responsible for the
+ * failure.</li>
+ * </ul>
*/
public abstract boolean mayBeOutOfSynch() throws DebugException;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaObject.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaObject.java
index 2d55c8b..7273fc1 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaObject.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaObject.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 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
@@ -116,30 +116,27 @@
throws DebugException;
/**
- * Returns a variable representing the field in this object with the given
- * name, or <code>null</code> if there is no field with the given name, or
+ * Returns a variable representing the field in this object with the given name, or <code>null</code> if there is no field with the given name, or
* the name is ambiguous.
*
* @param name
* field name
* @param superField
- * whether or not to get the field in the superclass of this
- * objects.
+ * whether or not to get the field in the superclass of this objects.
* @return the variable representing the field, or <code>null</code>
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <li>Failure communicating with the VM. The
- * DebugException's status code contains the underlying
- * exception responsible for the failure.</li>
+ * <li>Failure communicating with the VM. The DebugException's status code contains the underlying exception responsible for the
+ * failure.</li>
+ * </ul>
*/
public IJavaFieldVariable getField(String name, boolean superField)
throws DebugException;
/**
- * Returns a variable representing the field in this object with the given
- * name declared in the type with the given signature, or <code>null</code>
- * if there is no field with the given name, or the name is ambiguous.
+ * Returns a variable representing the field in this object with the given name declared in the type with the given signature, or
+ * <code>null</code> if there is no field with the given name, or the name is ambiguous.
*
* @param name
* field name
@@ -149,9 +146,9 @@
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <li>Failure communicating with the VM. The
- * DebugException's status code contains the underlying
- * exception responsible for the failure.</li>
+ * <li>Failure communicating with the VM. The DebugException's status code contains the underlying exception responsible for the
+ * failure.</li>
+ * </ul>
*/
public IJavaFieldVariable getField(String name, String typeSignature)
throws DebugException;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaReferenceType.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaReferenceType.java
index 893c16a..debabdf 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaReferenceType.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaReferenceType.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 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
@@ -111,18 +111,15 @@
public IJavaObject getClassLoaderObject() throws DebugException;
/**
- * Returns the generic signature as defined in the JVM specification for
- * this type. Returns <code>null</code> if this type is not a generic type.
+ * Returns the generic signature as defined in the JVM specification for this type. Returns <code>null</code> if this type is not a generic type.
*
- * @return signature, or <code>null</code> if generic signature not
- * available
+ * @return signature, or <code>null</code> if generic signature not available
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <li>Failure communicating with the VM. The
- * DebugException's status code contains the underlying
- * exception responsible for the failure.</li>
- * <ul>
+ * <li>Failure communicating with the VM. The DebugException's status code contains the underlying exception responsible for the
+ * failure.</li>
+ * </ul>
* @since 3.1
*/
public String getGenericSignature() throws DebugException;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaStackFrame.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaStackFrame.java
index dd9f317..a77f2e3 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaStackFrame.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaStackFrame.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 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
@@ -101,7 +101,6 @@
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <ul>
* <li>Failure communicating with the VM. The
* DebugException's status code contains the underlying
* exception responsible for the failure.</li>
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaThread.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaThread.java
index 0bd9d04..90d15b5 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaThread.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/IJavaThread.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 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
@@ -75,32 +75,30 @@
boolean isSystemThread() throws DebugException;
/**
- * Returns whether any of the stack frames associated with this thread are
- * running code in the VM that is out of synch with the code in the
+ * Returns whether any of the stack frames associated with this thread are running code in the VM that is out of synch with the code in the
* workspace.
*
* @return whether this thread is out of synch with the workspace.
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <li>Failure communicating with the VM. The
- * DebugException's status code contains the underlying
- * exception responsible for the failure.</li>
+ * <li>Failure communicating with the VM. The DebugException's status code contains the underlying exception responsible for the
+ * failure.</li>
+ * </ul>
* @since 2.0
*/
boolean isOutOfSynch() throws DebugException;
/**
- * Returns whether this thread may be running code in the VM that is out of
- * synch with the code in the workspace.
+ * Returns whether this thread may be running code in the VM that is out of synch with the code in the workspace.
*
* @return whether this thread may be out of synch with the workspace.
* @exception DebugException
* if this method fails. Reasons include:
* <ul>
- * <li>Failure communicating with the VM. The
- * DebugException's status code contains the underlying
- * exception responsible for the failure.</li>
+ * <li>Failure communicating with the VM. The DebugException's status code contains the underlying exception responsible for the
+ * failure.</li>
+ * </ul>
* @since 2.0
*/
boolean mayBeOutOfSynch() throws DebugException;
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/package.html b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/package.html
index e483fc0..8c4b555 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/package.html
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/debug/core/package.html
@@ -8,9 +8,9 @@
<body link="#0000FF" vlink="#800080">
-<p align="left">Provides an implementation of a debug model based on JPDA (Java Platform Debug Architecture).</p>
+Provides an implementation of a debug model based on JPDA (Java Platform Debug Architecture).
-<h2 align="left">Package Specification</h2>
+<h2>Package Specification</h2>
<p>This package provides a set of classes and interfaces that implement a debug
model based on JPDA/JDI (Java Debug Interface). It provides a set of interfaces
diff --git a/org.eclipse.jdt.debug/pom.xml b/org.eclipse.jdt.debug/pom.xml
index 68d6fea..47e50c2 100644
--- a/org.eclipse.jdt.debug/pom.xml
+++ b/org.eclipse.jdt.debug/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
@@ -14,10 +14,10 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug</artifactId>
- <version>3.12.200-SNAPSHOT</version>
+ <version>3.12.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.jdt.launching.macosx/pom.xml b/org.eclipse.jdt.launching.macosx/pom.xml
index ce8a78b..12149f5 100644
--- a/org.eclipse.jdt.launching.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.macosx/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching.macosx</artifactId>
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 fb29173..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
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</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 e6d17e7..0da98d6 100644
--- a/org.eclipse.jdt.launching/.settings/.api_filters
+++ b/org.eclipse.jdt.launching/.settings/.api_filters
@@ -1,35 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.launching" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter comment="No increment in Beta branch" id="924844039">
- <message_arguments>
- <message_argument value="3.13.0"/>
- <message_argument value="3.13.0"/>
- </message_arguments>
- </filter>
- <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 a53b1eb..8b96b48 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.14.0.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/AbstractJavaLaunchConfigurationDelegate.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
index e2311ef..26c8546 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/AbstractJavaLaunchConfigurationDelegate.java
@@ -1209,7 +1209,7 @@
/**
* Supports Preview Features for launching.
*
- * @since 3.13
+ * @since 3.14
*/
protected boolean supportsPreviewFeatures(ILaunchConfiguration configuration) {
try {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java
index 2d74766..57d5bc9 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/IRuntimeClasspathEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 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
@@ -139,28 +139,28 @@
/**
* Returns a memento for this classpath entry.
* <p>
- * Since 3.0, the memento for a contributed classpath entry (i.e. of
- * type <code>OTHER</code>), must be in the form of an XML document,
- * with the following element structure:
+ * Since 3.0, the memento for a contributed classpath entry (i.e. of type <code>OTHER</code>), must be in the form of an XML document, with the
+ * following element structure:
+ *
* <pre>
+ * <code>
* <runtimeClasspathEntry id="exampleId">
* <memento
* key1="value1"
* ...>
* </memento>
* </runtimeClasspathEntry>
+ * </code>
* </pre>
- * The <code>id</code> attribute is the unique identifier of the extension
- * that contributed this runtime classpath entry type, via the extension
- * point <code>org.eclipse.jdt.launching.runtimeClasspathEntries</code>.
- * The <code>memento</code> element will be used to initialize a
- * restored runtime classpath entry, via the method
- * <code>IRuntimeClasspathEntry2.initializeFrom(Element memento)</code>. The
- * attributes of the <code>memento</code> element are client defined.
- * </p>
+ *
+ * The <code>id</code> attribute is the unique identifier of the extension that contributed this runtime classpath entry type, via the extension
+ * point <code>org.eclipse.jdt.launching.runtimeClasspathEntries</code>. The <code>memento</code> element will be used to initialize a restored
+ * runtime classpath entry, via the method <code>IRuntimeClasspathEntry2.initializeFrom(Element memento)</code>. The attributes of the
+ * <code>memento</code> element are client defined.
*
* @return a memento for this classpath entry
- * @exception CoreException if an exception occurs generating a memento
+ * @exception CoreException
+ * if an exception occurs generating a memento
*/
public String getMemento() throws CoreException;
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 f5dc704..ccd4a4a 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/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
index 1b637af..b8fd351 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2018 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
@@ -198,7 +198,6 @@
* (value <code>executionEnvironments</code>)</li>
* <li>Identifier of a contributed execution environment</li>
* </ol>
- * </p>
* @since 2.0
*/
public static final String JRE_CONTAINER = LaunchingPlugin.getUniqueIdentifier() + ".JRE_CONTAINER"; //$NON-NLS-1$
@@ -1868,15 +1867,15 @@
}
/**
- * Saves the VM configuration information to the preferences. This includes
- * the following information:
+ * Saves the VM configuration information to the preferences. This includes the following information:
* <ul>
* <li>The list of all defined IVMInstall instances.</li>
* <li>The default VM</li>
- * <ul>
- * This state will be read again upon first access to VM
- * configuration information.
- * @throws CoreException if trying to save the current state of VMs encounters a problem
+ * </ul>
+ * This state will be read again upon first access to VM configuration information.
+ *
+ * @throws CoreException
+ * if trying to save the current state of VMs encounters a problem
*/
public static void saveVMConfiguration() throws CoreException {
if (fgVMTypes == null) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java
index 00c0806..4215ed4 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/VMRunnerConfiguration.java
@@ -178,7 +178,6 @@
* <li>ATTR_BOOTPATH_APPEND</li>
* <li>ATTR_BOOTPATH</li>
* </ul>
- * </p>
* @return The boot classpath. An empty array indicates an empty
* bootpath and <code>null</code> indicates a default bootpath.
* @see #setBootClassPath(String[])
@@ -339,7 +338,7 @@
* Gets the fPreviewEnabled.
*
* @return the fPreviewEnabled
- * @since 3.13
+ * @since 3.14
*/
public boolean isPreviewEnabled() {
return fPreviewEnabled;
@@ -350,7 +349,7 @@
*
* @param fPreviewEnabled
* the fPreviewEnabled to set
- * @since 3.13
+ * @since 3.14
*/
public void setPreviewEnabled(boolean fPreviewEnabled) {
this.fPreviewEnabled = fPreviewEnabled;
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/CompatibleEnvironment.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/CompatibleEnvironment.java
index 38c61d8..cd14842 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/CompatibleEnvironment.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/environments/CompatibleEnvironment.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2019 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index fd48417..5e9e5da 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.jdt.debug</artifactId>
<groupId>eclipse.jdt.debug</groupId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.launching</artifactId>
- <version>3.13.0-SNAPSHOT</version>
+ <version>3.14.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/pom.xml b/pom.xml
index 9a8f5c7..d46aaf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,13 +15,13 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
<groupId>eclipse.jdt.debug</groupId>
<artifactId>eclipse.jdt.debug</artifactId>
- <version>4.11.0-SNAPSHOT</version>
+ <version>4.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
