[503342] Remove ContentModel.

eclipse · Oct 19, 2016 · c09911e · c09911e
1 parent 5adf197
commit c09911e
Show file tree

Hide file tree

Showing 25 changed files with 115 additions and 229 deletions.
diff --git a/org.eclipse.gef.dot.ui/src/org/eclipse/gef/dot/internal/ui/DotGraphView.java b/org.eclipse.gef.dot.ui/src/org/eclipse/gef/dot/internal/ui/DotGraphView.java
@@ -43,7 +43,6 @@
 import org.eclipse.gef.fx.nodes.InfiniteCanvas;
 import org.eclipse.gef.graph.Graph;
 import org.eclipse.gef.graph.GraphCopier;
-import org.eclipse.gef.mvc.fx.models.ContentModel;
 import org.eclipse.gef.mvc.fx.viewer.InfiniteCanvasViewer;
 import org.eclipse.gef.zest.fx.ui.ZestFxUiModule;
 import org.eclipse.gef.zest.fx.ui.parts.ZestFxUiView;
@@ -229,8 +228,7 @@ public void dispose() {
 		currentDot = null;
 		currentFile = null;
 
-		getContentViewer().getAdapter(ContentModel.class).contentsProperty()
-				.clear();
+		getContentViewer().contentsProperty().clear();
 
 		super.dispose();
 	}

diff --git a/org.eclipse.gef.fx.doc/about.mappings b/org.eclipse.gef.fx.doc/about.mappings
@@ -3,4 +3,4 @@
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file does not need to be translated.
 
-0=@build@
+0=201610190943
diff --git a/org.eclipse.gef.fx.doc/javadocOptions.txt b/org.eclipse.gef.fx.doc/javadocOptions.txt
@@ -1,20 +1,20 @@
 -verbose
 -encoding "UTF-8"
 -charset "UTF-8"
--sourcepath "../org.eclipse.gef.fx/src@path.separator@../org.eclipse.gef.fx.swt/src@path.separator@../org.eclipse.gef.fx.jface/src@path.separator@../org.eclipse.gef.fx.ui/src"
+-sourcepath "../org.eclipse.gef.fx/src:../org.eclipse.gef.fx.swt/src:../org.eclipse.gef.fx.jface/src:../org.eclipse.gef.fx.ui/src"
 -d reference/api
--classpath "@classpath@"
+-classpath "/usr/lib/jvm/java-8-oracle/jre/lib/jfxswt.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/com.google.guava.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/com.google.inject.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/com.google.inject.multibindings.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/com.ibm.icu.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/javax.inject.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/javax.xml.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.apache.batik.css.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.apache.batik.util.gui.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.apache.batik.util.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.apache.commons.jxpath.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.core.commands.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.core.contenttype.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.core.databinding.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.core.databinding.observable.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.core.databinding.property.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.core.expressions.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.core.jobs.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.core.runtime.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.core.commands.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.core.contexts.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.core.di.annotations.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.core.di.extensions.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.core.di.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.core.services.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.emf.xpath.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.bindings.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.css.core.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.css.swt.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.css.swt.theme.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.di.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.model.workbench.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.services.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.widgets.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.workbench.addons.swt.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.workbench.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.workbench.renderers.swt.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.workbench.swt.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.e4.ui.workbench3.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.emf.common.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.emf.ecore.change.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.emf.ecore.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.emf.ecore.xmi.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.equinox.app.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.equinox.common.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.equinox.ds.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.equinox.preferences.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.equinox.registry.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.equinox.util.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.gef.common.doc.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.gef.common.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.gef.geometry.convert.fx.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.gef.geometry.doc.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.gef.geometry.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.help.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.jface.databinding.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.jface.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.osgi.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.osgi.services.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.swt.cocoa.macosx.x86_64.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.swt.gtk.linux.x86.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.swt.gtk.linux.x86_64.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.swt.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.swt.win32.win32.x86.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.swt.win32.win32.x86_64.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.ui.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.ui.views.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.eclipse.ui.workbench.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.w3c.css.sac.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.w3c.dom.events.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.w3c.dom.smil.jar:/home/wienand/git/gef/org.eclipse.gef.fx.doc/api-context-libs/org.w3c.dom.svg.jar"
 -use
 -breakiterator
 -splitIndex
 -windowtitle "GEF FX API Reference"
 -doctitle "GEF FX API Reference"
--header "<b>GEF FX</b><br>@build@"
+-header "<b>GEF FX</b><br>5.0.0.201610190943"
 -bottom "Copyright (c) 2014 itemis AG and others. All rights reserved."
 -link http://docs.oracle.com/javase/7/docs/api/
 -link http://docs.oracle.com/javafx/2/api/
 -link http://docs.guava-libraries.googlecode.com/git-history/v15.0/javadoc/
--linkoffline PLUGINS_ROOT/org.eclipse.platform.doc.isv/reference/api/ @linkoffline-target@/org.eclipse.platform.doc.isv/reference/api/
+-linkoffline PLUGINS_ROOT/org.eclipse.platform.doc.isv/reference/api/ linkoffline-target/org.eclipse.platform.doc.isv/reference/api/
 -linkoffline PLUGINS_ROOT/org.eclipse.gef.common.doc/reference/api/ ../org.eclipse.gef.common.doc/reference/api/
 -linkoffline PLUGINS_ROOT/org.eclipse.gef.geometry.doc/reference/api/ ../org.eclipse.gef.geometry.doc/reference/api/
 

diff --git a/...vc.examples.logo.ui/src/org/eclipse/gef/mvc/examples/logo/ui/view/MvcLogoExampleView.java b/...vc.examples.logo.ui/src/org/eclipse/gef/mvc/examples/logo/ui/view/MvcLogoExampleView.java
@@ -33,7 +33,6 @@
 import org.eclipse.gef.mvc.examples.logo.ui.MvcLogoExampleUiModule;
 import org.eclipse.gef.mvc.examples.logo.ui.properties.GeometricCurvePropertySource;
 import org.eclipse.gef.mvc.fx.behaviors.SelectionBehavior;
-import org.eclipse.gef.mvc.fx.models.ContentModel;
 import org.eclipse.gef.mvc.fx.operations.AbstractCompositeOperation;
 import org.eclipse.gef.mvc.fx.operations.ForwardUndoCompositeOperation;
 import org.eclipse.gef.mvc.fx.operations.ITransactionalOperation;
@@ -42,11 +41,9 @@
 import org.eclipse.gef.mvc.fx.ui.properties.SetPropertyValueOperation;
 import org.eclipse.gef.mvc.fx.ui.properties.UndoablePropertySheetEntry;
 import org.eclipse.gef.mvc.fx.ui.properties.UndoablePropertySheetPage;
-import org.eclipse.gef.mvc.fx.viewer.InfiniteCanvasViewer;
 import org.eclipse.gef.mvc.fx.viewer.IViewer;
 import org.eclipse.ui.views.properties.IPropertySheetPage;
 
-import com.google.common.reflect.TypeToken;
 import com.google.inject.Guice;
 import com.google.inject.util.Modules;
 
@@ -108,19 +105,19 @@ public MvcLogoExampleView() {
 				.with(new MvcLogoExampleUiModule())));
 
 		// set initial contents
-		getContentViewer().getAdapter(ContentModel.class).getContents()
+		getContentViewer().getContents()
 				.setAll(MvcLogoExample.createDefaultContents());
-		getPaletteViewer().getAdapter(ContentModel.class).getContents()
+		getPaletteViewer().getContents()
 				.setAll(MvcLogoExample.createPaletteContents());
 	}
 
 	@Override
 	public void dispose() {
 
 		// clear viewer contents
-		getContentViewer().getAdapter(ContentModel.class).contentsProperty()
+		getContentViewer().contentsProperty()
 				.clear();
-		getPaletteViewer().getAdapter(ContentModel.class).contentsProperty()
+		getPaletteViewer().contentsProperty()
 				.clear();
 
 		super.dispose();
@@ -226,7 +223,7 @@ public void setValues(Object[] objects) {
 						if (objects == null || objects.length == 0) {
 							// TODO: test
 							objects = new Object[] { getContentViewer()
-									.getAdapter(ContentModel.class)
+
 									.getContents().get(0) };
 						}
 						super.setValues(objects);

diff --git a/...ef.mvc.examples.logo.web/src/org/eclipse/gef/mvc/examples/logo/web/MvcLogoWebExample.java b/...ef.mvc.examples.logo.web/src/org/eclipse/gef/mvc/examples/logo/web/MvcLogoWebExample.java
@@ -20,7 +20,6 @@
 import org.eclipse.gef.mvc.examples.logo.MvcLogoExampleViewersComposite;
 import org.eclipse.gef.mvc.examples.logo.model.GeometricModel;
 import org.eclipse.gef.mvc.examples.logo.model.PaletteModel;
-import org.eclipse.gef.mvc.fx.models.ContentModel;
 import org.eclipse.gef.mvc.fx.viewer.IViewer;
 
 import com.google.inject.Module;
@@ -66,10 +65,8 @@ protected void hookViewers() {
 
 	@Override
 	protected void populateViewerContents() {
-		getContentViewer().getAdapter(ContentModel.class).getContents()
-				.setAll(createDefaultContents());
-		getPaletteViewer().getAdapter(ContentModel.class).getContents()
-				.setAll(createPaletteContents());
+		getContentViewer().getContents().setAll(createDefaultContents());
+		getPaletteViewer().getContents().setAll(createPaletteContents());
 	}
 
 }
diff --git a/org.eclipse.gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/MvcLogoExample.java b/org.eclipse.gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/MvcLogoExample.java
@@ -18,7 +18,6 @@
 import org.eclipse.gef.mvc.examples.AbstractMvcExample;
 import org.eclipse.gef.mvc.examples.logo.model.GeometricModel;
 import org.eclipse.gef.mvc.examples.logo.model.PaletteModel;
-import org.eclipse.gef.mvc.fx.models.ContentModel;
 import org.eclipse.gef.mvc.fx.viewer.IViewer;
 
 import com.google.inject.Module;
@@ -61,9 +60,8 @@ protected void hookViewers() {
 
 	@Override
 	protected void populateViewerContents() {
-		getContentViewer().getAdapter(ContentModel.class).getContents().setAll(createDefaultContents());
-		getPaletteViewer().getAdapter(ContentModel.class).getContents().setAll(createPaletteContents());
-
+		getContentViewer().getContents().setAll(createDefaultContents());
+		getPaletteViewer().getContents().setAll(createPaletteContents());
 		getPrimaryStage().sizeToScene();
 	}
 

diff --git a/...pse.gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/MvcLogoExampleModule.java b/...pse.gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/MvcLogoExampleModule.java
@@ -19,8 +19,8 @@
 import org.eclipse.gef.common.adapt.inject.AdapterMaps;
 import org.eclipse.gef.mvc.examples.logo.behaviors.PaletteFocusBehavior;
 import org.eclipse.gef.mvc.examples.logo.parts.GeometricCurveCreationHoverHandlePart;
-import org.eclipse.gef.mvc.examples.logo.parts.GeometricElementDeletionHandlePart;
 import org.eclipse.gef.mvc.examples.logo.parts.GeometricCurvePart;
+import org.eclipse.gef.mvc.examples.logo.parts.GeometricElementDeletionHandlePart;
 import org.eclipse.gef.mvc.examples.logo.parts.GeometricModelPart;
 import org.eclipse.gef.mvc.examples.logo.parts.GeometricShapePart;
 import org.eclipse.gef.mvc.examples.logo.parts.MvcLogoExampleContentPartFactory;
@@ -44,7 +44,6 @@
 import org.eclipse.gef.mvc.fx.behaviors.HoverBehavior;
 import org.eclipse.gef.mvc.fx.behaviors.SelectionBehavior;
 import org.eclipse.gef.mvc.fx.domain.IDomain;
-import org.eclipse.gef.mvc.fx.models.ContentModel;
 import org.eclipse.gef.mvc.fx.models.FocusModel;
 import org.eclipse.gef.mvc.fx.models.HoverModel;
 import org.eclipse.gef.mvc.fx.models.SelectionModel;
@@ -103,10 +102,6 @@ protected void bindAbstractContentPartAdapters(MapBinder<AdapterKey<?>, Object>
 		adapterMapBinder.addBinding(AdapterKey.defaultRole()).to(SelectFocusedOnTypePolicy.class);
 	}
 
-	protected void bindContentModelAsPaletteViewerAdapter(MapBinder<AdapterKey<?>, Object> adapterMapBinder) {
-		adapterMapBinder.addBinding(AdapterKey.defaultRole()).to(ContentModel.class);
-	}
-
 	/**
 	 * Registers the {@link ContentRestrictedChangeViewportPolicy} as an adapter
 	 * at the given {@link MapBinder}.
@@ -284,11 +279,6 @@ protected void bindFXRectangleSegmentHandlePartAdapters(MapBinder<AdapterKey<?>,
 		adapterMapBinder.addBinding(AdapterKey.defaultRole()).to(BendFirstAnchorageOnSegmentHandleDragPolicy.class);
 	}
 
-	protected void bindIRootPartAsPaletteViewerAdapter(MapBinder<AdapterKey<?>, Object> adapterMapBinder) {
-		adapterMapBinder.addBinding(AdapterKey.role(PALETTE_VIEWER_ROLE)).to(IRootPart.class)
-				.in(AdaptableScopes.typed(IViewer.class));
-	}
-
 	protected void bindFXSquareSegmentHandlePartAdapters(MapBinder<AdapterKey<?>, Object> adapterMapBinder) {
 		// single selection: resize relocate on handle drag without modifier
 		adapterMapBinder.addBinding(AdapterKey.defaultRole()).to(ResizeTranslateFirstAnchorageOnHandleDragPolicy.class);
@@ -347,6 +337,11 @@ protected void bindIRootPartAdaptersForContentViewer(MapBinder<AdapterKey<?>, Ob
 		adapterMapBinder.addBinding(AdapterKey.defaultRole()).to(HoverBehavior.class);
 	}
 
+	protected void bindIRootPartAsPaletteViewerAdapter(MapBinder<AdapterKey<?>, Object> adapterMapBinder) {
+		adapterMapBinder.addBinding(AdapterKey.role(PALETTE_VIEWER_ROLE)).to(IRootPart.class)
+				.in(AdaptableScopes.typed(IViewer.class));
+	}
+
 	@Override
 	protected void bindIViewerAdaptersForContentViewer(MapBinder<AdapterKey<?>, Object> adapterMapBinder) {
 		super.bindIViewerAdaptersForContentViewer(adapterMapBinder);
@@ -380,7 +375,6 @@ protected void bindPaletteFocusBehaviorAsFXRootPartAdapter(MapBinder<AdapterKey<
 	 */
 	protected void bindPaletteViewerAdapters(MapBinder<AdapterKey<?>, Object> adapterMapBinder) {
 		// bind models
-		bindContentModelAsPaletteViewerAdapter(adapterMapBinder);
 		bindFocusModelAsPaletteViewerAdapter(adapterMapBinder);
 		bindHoverModelAsPaletteViewerAdapter(adapterMapBinder);
 		bindSelectionModelAsPaletteViewerAdapter(adapterMapBinder);
@@ -464,7 +458,8 @@ protected void configure() {
 				AdapterMaps.getAdapterMapBinder(binder(), RectangleSegmentHandlePart.class));
 
 		// hover handles
-		bindFXDeleteHandlePartAdapters(AdapterMaps.getAdapterMapBinder(binder(), GeometricElementDeletionHandlePart.class));
+		bindFXDeleteHandlePartAdapters(
+				AdapterMaps.getAdapterMapBinder(binder(), GeometricElementDeletionHandlePart.class));
 		bindFXCreateCurveHandlePartAdapters(
 				AdapterMaps.getAdapterMapBinder(binder(), GeometricCurveCreationHoverHandlePart.class));
 

diff --git a/...gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/parts/GeometricCurvePart.java b/...gef.mvc.examples.logo/src/org/eclipse/gef/mvc/examples/logo/parts/GeometricCurvePart.java
@@ -35,7 +35,6 @@
 import org.eclipse.gef.mvc.examples.logo.model.GeometricCurve.Decoration;
 import org.eclipse.gef.mvc.examples.logo.model.GeometricCurve.RoutingStyle;
 import org.eclipse.gef.mvc.fx.parts.IBendableContentPart;
-import org.eclipse.gef.mvc.fx.parts.IBendableContentPart.BendPoint;
 import org.eclipse.gef.mvc.fx.parts.IResizableVisualPart;
 import org.eclipse.gef.mvc.fx.parts.ITransformableContentPart;
 import org.eclipse.gef.mvc.fx.parts.IVisualPart;

diff --git a/org.eclipse.gef.mvc.fx/src/org/eclipse/gef/mvc/fx/MvcFxModule.java b/org.eclipse.gef.mvc.fx/src/org/eclipse/gef/mvc/fx/MvcFxModule.java
@@ -30,7 +30,6 @@
 import org.eclipse.gef.mvc.fx.behaviors.SelectionBehavior;
 import org.eclipse.gef.mvc.fx.domain.HistoricizingDomain;
 import org.eclipse.gef.mvc.fx.domain.IDomain;
-import org.eclipse.gef.mvc.fx.models.ContentModel;
 import org.eclipse.gef.mvc.fx.models.FocusModel;
 import org.eclipse.gef.mvc.fx.models.GridModel;
 import org.eclipse.gef.mvc.fx.models.HoverModel;
@@ -70,8 +69,8 @@
 import org.eclipse.gef.mvc.fx.tools.RotateTool;
 import org.eclipse.gef.mvc.fx.tools.ScrollTool;
 import org.eclipse.gef.mvc.fx.tools.TypeTool;
-import org.eclipse.gef.mvc.fx.viewer.InfiniteCanvasViewer;
 import org.eclipse.gef.mvc.fx.viewer.IViewer;
+import org.eclipse.gef.mvc.fx.viewer.InfiniteCanvasViewer;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Binder;
@@ -286,25 +285,6 @@ protected void bindContentIViewerAsIDomainAdapter(
 				.to(IViewer.class);
 	}
 
-	/**
-	 * Adds a binding for {@link ContentModel} to the {@link AdapterMap} binder
-	 * for {@link IViewer}.
-	 *
-	 * @param adapterMapBinder
-	 *            The {@link MapBinder} to be used for the binding registration.
-	 *            In this case, will be obtained from
-	 *            {@link AdapterMaps#getAdapterMapBinder(Binder, Class)} using
-	 *            {@link IViewer} as a key.
-	 *
-	 * @see AdapterMaps#getAdapterMapBinder(Binder, Class)
-	 */
-	protected void bindContentModelAsContentViewerAdapter(
-			MapBinder<AdapterKey<?>, Object> adapterMapBinder) {
-		adapterMapBinder.addBinding(AdapterKey.defaultRole())
-				.to(ContentModel.class)
-				.in(AdaptableScopes.typed(IViewer.class));
-	}
-
 	/**
 	 * Binds {@link ContentPartPool}, parameterized by {@link Node}, to the
 	 * {@link IViewer} adaptable scope.
@@ -738,7 +718,6 @@ protected void bindIViewer() {
 	protected void bindIViewerAdaptersForContentViewer(
 			MapBinder<AdapterKey<?>, Object> adapterMapBinder) {
 		bindIContentPartFactoryAsContentViewerAdapter(adapterMapBinder);
-		bindContentModelAsContentViewerAdapter(adapterMapBinder);
 		bindGridModelAsContentViewerAdapter(adapterMapBinder);
 		bindFocusModelAsContentViewerAdapter(adapterMapBinder);
 		bindHoverModelAsContentViewerAdapter(adapterMapBinder);