### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.tests
Index: src/org/eclipse/gmf/tests/gef/DiagramNodeTest.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gef/DiagramNodeTest.java,v
retrieving revision 1.17
diff -u -r1.17 DiagramNodeTest.java
--- src/org/eclipse/gmf/tests/gef/DiagramNodeTest.java	19 Jun 2006 12:42:00 -0000	1.17
+++ src/org/eclipse/gmf/tests/gef/DiagramNodeTest.java	19 Jun 2006 14:35:16 -0000
@@ -25,8 +25,6 @@
 import org.eclipse.gmf.gmfgraph.Color;
 import org.eclipse.gmf.gmfgraph.Connection;
 import org.eclipse.gmf.gmfgraph.Figure;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities;
 import org.eclipse.gmf.runtime.notation.Edge;
 import org.eclipse.gmf.runtime.notation.FillStyle;
@@ -37,8 +35,6 @@
 import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tests.gen.GenericFigureCheck;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.swt.graphics.RGB;
 
 public class DiagramNodeTest extends DiagramTestBase {
@@ -94,14 +90,10 @@
 		assertTrue(actual instanceof PolylineConnection);
 		Figure gmfFigure = (Figure)gmfGraphConnection.getFigure();
 		Color gmfColor = gmfFigure.getForegroundColor();
-		RGB expectedRGB = gmfColor == null ? getDefaultLinkColor() : ourColorTransformer.gmf2swt(gmfColor);
+		RGB expectedRGB = gmfColor == null ? getViewerConfiguration().getDefaultLinkColor() : ourColorTransformer.gmf2swt(gmfColor);
 		assertEquals(expectedRGB, actual.getForegroundColor().getRGB());
 	}
 
-	private RGB getDefaultLinkColor() {
-		return PreferenceConverter.getColor(getDefaults(), IPreferenceConstants.PREF_LINE_COLOR);
-	}
-
 	public void testChangeBounds() {
 		final EditPart editPart = getNodeEditPartA();
 		final Node notation = getNotation(editPart);
@@ -214,7 +206,4 @@
 		assertEquals("Background color doesn't match after [" + assertTag + ']', expectedBackgroundColor, getBackgroundColor(notation));
 	}
 
-	private IPreferenceStore getDefaults() {
-		return (IPreferenceStore) PreferencesHint.USE_DEFAULTS.getPreferenceStore();
-	}
 }
Index: src/org/eclipse/gmf/tests/setup/GeneratorConfiguration.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/GeneratorConfiguration.java,v
retrieving revision 1.3
diff -u -r1.3 GeneratorConfiguration.java
--- src/org/eclipse/gmf/tests/setup/GeneratorConfiguration.java	22 May 2006 18:14:12 -0000	1.3
+++ src/org/eclipse/gmf/tests/setup/GeneratorConfiguration.java	19 Jun 2006 14:35:16 -0000
@@ -20,6 +20,7 @@
 import org.eclipse.gmf.internal.common.codegen.GeneratorBase;
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 
 public interface GeneratorConfiguration {
@@ -38,6 +39,8 @@
 		public Command getSetBusinessElementStructuralFeatureCommand(View view, String featureName, Object value);
 		public Command getSetNotationalElementStructuralFeature(View view, EStructuralFeature feature, Object value);
 		public void dispose();
+		
+		public RGB getDefaultLinkColor();
 	}
 
 	public ViewerConfiguration createViewerConfiguration(Composite parent, SessionSetup setup, Diagram canvas) throws Exception;
Index: src/org/eclipse/gmf/tests/setup/RuntimeBasedGeneratorConfiguration.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/RuntimeBasedGeneratorConfiguration.java,v
retrieving revision 1.8
diff -u -r1.8 RuntimeBasedGeneratorConfiguration.java
--- src/org/eclipse/gmf/tests/setup/RuntimeBasedGeneratorConfiguration.java	15 Jun 2006 08:36:08 -0000	1.8
+++ src/org/eclipse/gmf/tests/setup/RuntimeBasedGeneratorConfiguration.java	19 Jun 2006 14:35:17 -0000
@@ -52,6 +52,7 @@
 import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
 import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer;
+import org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
@@ -67,6 +68,9 @@
 import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tests.EPath;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.osgi.framework.Bundle;
@@ -211,6 +215,14 @@
 			}
 			return null;
 		}
+		
+		public RGB getDefaultLinkColor() {
+			return PreferenceConverter.getColor(getDefaultPreferences(), IPreferenceConstants.PREF_LINE_COLOR);
+		}
+		
+		private IPreferenceStore getDefaultPreferences() {
+			return (IPreferenceStore) PreferencesHint.USE_DEFAULTS.getPreferenceStore();
+		}
 
 		protected final Class loadGeneratedClass(String qualifiedClassName) throws ClassNotFoundException {
 			return myGenProject.loadClass(qualifiedClassName);
@@ -244,15 +256,8 @@
 			return null;
 		}
 	}
-
-	private static final class FakeViewer extends NoUpdateViewer implements IDiagramGraphicalViewer{
-		private FakeViewer() {
-			/*
-			 * When extends DiagramGraphicalViewer, don't forget to 
-			 * super.hookWorkspacePreferenceStore(new PreferenceStore());
-			 */
-		}
-		
+	
+	protected static abstract class FakeViewerBase extends NoUpdateViewer {
 		protected void createDefaultRoot() {
 			// Important for MapModeUtil.getMapMode() method implementation.
 			setRootEditPart(new ScalableRootEditPart() {
@@ -294,6 +299,15 @@
 			extLabelsLayer.setLayoutManager(new DelegatingLayout());
 			printableLayers.addLayerAfter(extLabelsLayer, "External Node Labels", LayerConstants.PRIMARY_LAYER);
 		}
+	}
+
+	private static final class FakeViewer extends FakeViewerBase implements IDiagramGraphicalViewer{
+		private FakeViewer() {
+			/*
+			 * When extends DiagramGraphicalViewer, don't forget to 
+			 * super.hookWorkspacePreferenceStore(new PreferenceStore());
+			 */
+		}
 
 		public void setContents(Object contents) {
 			GraphicalEditPart epart = (GraphicalEditPart)getEditPartFactory().createEditPart(null, contents);
#P org.eclipse.gmf.tests.lite
Index: src/org/eclipse/gmf/tests/lite/gen/LiteGeneratorConfiguration.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests.lite/src/org/eclipse/gmf/tests/lite/gen/LiteGeneratorConfiguration.java,v
retrieving revision 1.3
diff -u -r1.3 LiteGeneratorConfiguration.java
--- src/org/eclipse/gmf/tests/lite/gen/LiteGeneratorConfiguration.java	31 May 2006 15:54:58 -0000	1.3
+++ src/org/eclipse/gmf/tests/lite/gen/LiteGeneratorConfiguration.java	19 Jun 2006 14:35:18 -0000
@@ -42,10 +42,10 @@
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.gmf.tests.EPath;
-import org.eclipse.gmf.tests.setup.RuntimeBasedGeneratorConfiguration;
 import org.eclipse.gmf.tests.setup.GeneratorConfiguration;
-import org.eclipse.gmf.tests.setup.NoUpdateViewer;
+import org.eclipse.gmf.tests.setup.RuntimeBasedGeneratorConfiguration;
 import org.eclipse.gmf.tests.setup.SessionSetup;
+import org.eclipse.swt.graphics.RGB;
 
 
 public class LiteGeneratorConfiguration extends RuntimeBasedGeneratorConfiguration {
@@ -62,6 +62,8 @@
 	}
 
 	private static class LiteViewerConfiguration extends RuntimeBasedGeneratorConfiguration.DefaultViewerConfiguration {
+		private RGB myDefaultLinkColor; 
+		
 		public LiteViewerConfiguration(SessionSetup sessionSetup, EditPartViewer viewer) throws Exception {
 			super(sessionSetup, viewer);
 		}
@@ -180,6 +182,13 @@
 				}
 			});
 		}
+		
+		public RGB getDefaultLinkColor() {
+			if (myDefaultLinkColor == null){
+				myDefaultLinkColor = new RGB(0, 0, 0);
+			}
+			return myDefaultLinkColor;
+		}
 
 		protected TransactionalEditingDomain getEditDomain(EditPart editPart) {
 			return TransactionUtil.getEditingDomain(editPart.getModel());
@@ -189,7 +198,8 @@
 		}
 	}
 
-	private static class FakeLiteViewer extends NoUpdateViewer {
+	private static class FakeLiteViewer extends FakeViewerBase {
+		//that is
 	}
 
 	private static class WrappingCommand extends Command {