Bug 428468: removed JCP / BETA disclaimers from UI and updated
.api_filters
diff --git a/org.eclipse.jdt.ui/.settings/.api_filters b/org.eclipse.jdt.ui/.settings/.api_filters
index eed736d..8363dfc 100644
--- a/org.eclipse.jdt.ui/.settings/.api_filters
+++ b/org.eclipse.jdt.ui/.settings/.api_filters
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jdt.ui" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter comment="BETA_JAVA8" id="924844039">
- <message_arguments>
- <message_argument value="3.9.1"/>
- <message_argument value="3.9.1"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="core refactoring/org/eclipse/jdt/internal/corext/refactoring/code/ReplaceInvocationsRefactoring.java" type="org.eclipse.jdt.internal.corext.refactoring.code.ReplaceInvocationsRefactoring">
<filter id="571519004">
<message_arguments>
@@ -72,6 +64,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="ui/org/eclipse/jdt/internal/ui/compare/JavaStructureDiffViewer.java" type="org.eclipse.jdt.internal.ui.compare.JavaStructureDiffViewer">
+ <filter id="571473929">
+ <message_arguments>
+ <message_argument value="StructureDiffViewer"/>
+ <message_argument value="JavaStructureDiffViewer"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="ui/org/eclipse/jdt/internal/ui/javaeditor/AddClassFileMarkerAction.java" type="org.eclipse.jdt.internal.ui.javaeditor.AddClassFileMarkerAction">
<filter id="571473929">
<message_arguments>
@@ -112,6 +112,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="ui/org/eclipse/jdt/internal/ui/javaeditor/JavaSourceViewer.java" type="org.eclipse.jdt.internal.ui.javaeditor.JavaSourceViewer">
+ <filter id="571473929">
+ <message_arguments>
+ <message_argument value="ProjectionViewer"/>
+ <message_argument value="JavaSourceViewer"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="ui/org/eclipse/jdt/internal/ui/text/JavaOutlineInformationControl.java" type="org.eclipse.jdt.internal.ui.text.JavaOutlineInformationControl$OutlineTreeViewer">
<filter id="571473929">
<message_arguments>
@@ -120,6 +128,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="ui/org/eclipse/jdt/internal/ui/util/ViewerPane.java" type="org.eclipse.jdt.internal.ui.util.ViewerPane">
+ <filter id="571473929">
+ <message_arguments>
+ <message_argument value="ViewForm"/>
+ <message_argument value="ViewerPane"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="ui/org/eclipse/jdt/internal/ui/viewsupport/ProblemTableViewer.java" type="org.eclipse.jdt.internal.ui.viewsupport.ProblemTableViewer">
<filter id="571473929">
<message_arguments>
@@ -136,22 +152,6 @@
</message_arguments>
</filter>
</resource>
- <resource path="ui/org/eclipse/jdt/ui/JavaElementImageDescriptor.java" type="org.eclipse.jdt.ui.JavaElementImageDescriptor">
- <filter comment="BETA_JAVA8" id="1141899266">
- <message_arguments>
- <message_argument value="3.10"/>
- <message_argument value="3.9"/>
- <message_argument value="ANNOTATION_DEFAULT"/>
- </message_arguments>
- </filter>
- <filter comment="BETA_JAVA8" id="1141899266">
- <message_arguments>
- <message_argument value="3.10"/>
- <message_argument value="3.9"/>
- <message_argument value="DEFAULT_METHOD"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="ui/org/eclipse/jdt/ui/actions/IJavaEditorActionDefinitionIds.java" type="org.eclipse.jdt.ui.actions.IJavaEditorActionDefinitionIds">
<filter id="571473929">
<message_arguments>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java
index 03fd517..46975e3 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ComplianceConfigurationBlock.java
@@ -611,12 +611,11 @@
}
}
- //TODO: Remove once Java SE 8 has been shipped:
- String source= getValue(PREF_SOURCE_COMPATIBILITY);
- if (VERSION_1_8.equals(source)) {
- fJRE50InfoText.setText("This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP."); //$NON-NLS-1$
- isVisible= true;
- }
+// String source= getValue(PREF_SOURCE_COMPATIBILITY);
+// if (VERSION_1_8.equals(source)) {
+// fJRE50InfoText.setText("This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP."); //$NON-NLS-1$
+// isVisible= true;
+// }
fJRE50InfoText.setVisible(isVisible);
fJRE50InfoImage.setImage(isVisible ? JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_WARNING) : null);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
index adab930..9c50ddb 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
@@ -541,7 +541,7 @@
ComplianceConfigurationBlock_version15=1.5
ComplianceConfigurationBlock_version16=1.6
ComplianceConfigurationBlock_version17=1.7
-ComplianceConfigurationBlock_version18=1.8 (BETA)
+ComplianceConfigurationBlock_version18=1.8
ComplianceConfigurationBlock_versionCLDC11=CLDC 1.1
ComplianceConfigurationBlock_needsbuild_title=Compiler Settings Changed
