Attachment 215573 Details for Bug 379273 – Build JPA Diagram Editor against the Juno version of Graphiti

[patch] Build JPA Diagram Editor against the Juno version of Graphiti

BuildJPADiagramAgainstLatestGraphitiVersion.txt (text/plain), 22.06 KB, created by Petya Sabeva

on 2012-05-14 11:04:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Petya Sabeva

Created: 2012-05-14 11:04:47 EDT

Size: 22.06 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jpt.jpadiagrameditor.ui
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java,v
>retrieving revision 1.6
>diff -u -r1.6 JPADiagramEditor.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java	29 Mar 2012 12:03:25 -0000	1.6
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java	14 May 2012 15:02:14 -0000
>@@ -24,6 +24,7 @@
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Status;
>+import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.transaction.RecordingCommand;
> import org.eclipse.emf.transaction.TransactionalEditingDomain;
> import org.eclipse.emf.transaction.util.TransactionUtil;
>@@ -193,7 +194,7 @@
> 	protected ContextMenuProvider createContextMenuProvider() {
> 		return new JPAEditorContextMenuProvider(getGraphicalViewer(),
> 				getActionRegistry(),
>-				getConfigurationProvider());
>+				getDiagramTypeProvider());
> 	}
> 
> 	private void initWithFileEditorInput(final IEditorSite site,
>@@ -218,15 +219,12 @@
> 					JPAEditorConstants.OPEN_WHOLE_PERSISTENCE_UNIT_EDITOR_PROPERTY,
> 					inputJptType.getName());
> 			PersistenceUnit persistenceUnit = inputJptType.getPersistenceUnit();
>-			String diagramURI = ModelIntegrationUtil.createDiagramPath(persistenceUnit).toString();
>-			TransactionalEditingDomain defaultTransEditDomain = (TransactionalEditingDomain)inputJptType.
>-								getJpaProject().getProject().getAdapter(TransactionalEditingDomain.class);
>+			String diagramURIAsString = ModelIntegrationUtil.createDiagramPath(persistenceUnit).toString();
>+			URI diagramURI = URI.createFileURI(diagramURIAsString);
> 			diagram = ModelIntegrationUtil.createDiagram(persistenceUnit, 10, true);
> 			JPADiagramEditorInput diagramInput = new JPADiagramEditorInput(diagram,
>-																		   diagramURI, 
>-																		   defaultTransEditDomain, 
>-																		   JPAEditorDiagramTypeProvider.ID, 
>-																		   false);
>+																		   diagramURI,
>+																		   JPAEditorDiagramTypeProvider.ID);
> 			//ModelIntegrationUtil.mapDiagramToProject(diagram, persistenceUnit
> 			//		.getJpaProject());
> 			super.init(site, diagramInput);
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java,v
>retrieving revision 1.6
>diff -u -r1.6 AddAllEntitiesFeature.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java	26 Mar 2012 13:54:58 -0000	1.6
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java	14 May 2012 15:02:14 -0000
>@@ -30,10 +30,12 @@
> import org.eclipse.graphiti.features.context.impl.AddContext;
> import org.eclipse.graphiti.features.context.impl.CustomContext;
> import org.eclipse.graphiti.features.custom.AbstractCustomFeature;
>+import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
> import org.eclipse.graphiti.mm.pictograms.ContainerShape;
> import org.eclipse.graphiti.mm.pictograms.Diagram;
> import org.eclipse.graphiti.mm.pictograms.PictogramElement;
> import org.eclipse.graphiti.mm.pictograms.Shape;
>+import org.eclipse.graphiti.services.Graphiti;
> import org.eclipse.jpt.jpa.core.JpaProject;
> import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
> import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
>@@ -85,7 +87,9 @@
> 									DIST_FROM_EDGE_V : 
> 									DIST_V));
> 		}
>-		IDimension dim = getFeatureProvider().getDiagramTypeProvider().getDiagramEditor().getCurrentSize();
>+		
>+		GraphicsAlgorithm graphicsAlgorithm = getFeatureProvider().getDiagramTypeProvider().getDiagram().getGraphicsAlgorithm();
>+		IDimension dim = Graphiti.getGaService().calculateSize(graphicsAlgorithm);
> 		int dWidth = dim.getWidth();
> 		numInARow = (dWidth - DIST_FROM_EDGE_H - 20 + JPAEditorConstants.ENTITY_WIDTH)/(JPAEditorConstants.ENTITY_WIDTH + DIST_H);
> 		numInARow = (numInARow > 0) ? numInARow : 1;
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java,v
>retrieving revision 1.9
>diff -u -r1.9 AddJPAEntityFeature.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java	26 Mar 2012 13:54:58 -0000	1.9
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java	14 May 2012 15:02:15 -0000
>@@ -27,6 +27,7 @@
> import org.eclipse.graphiti.mm.algorithms.Rectangle;
> import org.eclipse.graphiti.mm.algorithms.RoundedRectangle;
> import org.eclipse.graphiti.mm.algorithms.Text;
>+import org.eclipse.graphiti.mm.algorithms.styles.Font;
> import org.eclipse.graphiti.mm.algorithms.styles.LineStyle;
> import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
> import org.eclipse.graphiti.mm.pictograms.ContainerShape;
>@@ -34,6 +35,8 @@
> import org.eclipse.graphiti.mm.pictograms.PictogramElement;
> import org.eclipse.graphiti.mm.pictograms.Shape;
> import org.eclipse.graphiti.services.Graphiti;
>+import org.eclipse.graphiti.services.IGaService;
>+import org.eclipse.graphiti.ui.services.GraphitiUi;
> import org.eclipse.graphiti.util.IColorConstant;
> import org.eclipse.jdt.core.ICompilationUnit;
> import org.eclipse.jdt.core.JavaModelException;
>@@ -246,9 +249,9 @@
> 			Rectangle rect) {
> 		IJPAEditorFeatureProvider fp = getFeatureProvider();
> 		Text text = UpdateAttributeFeature.addText(fp, rect, attribTxt);
>-		text.getFont().setSize(7);
>-		text.getFont().setItalic(true);
>-		text.getFont().setBold(false);
>+		Font font = GraphitiUi.getGaService().manageFont(getDiagram(),
>+				IGaService.DEFAULT_FONT, 7, true, false);
>+		text.setFont(font);
> 		Graphiti.getGaService().setWidth(text, width);
> 		Graphiti.getGaService().setLocationAndSize(text, 0, 2, width,
> 				13);
>@@ -383,15 +386,12 @@
> 		} catch (JavaModelException e) { 
> 			JPADiagramEditorPlugin.logError("Cannot check compilation unit for unsaved changes", e);  //$NON-NLS-1$		 
> 		}
>-		Text headerTextObj = Graphiti.getGaService().createDefaultText(getDiagram(), headerRect,
>-				headerTextString);
>-		headerTextObj
>-				.setForeground(manageColor(JPAEditorConstants.ENTITY_TEXT_FOREGROUND));
>+		Text headerTextObj = Graphiti.getGaService().createText(getDiagram(), headerRect,
>+				headerTextString, IGaService.DEFAULT_FONT, IGaService.DEFAULT_FONT_SIZE, false, true);
>+		headerTextObj.setForeground(manageColor(JPAEditorConstants.ENTITY_TEXT_FOREGROUND));
> 		headerTextObj.setHorizontalAlignment(Orientation.ALIGNMENT_LEFT);
> 		headerTextObj.setVerticalAlignment(Orientation.ALIGNMENT_TOP);
>-		headerTextObj.getFont().setBold(true);
>-		Graphiti.getGaService().setLocationAndSize(headerTextObj, 1, 2,
>-				width, 20);
>+		Graphiti.getGaService().setLocationAndSize(headerTextObj, 1, 2,	width, 20);
> 
> 		return entityHeaderTextShape;
> 
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java,v
>retrieving revision 1.3
>diff -u -r1.3 UpdateAttributeFeature.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java	26 Mar 2012 13:54:58 -0000	1.3
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/UpdateAttributeFeature.java	14 May 2012 15:02:15 -0000
>@@ -29,8 +29,10 @@
> import org.eclipse.graphiti.mm.algorithms.styles.Orientation;
> import org.eclipse.graphiti.mm.pictograms.AnchorContainer;
> import org.eclipse.graphiti.mm.pictograms.ContainerShape;
>+import org.eclipse.graphiti.mm.pictograms.Diagram;
> import org.eclipse.graphiti.mm.pictograms.Shape;
> import org.eclipse.graphiti.services.Graphiti;
>+import org.eclipse.graphiti.services.IGaService;
> import org.eclipse.graphiti.util.IColorConstant;
> import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
> import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
>@@ -93,13 +95,13 @@
> 	}
> 
> 	public static Text addText(IFeatureProvider fp, Rectangle textRectangle, String txt) {
>-		Text text = Graphiti.getGaService().createDefaultText(fp.getDiagramTypeProvider().getDiagram(), textRectangle, txt);
>-		Color color = Graphiti.getGaService().manageColor(fp.getDiagramTypeProvider().getDiagram(),
>-				JPAEditorConstants.ENTITY_TEXT_FOREGROUND);
>+		Diagram diagram = fp.getDiagramTypeProvider().getDiagram();
>+		Text text = Graphiti.getGaService().createText(diagram, textRectangle, txt, IGaService.DEFAULT_FONT,
>+				IGaService.DEFAULT_FONT_SIZE, false, true);
>+		Color color = Graphiti.getGaService().manageColor(diagram, JPAEditorConstants.ENTITY_TEXT_FOREGROUND);
> 		text.setForeground(color);
> 		text.setHorizontalAlignment(Orientation.ALIGNMENT_LEFT);
> 		text.setVerticalAlignment(Orientation.ALIGNMENT_TOP);
>-		text.getFont().setBold(true);
> 		return text;
> 	}
> 
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/JPADiagramEditorInput.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/JPADiagramEditorInput.java,v
>retrieving revision 1.3
>diff -u -r1.3 JPADiagramEditorInput.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/JPADiagramEditorInput.java	15 Jul 2011 12:33:06 -0000	1.3
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/JPADiagramEditorInput.java	14 May 2012 15:02:15 -0000
>@@ -38,26 +38,12 @@
> 	
> 	private Diagram diagram;
> 	private String projectName;
>-	
>-
>-	public JPADiagramEditorInput(Diagram diagram, 
>-								 String diagramUriString, 
>-								 TransactionalEditingDomain domain, 
>-								 String providerId, 
>-								 boolean disposeEditingDomain) {
>-		
>-		super(diagramUriString, domain, providerId, disposeEditingDomain);
>-		this.diagram = diagram; 
>-		this.projectName = ModelIntegrationUtil.getProjectByDiagram(diagram.getName()).getName();		
>-	}
> 
> 	public JPADiagramEditorInput(Diagram diagram,
>-								 URI diagramUri, 
>-								 TransactionalEditingDomain domain, 
>-								 String providerId, 
>-								 boolean disposeEditingDomain) {
>+								 URI diagramUri,
>+								 String providerId) {
> 		
>-		super(diagramUri, domain, providerId, disposeEditingDomain);
>+		super(diagramUri, providerId);
> 		this.diagram = diagram;
> 		this.projectName = ModelIntegrationUtil.getProjectByDiagram(diagram.getName()).getName();
> 	}
>@@ -122,8 +108,7 @@
> 		return diagram;
> 	}	
> 	
>-	public static JPADiagramEditorInput createEditorInput(Diagram diagram, TransactionalEditingDomain domain, String providerId,
>-			boolean disposeEditingDomain) {
>+	public static JPADiagramEditorInput createEditorInput(Diagram diagram, String providerId) {
> 		final Resource resource = diagram.eResource();
> 		if (resource == null) {
> 			throw new IllegalArgumentException();
>@@ -131,7 +116,7 @@
> 		final String fragment = resource.getURIFragment(diagram);
> 		final URI fragmentUri = resource.getURI().appendFragment(fragment);
> 		JPADiagramEditorInput diagramEditorInput;
>-		diagramEditorInput = new JPADiagramEditorInput(diagram, fragmentUri, domain, providerId, disposeEditingDomain);
>+		diagramEditorInput = new JPADiagramEditorInput(diagram, fragmentUri, providerId);
> 		return diagramEditorInput;
> 	}
> 	
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java,v
>retrieving revision 1.5
>diff -u -r1.5 OpenJpaDiagramActionDelegate.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java	26 Mar 2012 14:35:23 -0000	1.5
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java	14 May 2012 15:02:15 -0000
>@@ -105,8 +105,7 @@
> 									   0);
> 		}
> 		
>-		TransactionalEditingDomain defaultTransEditDomain = TransactionUtil.getEditingDomain((diagram.eResource().getResourceSet())); 
>-		final JPADiagramEditorInput diagramEditorInput = JPADiagramEditorInput.createEditorInput(diagram, defaultTransEditDomain, JPAEditorDiagramTypeProvider.ID, false); 
>+		final JPADiagramEditorInput diagramEditorInput = JPADiagramEditorInput.createEditorInput(diagram, JPAEditorDiagramTypeProvider.ID); 
> 		IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
> 		final IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
> 		final Wrp wrp = new Wrp();
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java,v
>retrieving revision 1.11
>diff -u -r1.11 ModelIntegrationUtil.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java	26 Mar 2012 13:54:59 -0000	1.11
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/util/ModelIntegrationUtil.java	14 May 2012 15:02:15 -0000
>@@ -47,7 +47,7 @@
> import org.eclipse.emf.transaction.util.TransactionUtil;
> import org.eclipse.graphiti.mm.pictograms.Diagram;
> import org.eclipse.graphiti.services.Graphiti;
>-import org.eclipse.graphiti.ui.editor.DiagramEditorFactory;
>+import org.eclipse.graphiti.ui.services.GraphitiUi;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jpt.jpa.core.JpaProject;
> import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
>@@ -185,7 +185,7 @@
> 		Diagram diagram = getDiagramByProject(project);
> 		if (diagram != null)
> 			return diagram;
>-		TransactionalEditingDomain defaultTransEditDomain = DiagramEditorFactory.createResourceSetAndEditingDomain();
>+		TransactionalEditingDomain defaultTransEditDomain = GraphitiUi.getEmfService().createResourceSetAndEditingDomain();
> 		ResourceSet resourceSet = defaultTransEditDomain.getResourceSet();
> 
> 		String pathName = diagramFileName.toString();
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorContextMenuProvider.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorContextMenuProvider.java,v
>retrieving revision 1.1
>diff -u -r1.1 JPAEditorContextMenuProvider.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorContextMenuProvider.java	28 Feb 2011 10:34:30 -0000	1.1
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorContextMenuProvider.java	14 May 2012 15:02:15 -0000
>@@ -17,8 +17,8 @@
> 
> import org.eclipse.gef.EditPartViewer;
> import org.eclipse.gef.ui.actions.ActionRegistry;
>+import org.eclipse.graphiti.dt.IDiagramTypeProvider;
> import org.eclipse.graphiti.ui.editor.DiagramEditorContextMenuProvider;
>-import org.eclipse.graphiti.ui.internal.config.IConfigurationProvider;
> import org.eclipse.jface.action.IMenuManager;
> import org.eclipse.swt.graphics.Point;
> 
>@@ -26,8 +26,8 @@
> public class JPAEditorContextMenuProvider extends DiagramEditorContextMenuProvider {
> 	public JPAEditorContextMenuProvider(EditPartViewer viewer, 
> 										ActionRegistry registry, 
>-										IConfigurationProvider configurationProvider) {
>-		super(viewer, registry, configurationProvider);
>+										IDiagramTypeProvider diagramTypeProvider) {
>+		super(viewer, registry, diagramTypeProvider);
> 	}
> 		
> 
>#P org.eclipse.jpt.jpadiagrameditor.ui.tests
>Index: src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddJPAEntityFeatureTest.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddJPAEntityFeatureTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 AddJPAEntityFeatureTest.java
>--- src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddJPAEntityFeatureTest.java	4 May 2011 14:07:19 -0000	1.2
>+++ src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddJPAEntityFeatureTest.java	14 May 2012 15:02:18 -0000
>@@ -34,6 +34,8 @@
> import org.eclipse.graphiti.mm.pictograms.Diagram;
> import org.eclipse.graphiti.mm.pictograms.PictogramsPackage;
> import org.eclipse.graphiti.mm.pictograms.Shape;
>+import org.eclipse.graphiti.services.Graphiti;
>+import org.eclipse.graphiti.services.IGaService;
> import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.UpdateAttributeFeature;
> import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider;
> import org.junit.Before;
>@@ -42,7 +44,9 @@
> public class AddJPAEntityFeatureTest {
> 	
> 	private IJPAEditorFeatureProvider featureProvider;
>+	private Diagram diagram;
> 	
>+	public static IGaService gas = Graphiti.getGaService();
> 	
> 	@Before
> 	public void setUp() throws Exception {
>@@ -52,44 +56,30 @@
> 		IDiagramTypeProvider idp = EasyMock.createMock(IDiagramTypeProvider.class);
> 		expect(featureProvider.getDiagramTypeProvider()).andStubReturn(idp);
> 		expect(featureProvider.increaseAttribsNum((Shape) EasyMock.anyObject())).andStubReturn(1);
>-		Diagram d = EasyMock.createMock(Diagram.class);
>-		expect(idp.getDiagram()).andStubReturn(d);
>+		diagram = EasyMock.createMock(Diagram.class);
>+		expect(idp.getDiagram()).andStubReturn(diagram);
> 		Color c = EasyMock.createMock(Color.class);
> 		expect(c.getBlue()).andStubReturn(0);
> 		expect(c.getRed()).andStubReturn(0);
> 		expect(c.getGreen()).andStubReturn(0);
> 		EList<Color> col = new BasicInternalEList<Color>(Color.class);
>-		expect(d.getColors()).andStubReturn(col);
>-		Color c1 = EasyMock.createMock(Color.class);
>-		c1.setRed(EasyMock.anyInt());
>-		EasyMock.expectLastCall().asStub();
>-		c1.setGreen(EasyMock.anyInt());
>-		EasyMock.expectLastCall().asStub();
>-		c1.setBlue(EasyMock.anyInt());
>-		EasyMock.expectLastCall().asStub();
>+		expect(diagram.getColors()).andStubReturn(col);
> 		EList<Font> fonts = new BasicInternalEList<Font>(Font.class);
>-		expect(d.getFonts()).andStubReturn(fonts);
>-		replay(d, c, c1, idp, featureProvider);
>+		expect(diagram.getFonts()).andStubReturn(fonts);
>+		replay(diagram, c, idp, featureProvider);
> 	}
> 	
> 
> 	@Test
> 	public void testAddText() {
>-		Font f = EasyMock.createMock(Font.class); 
> 		Text t = EasyMock.createMock(Text.class);
>+		
>+		Font f = gas.manageFont(diagram, "Arial", IGaService.DEFAULT_FONT_SIZE, true, false); 
> 		t.setFont(f);
> 		EasyMock.expectLastCall().asStub();
> 		expect(t.getX()).andStubReturn(0);
> 		expect(t.getY()).andStubReturn(0);
> 		
>-		f.setName("Arial");
>-		EasyMock.expectLastCall().asStub();
>-		f.setSize(EasyMock.anyInt());
>-		EasyMock.expectLastCall().asStub();		
>-		f.setItalic(EasyMock.anyBoolean());
>-		EasyMock.expectLastCall().asStub();	
>-		f.setBold(EasyMock.anyBoolean());
>-		EasyMock.expectLastCall().asStub();
> 		t.setWidth(EasyMock.anyInt());	
> 		EasyMock.expectLastCall().asStub();
> 		t.setHeight(EasyMock.anyInt());
>@@ -104,16 +94,14 @@
> 		t.setVerticalAlignment(Orientation.ALIGNMENT_TOP);
> 		EasyMock.expectLastCall().asStub();
> 		
>-		Font f1 = EasyMock.createMock(Font.class);
>-		f1.setBold(true);
>-		EasyMock.expectLastCall().asStub();
>+		Font f1 = gas.manageFont(diagram, IGaService.DEFAULT_FONT, IGaService.DEFAULT_FONT_SIZE, false, true);
> 		expect(t.getFont()).andStubReturn(f1);
> 		
> 		Rectangle textRectangle = EasyMock.createMock(Rectangle.class);
> 		EList<GraphicsAlgorithm> lst = new BasicInternalEList<GraphicsAlgorithm>(GraphicsAlgorithm.class);
> 		expect(textRectangle.getGraphicsAlgorithmChildren()).andStubReturn(lst);
> 		
>-		replay(f1, f, t, textRectangle);
>+		replay(t, textRectangle);
> 		UpdateAttributeFeature.addText(featureProvider, textRectangle, "abc");
> 	}
> 	
>@@ -253,16 +241,7 @@
> 		EasyMock.expectLastCall().asStub();
> 		t.setValue("");
> 		EasyMock.expectLastCall().asStub();
>-		Font f = EasyMock.createMock(Font.class);
>-		f.setName((String) EasyMock.anyObject());
>-		EasyMock.expectLastCall().asStub();
>-		
>-		f.setSize(EasyMock.anyInt());
>-		EasyMock.expectLastCall().asStub();
>-		f.setItalic(EasyMock.anyBoolean());
>-		EasyMock.expectLastCall().asStub();
>-		f.setBold(EasyMock.anyBoolean());
>-		EasyMock.expectLastCall().asStub();
>+		Font f = gas.manageFont(diagram, IGaService.DEFAULT_FONT, IGaService.DEFAULT_FONT_SIZE, false, true);
> 		expect(t.getFont()).andStubReturn(f);
> 		t.setFont((Font) EasyMock.anyObject());
> 		EasyMock.expectLastCall().asStub();
>@@ -270,8 +249,7 @@
> 		t.setForeground((Color) EasyMock.anyObject());
> 		t.setHorizontalAlignment(Orientation.ALIGNMENT_LEFT);
> 		t.setVerticalAlignment(Orientation.ALIGNMENT_TOP);
>-		f.setBold(true);
>-		replay(rect, ga, img, cs, cs1, p, pr, t, f);
>+		replay(rect, ga, img, cs, cs1, p, pr, t);
> 	}
> 	
> }

Actions: View | Diff

Attachments on bug 379273: 215573 | 216174