diff options
| author | Jayaprakash Arthanareeswaran | 2011-10-20 18:19:18 +0000 |
|---|---|---|
| committer | Jayaprakash Arthanareeswaran | 2011-10-20 18:19:18 +0000 |
| commit | c2dac7b946d49dc00840e57c05eae336b0795cad (patch) | |
| tree | edffc5ece8159863805a6cc6885376a4ad8e0a31 | |
| parent | ebbe9538adae7ae47732045e7c9e9fe4b72657d4 (diff) | |
| download | eclipse.jdt.core-c2dac7b946d49dc00840e57c05eae336b0795cad.tar.gz eclipse.jdt.core-c2dac7b946d49dc00840e57c05eae336b0795cad.tar.xz eclipse.jdt.core-c2dac7b946d49dc00840e57c05eae336b0795cad.zip | |
R3_6_maintenance_Java7 - Changing since tags for new API and creating API filtersv_B79_R36x_J7R3_6_2_Java7
4 files changed, 25 insertions, 6 deletions
diff --git a/org.eclipse.jdt.core/.settings/.api_filters b/org.eclipse.jdt.core/.settings/.api_filters index 0833d40f3f..460e06f65c 100644 --- a/org.eclipse.jdt.core/.settings/.api_filters +++ b/org.eclipse.jdt.core/.settings/.api_filters @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.jdt.core" version="2">
+<?xml version="1.0" encoding="UTF-8"?><component id="org.eclipse.jdt.core" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter comment="Adding Java 7 support for 3.6.2+" id="924844039">
<message_arguments>
@@ -395,6 +394,14 @@ </message_arguments>
</filter>
</resource>
+ <resource path="model/org/eclipse/jdt/core/IJavaModelMarker.java" type="org.eclipse.jdt.core.IJavaModelMarker">
+ <filter id="1210056707">
+ <message_arguments>
+ <message_argument value="3.6.4"/>
+ <message_argument value="OUTPUT_OVERLAPPING_SOURCE"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="model/org/eclipse/jdt/core/IJavaModelStatusConstants.java" type="org.eclipse.jdt.core.IJavaModelStatusConstants">
<filter comment="Add Java 7 support on top of 3.6.2+" id="1209008130">
<message_arguments>
@@ -403,6 +410,12 @@ <message_argument value="CANNOT_RETRIEVE_ATTACHED_JAVADOC_TIMEOUT"/>
</message_arguments>
</filter>
+ <filter id="1210056707">
+ <message_arguments>
+ <message_argument value="3.6.4"/>
+ <message_argument value="OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="model/org/eclipse/jdt/core/IJavaProject.java" type="org.eclipse.jdt.core.IJavaProject">
<filter comment="Add Java 7 support on top of 3.6.2+" id="1209008130">
@@ -506,6 +519,12 @@ <message_argument value="COMPILER_PB_UNAVOIDABLE_GENERIC_TYPE_PROBLEMS"/>
</message_arguments>
</filter>
+ <filter id="1142947843">
+ <message_arguments>
+ <message_argument value="3.6.4"/>
+ <message_argument value="CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE"/>
+ </message_arguments>
+ </filter>
<filter comment="Add Java 7 support on top of 3.6.2+" id="1142947843">
<message_arguments>
<message_argument value="3.7.1"/>
@@ -559,4 +578,4 @@ </message_arguments>
</filter>
</resource>
-</component>
+</component>
\ No newline at end of file diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java index 0c106ae4e0..8d485abb83 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelMarker.java @@ -120,7 +120,7 @@ public interface IJavaModelMarker { * Used only on buildpath problem markers. The value of this attribute is * either "true" or "false". * - * @since 3.8 + * @since 3.6.4 */ String OUTPUT_OVERLAPPING_SOURCE = "outputOverlappingSource"; //$NON-NLS-1$ } diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java index 1fd2a84774..a88db5e105 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaModelStatusConstants.java @@ -349,7 +349,7 @@ public interface IJavaModelStatusConstants { /** * <p>Status constant indicating that the default or specific output folder is overlapping * with another source location. </p> - * @since 3.8 + * @since 3.6.4 */ public static final int OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE = 1013; } diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java index e24e84220e..4303494480 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java @@ -1838,7 +1838,7 @@ public final class JavaCore extends Plugin { * <dt>Possible values:</dt><dd><code>{ "error", "warning", "ignore" }</code></dd> * <dt>Default:</dt><dd><code>"warning"</code></dd> * </dl> - * @since 3.8 + * @since 3.6.4 */ public static final String CORE_OUTPUT_LOCATION_OVERLAPPING_ANOTHER_SOURCE = PLUGIN_ID + ".classpath.outputOverlappingAnotherSource"; //$NON-NLS-1$ /** |