Remove Classic theme

bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.css.swt.theme;singleton:=true
-Bundle-Version: 0.15.0.qualifier
+Bundle-Version: 0.15.100.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

bundles/org.eclipse.e4.ui.css.swt.theme/schema/org.eclipse.e4.ui.css.swt.theme.exsd

@@ -239,8 +239,8 @@ A stylesheet contributed to all Systems:
 The CSS theme and the legacy Colors and Fonts association:
 <pre>
 <themeAssociation
- themeId="org.eclipse.e4.ui.css.theme.e4_classic"
- colorAndFontId="org.eclipse.ui.defaultTheme"> 
+ themeId="org.eclipse.e4.ui.css.theme.e4_default"
+ colorAndFontId="org.eclipse.ui.defaultTheme">
 </themeassociation>
 </pre>
 </p>

bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java

@@ -578,15 +578,6 @@ void copyFile(String from, String to) throws IOException {
 	public void restore(String alternateTheme) {
 		String prefThemeId = getPreferenceThemeId();
 
-		// Bug 562794, 563601: Eclipse once contained two identical themes named
-		// "Classic" and "Windows Classic" and the second was removed with bug 562794.
-		// An old workspace using the removed "Windows Classic" theme would be reseted
-		// to the default theme on update. Since both themes are identical we silently
-		// change the theme to the remaining "Classic" theme and don't disturb the user.
-		if ("org.eclipse.e4.ui.css.theme.e4_classic6.0,6.1,6.2,6.3".equals(prefThemeId)) { //$NON-NLS-1$
-			prefThemeId = "org.eclipse.e4.ui.css.theme.e4_classic"; //$NON-NLS-1$
-		}
-
 		// use theme from preferences if it exists
 		if (prefThemeId != null) {
 			for (ITheme t : getThemes()) {

bundles/org.eclipse.ui.themes/plugin.properties

@@ -15,7 +15,6 @@
 Plugin.name = Eclipse SDK Themes
 Plugin.providerName = Eclipse.org
 
-theme.classic = Classic
 theme.light = Light
 
 theme.dark = Dark

bundles/org.eclipse.ui.themes/plugin.xml

@@ -3,11 +3,6 @@
 <plugin>
    <extension
          point="org.eclipse.e4.ui.css.swt.theme">
-      <theme
-            basestylesheeturi="css/e4_classic.css"
-            id="org.eclipse.e4.ui.css.theme.e4_classic"
-            label="%theme.classic">
-      </theme>
     <theme
         basestylesheeturi="css/e4-dark_linux.css"
         id="org.eclipse.e4.ui.css.theme.e4_dark"
@@ -52,10 +47,6 @@
             os="win32">
       </theme>
 
-   <themeAssociation
-		themeId="org.eclipse.e4.ui.css.theme.e4_classic"
-		colorAndFontId="org.eclipse.ui.defaultTheme">
-   </themeAssociation>
    <stylesheet
          uri="css/dark/e4-dark_preferencestyle.css">
       <themeid