Renamed IXtextContextFakeResourcesProvider to IXtextFakeContextResourcesProvider.

de.itemis.gmf.utils/plugins/de.itemis.gmf.runtime.commons/src/de/itemis/gmf/runtime/commons/properties/descriptors/XtextPropertyDescriptor.java

@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Control;
 import com.google.inject.Injector;
 
 import de.itemis.xtext.utils.jface.viewers.StyledTextXtextAdapter;
-import de.itemis.xtext.utils.jface.viewers.context.IXtextContextFakeResourcesProvider;
+import de.itemis.xtext.utils.jface.viewers.context.IXtextFakeContextResourcesProvider;
 
 /**
  * 
@@ -35,12 +35,12 @@ import de.itemis.xtext.utils.jface.viewers.context.IXtextContextFakeResourcesPro
 public class XtextPropertyDescriptor extends AbstractPropertyDescriptor {
 
 	private final Injector injector;
-	private final IXtextContextFakeResourcesProvider contextFakeResourceProvider;
+	private final IXtextFakeContextResourcesProvider contextFakeResourceProvider;
 	private StyledTextXtextAdapter xtextAdapter;
 
 	public XtextPropertyDescriptor(EStructuralFeature feature,
 			String labelName, Injector injector,
-			IXtextContextFakeResourcesProvider contextFakeResourceProvider) {
+			IXtextFakeContextResourcesProvider contextFakeResourceProvider) {
 		super(feature, labelName);
 		this.injector = injector;
 		this.contextFakeResourceProvider = contextFakeResourceProvider;
@@ -49,12 +49,12 @@ public class XtextPropertyDescriptor extends AbstractPropertyDescriptor {
 	public XtextPropertyDescriptor(EStructuralFeature feature,
 			String labelName, Injector injector) {
 		this(feature, labelName, injector,
-				IXtextContextFakeResourcesProvider.NULL_CONTEXT_PROVIDER);
+				IXtextFakeContextResourcesProvider.NULL_CONTEXT_PROVIDER);
 	}
 
 	public XtextPropertyDescriptor(EAttribute feature, String labelName,
 			String helpContextId, Injector injector,
-			IXtextContextFakeResourcesProvider contextResourcesProvider) {
+			IXtextFakeContextResourcesProvider contextResourcesProvider) {
 		this(feature, labelName, injector, contextResourcesProvider);
 		this.helpContextId = helpContextId;
 	}
@@ -62,7 +62,7 @@ public class XtextPropertyDescriptor extends AbstractPropertyDescriptor {
 	public XtextPropertyDescriptor(EAttribute feature, String labelName,
 			String helpContextId, Injector injector) {
 		this(feature, labelName, helpContextId, injector,
-				IXtextContextFakeResourcesProvider.NULL_CONTEXT_PROVIDER);
+				IXtextFakeContextResourcesProvider.NULL_CONTEXT_PROVIDER);
 	}
 
 	protected int getStyle() {

de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.gmf/src/de/itemis/xtext/utils/gmf/viewers/XtextStyledTextCellEditorEx.java

@@ -14,7 +14,7 @@ package de.itemis.xtext.utils.gmf.viewers;
 import com.google.inject.Injector;
 
 import de.itemis.xtext.utils.jface.viewers.XtextStyledTextCellEditor;
-import de.itemis.xtext.utils.jface.viewers.context.IXtextContextFakeResourcesProvider;
+import de.itemis.xtext.utils.jface.viewers.context.IXtextFakeContextResourcesProvider;
 
 /**
  * This is a copy of TextCellEditorEx, only the super class has been changed to
@@ -29,7 +29,7 @@ public class XtextStyledTextCellEditorEx extends XtextStyledTextCellEditor {
 	private boolean deactivationLock = false;
 
 	public XtextStyledTextCellEditorEx(int style, Injector injector,
-			IXtextContextFakeResourcesProvider contextResourcesProvider) {
+			IXtextFakeContextResourcesProvider contextResourcesProvider) {
 		super(style, injector, contextResourcesProvider);
 	}
 

de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/src/de/itemis/xtext/utils/jface/viewers/StyledTextXtextAdapter.java

@@ -42,7 +42,7 @@ import com.google.inject.Injector;
 import com.google.inject.Provider;
 
 import de.itemis.xtext.utils.jface.fieldassist.CompletionProposalAdapter;
-import de.itemis.xtext.utils.jface.viewers.context.IXtextContextFakeResourcesProvider;
+import de.itemis.xtext.utils.jface.viewers.context.IXtextFakeContextResourcesProvider;
 import de.itemis.xtext.utils.jface.viewers.context.XtextFakeResourceContext;
 
 /**
@@ -79,12 +79,12 @@ public class StyledTextXtextAdapter {
 	@Inject
 	private XtextDocument document;
 	private XtextFakeResourceContext fakeResourceContext;
-	private final IXtextContextFakeResourcesProvider contextFakeResourceProvider;
+	private final IXtextFakeContextResourcesProvider contextFakeResourceProvider;
 
 	private StyledText styledText;
 
 	public StyledTextXtextAdapter(Injector injector,
-			IXtextContextFakeResourcesProvider contextFakeResourceProvider) {
+			IXtextFakeContextResourcesProvider contextFakeResourceProvider) {
 		this.contextFakeResourceProvider = contextFakeResourceProvider;
 		injector.injectMembers(this);
 
@@ -93,7 +93,7 @@ public class StyledTextXtextAdapter {
 	}
 	
 	public StyledTextXtextAdapter(Injector injector) {
-		this(injector, IXtextContextFakeResourcesProvider.NULL_CONTEXT_PROVIDER);
+		this(injector, IXtextFakeContextResourcesProvider.NULL_CONTEXT_PROVIDER);
 	}
 
 	public void adapt(StyledText styledText) {
@@ -279,7 +279,7 @@ public class StyledTextXtextAdapter {
 				.updateFakeResourceContext(contextFakeResourceProvider);
 	}
 
-	protected IXtextContextFakeResourcesProvider getFakeResourceContextProvider() {
+	protected IXtextFakeContextResourcesProvider getFakeResourceContextProvider() {
 		return contextFakeResourceProvider;
 	}
 

de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/src/de/itemis/xtext/utils/jface/viewers/XtextStyledTextCellEditor.java

@@ -34,7 +34,7 @@ import com.google.inject.Injector;
 
 import de.itemis.utils.jface.viewers.StyledTextCellEditor;
 import de.itemis.xtext.utils.jface.fieldassist.CompletionProposalAdapter;
-import de.itemis.xtext.utils.jface.viewers.context.IXtextContextFakeResourcesProvider;
+import de.itemis.xtext.utils.jface.viewers.context.IXtextFakeContextResourcesProvider;
 
 /**
  * This class integrates Xtext features into a {@link CellEditor} and can be
@@ -54,10 +54,10 @@ public class XtextStyledTextCellEditor extends StyledTextCellEditor {
 
 	private Injector injector;
 	private StyledTextXtextAdapter xtextAdapter;
-	private final IXtextContextFakeResourcesProvider contextFakeResourceProvider;
+	private final IXtextFakeContextResourcesProvider contextFakeResourceProvider;
 
 	public XtextStyledTextCellEditor(int style, Injector injector,
-			IXtextContextFakeResourcesProvider contextFakeResourceProvider) {
+			IXtextFakeContextResourcesProvider contextFakeResourceProvider) {
 		super();
 		setStyle(style);
 		this.injector = injector;

de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/src/de/itemis/xtext/utils/jface/viewers/context/CloningBasedFakeContextResourcesProvider.java

@@ -9,14 +9,14 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.resource.XtextResource;
 
 /**
- * An {@link IXtextContextFakeResourcesProvider} that populates the fake
+ * An {@link IXtextFakeContextResourcesProvider} that populates the fake
  * {@link ResourceSet} with 'clones' of the passed in context resources.
  * 
  * @author alexander.nyssen@itemis.de
  * 
  */
 public class CloningBasedFakeContextResourcesProvider implements
-		IXtextContextFakeResourcesProvider {
+		IXtextFakeContextResourcesProvider {
 
 	private final List<Resource> contextResources = new ArrayList<Resource>();
 

de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/src/de/itemis/xtext/utils/jface/viewers/context/IXtextContextFakeResourcesProvider.java

@@ -8,9 +8,9 @@ import org.eclipse.xtext.resource.XtextResource;
  * @author alexander.nyssen@itemis.de
  * 
  */
-public interface IXtextContextFakeResourcesProvider {
+public interface IXtextFakeContextResourcesProvider {
 
-	public static final IXtextContextFakeResourcesProvider NULL_CONTEXT_PROVIDER = new IXtextContextFakeResourcesProvider() {
+	public static final IXtextFakeContextResourcesProvider NULL_CONTEXT_PROVIDER = new IXtextFakeContextResourcesProvider() {
 		public void populateFakeResourceSet(
 				ResourceSet fakeResourceSet, XtextResource fakeResource) {
 		};

de.itemis.xtext.utils/plugins/de.itemis.xtext.utils.jface/src/de/itemis/xtext/utils/jface/viewers/context/XtextFakeResourceContext.java

@@ -89,7 +89,7 @@ public class XtextFakeResourceContext {
 	}
 
 	public void updateFakeResourceContext(
-			IXtextContextFakeResourcesProvider contextProvider) {
+			IXtextFakeContextResourcesProvider contextProvider) {
 
 		// remove any other resources that may have been created earlier
 		// unloading them (to remove all adapters)