Revert "Bug 489563 - API change for Language Settings Providers."

This reverts the changes we've made for language settings providers
so that I can start again with a cleaner approach.

Change-Id: Icddd5a465a8f217594af5b07011a56bf1dfdf014

1 files changed, 33 insertions, 52 deletions

diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CModelMock.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CModelMock.java
index 75e7a346a5c..a6c0a5d2551 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CModelMock.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/CModelMock.java
@@ -32,7 +32,6 @@ import org.eclipse.cdt.core.settings.model.ICStorageElement;
 import org.eclipse.cdt.core.settings.model.ICTargetPlatformSetting;

 import org.eclipse.cdt.core.settings.model.WriteAccessException;

 import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;

-import org.eclipse.core.resources.IBuildConfiguration;

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IPath;

@@ -43,8 +42,8 @@ import org.eclipse.core.runtime.QualifiedName;
  */

 public class CModelMock {

 	/**

-	 * Dummy implementation of ICProjectDescription for testing. Feel free to

-	 * override the methods you are interested to mock.

+	 * Dummy implementation of ICProjectDescription for testing.

+	 * Feel free to override the methods you are interested to mock.

 	 */

 	public static class DummyCProjectDescription implements ICProjectDescription {

 

@@ -89,7 +88,8 @@ public class CModelMock {
 		}

 

 		@Override

-		public ICStorageElement getStorage(String id, boolean create) throws CoreException {

+		public ICStorageElement getStorage(String id, boolean create)

+				throws CoreException {

 			return null;

 		}

 

@@ -136,17 +136,20 @@ public class CModelMock {
 		}

 

 		@Override

-		public void setActiveConfiguration(ICConfigurationDescription cfg) throws WriteAccessException {

+		public void setActiveConfiguration(ICConfigurationDescription cfg)

+				throws WriteAccessException {

 		}

 

 		@Override

-		public ICConfigurationDescription createConfiguration(String id, String name, ICConfigurationDescription base)

+		public ICConfigurationDescription createConfiguration(String id,

+				String name, ICConfigurationDescription base)

 				throws CoreException, WriteAccessException {

 			return null;

 		}

 

 		@Override

-		public ICConfigurationDescription createConfiguration(String buildSystemId, CConfigurationData data)

+		public ICConfigurationDescription createConfiguration(

+				String buildSystemId, CConfigurationData data)

 				throws CoreException, WriteAccessException {

 			return null;

 		}

@@ -162,11 +165,13 @@ public class CModelMock {
 		}

 

 		@Override

-		public void removeConfiguration(String name) throws WriteAccessException {

+		public void removeConfiguration(String name)

+				throws WriteAccessException {

 		}

 

 		@Override

-		public void removeConfiguration(ICConfigurationDescription cfg) throws WriteAccessException {

+		public void removeConfiguration(ICConfigurationDescription cfg)

+				throws WriteAccessException {

 		}

 

 		@Override

@@ -195,7 +200,8 @@ public class CModelMock {
 		}

 

 		@Override

-		public void setDefaultSettingConfiguration(ICConfigurationDescription cfg) {

+		public void setDefaultSettingConfiguration(

+				ICConfigurationDescription cfg) {

 		}

 

 		@Override

@@ -210,8 +216,8 @@ public class CModelMock {
 	}

 

 	/**

-	 * Dummy implementation of ICConfigurationDescription for testing. Feel free

-	 * to override the methods you are interested to mock.

+	 * Dummy implementation of ICConfigurationDescription for testing.

+	 * Feel free to override the methods you are interested to mock.

 	 */

 	public static class DummyCConfigurationDescription implements ICConfigurationDescription {

 		private String id;

@@ -261,7 +267,8 @@ public class CModelMock {
 		}

 

 		@Override

-		public ICStorageElement getStorage(String id, boolean create) throws CoreException {

+		public ICStorageElement getStorage(String id, boolean create)

+				throws CoreException {

 			return null;

 		}

 

@@ -319,23 +326,27 @@ public class CModelMock {
 		}

 

 		@Override

-		public ICResourceDescription getResourceDescription(IPath path, boolean exactPath) {

+		public ICResourceDescription getResourceDescription(IPath path,

+				boolean exactPath) {

 			return null;

 		}

 

 		@Override

-		public void removeResourceDescription(ICResourceDescription des) throws CoreException, WriteAccessException {

+		public void removeResourceDescription(ICResourceDescription des)

+				throws CoreException, WriteAccessException {

 		}

 

 		@Override

-		public ICFileDescription createFileDescription(IPath path, ICResourceDescription base)

-				throws CoreException, WriteAccessException {

+		public ICFileDescription createFileDescription(IPath path,

+				ICResourceDescription base) throws CoreException,

+				WriteAccessException {

 			return null;

 		}

 

 		@Override

-		public ICFolderDescription createFolderDescription(IPath path, ICFolderDescription base)

-				throws CoreException, WriteAccessException {

+		public ICFolderDescription createFolderDescription(IPath path,

+				ICFolderDescription base) throws CoreException,

+				WriteAccessException {

 			return null;

 		}

 

@@ -396,8 +407,9 @@ public class CModelMock {
 		}

 

 		@Override

-		public ICExternalSetting createExternalSetting(String[] languageIDs, String[] contentTypeIds,

-				String[] extensions, ICSettingEntry[] entries) throws WriteAccessException {

+		public ICExternalSetting createExternalSetting(String[] languageIDs,

+				String[] contentTypeIds, String[] extensions,

+				ICSettingEntry[] entries) throws WriteAccessException {

 			return null;

 		}

 

@@ -477,37 +489,6 @@ public class CModelMock {
 		public CConfigurationStatus getConfigurationStatus() {

 			return null;

 		}

-	}

-

-	public static class DummyBuildConfiguration implements IBuildConfiguration {

-		private final DummyCConfigurationDescription desc;

-

-		public DummyBuildConfiguration(DummyCConfigurationDescription desc) {

-			this.desc = desc;

-		}

-

-		@Override

-		public <T> T getAdapter(Class<T> adapter) {

-			if (adapter.isInstance(desc)) {

-				return (T) desc;

-			}

-			return null;

-		}

-

-		@Override

-		public IProject getProject() {

-			ICProjectDescription projDesc = desc.getProjectDescription();

-			if (projDesc != null) {

-				return projDesc.getProject();

-			} else {

-				return null;

-			}

-		}

-

-		@Override

-		public String getName() {

-			return desc.getName();

-		}

 

 	}

 }