Fixed bug 65431 - associate *.prefs to Java properties
diff --git a/bundles/org.eclipse.core.runtime/plugin.properties b/bundles/org.eclipse.core.runtime/plugin.properties
index 9329003..e0b59b5 100644
--- a/bundles/org.eclipse.core.runtime/plugin.properties
+++ b/bundles/org.eclipse.core.runtime/plugin.properties
@@ -17,4 +17,4 @@
contentTypesName = Content Types
textContentTypeName = Text
xmlContentTypeName = XML
-javaPropertiesContentTypeName = Java Properties
\ No newline at end of file
+propertiesContentTypeName = Properties
\ No newline at end of file
diff --git a/bundles/org.eclipse.core.runtime/plugin.xml b/bundles/org.eclipse.core.runtime/plugin.xml
index e09b80b..d994d86 100644
--- a/bundles/org.eclipse.core.runtime/plugin.xml
+++ b/bundles/org.eclipse.core.runtime/plugin.xml
@@ -26,13 +26,11 @@
default-charset="UTF-8">
<describer class="org.eclipse.core.internal.content.XMLContentDescriber"/>
</content-type>
- <!-- temporary - to be contributed by JDT -->
- <content-type id="javaProperties" name="%javaPropertiesContentTypeName"
+ <!-- a placeholder for setups where JDT's official type is not available -->
+ <content-type id="properties" name="%propertiesContentTypeName"
base-type="text"
priority="low"
file-extensions="properties"
default-charset="ISO-8859-1"/>
- <!-- temporary - to be contributed by JDT Core -->
- <file-association content-type="xml" file-names=".classpath"/>
</extension>
</plugin>
