Attachment 42856 Details for Bug 144203 – Fixes the subj

[patch] Fixes the subj

patch_144203.txt (text/plain), 7.00 KB, created by Michael Golubev

on 2006-05-29 08:26:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Golubev

Created: 2006-05-29 08:26:34 EDT

Size: 7.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.tests
>Index: src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java,v
>retrieving revision 1.8
>diff -u -r1.8 CodegenReconcileTest.java
>--- src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java	25 May 2006 16:36:49 -0000	1.8
>+++ src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java	29 May 2006 12:27:59 -0000
>@@ -345,6 +345,36 @@
> 		checkUserChange(new UserChangeImpl(true));
> 	}
> 	
>+	public void testReconcileGenEditorGenerator_ModelId() throws Exception {
>+		class ModelIdChange extends Assert implements UserChange {
>+			private final String myUserModelID;
>+			private String myExpectedModelIdBefore;
>+			
>+			public ModelIdChange(String userModelId){
>+				myUserModelID = userModelId;
>+			}
>+			
>+			public void applyChanges(GenEditorGenerator old) {
>+				old.setModelID(myUserModelID);
>+				myExpectedModelIdBefore = old.getModelID(); //may be different
>+			}
>+			
>+			public void assertChangesPreserved(GenEditorGenerator current) {
>+				assertEquals(myExpectedModelIdBefore, current.getModelID());
>+			}
>+			
>+			public ReconcilerConfigBase getReconcilerConfig() {
>+				return new GMFGenConfig();
>+			}
>+		}
>+		
>+		checkUserChange(new ModelIdChange("ABC"));
>+		checkUserChange(new ModelIdChange("ABC   "));
>+		checkUserChange(new ModelIdChange(""));
>+		checkUserChange(new ModelIdChange(" "));
>+		checkUserChange(new ModelIdChange(null));
>+	}
>+	
> 	private void checkUserChange(UserChange userChange){
> 		GenEditorGenerator old = createCopy();
> 		GenEditorGenerator current = createCopy();
>Index: src/org/eclipse/gmf/tests/gen/HandcodedImplTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/HandcodedImplTest.java,v
>retrieving revision 1.41
>diff -u -r1.41 HandcodedImplTest.java
>--- src/org/eclipse/gmf/tests/gen/HandcodedImplTest.java	9 May 2006 12:41:23 -0000	1.41
>+++ src/org/eclipse/gmf/tests/gen/HandcodedImplTest.java	29 May 2006 12:27:59 -0000
>@@ -20,6 +20,8 @@
> import java.util.Set;
> 
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
>+import org.eclipse.emf.codegen.ecore.genmodel.GenModelFactory;
> import org.eclipse.emf.ecore.EAttribute;
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EOperation;
>@@ -109,6 +111,29 @@
> 		assertFalse("".equals(generator.getDiagramFileExtension()));
> 	}
> 	
>+	public void testGenEditorGenerator_ModelId(){
>+		GenEditorGenerator generator = GMFGenFactory.eINSTANCE.createGenEditorGenerator();
>+		assertNotNull(generator.getModelID());
>+		assertFalse(generator.getModelID().trim().length() == 0);
>+
>+		generator.setModelID("");
>+		assertNotNull(generator.getModelID());
>+		assertFalse(generator.getModelID().trim().length() == 0);
>+	
>+		generator.setModelID(" ");
>+		assertNotNull(generator.getModelID());
>+		assertFalse(generator.getModelID().trim().length() == 0);
>+		
>+		generator.setModelID("ABC");
>+		assertEquals("ABC", generator.getModelID());
>+		
>+		generator = GMFGenFactory.eINSTANCE.createGenEditorGenerator();
>+		GenModel mockGenModel = GenModelFactory.eINSTANCE.createGenModel();
>+		mockGenModel.setModelName("CBA");
>+		generator.setDomainGenModel(mockGenModel);
>+		assertEquals("CBA", generator.getModelID());
>+	}
>+	
> 	public void testGenPlugin_RequiredPluginIds(){
> 		final String BUNDLE_EXPRESSIONS = "com.mycompany.expressions";
> 		final String[] BUNDLE_VIEWMAPS_MANY = {"com.mycompany.viewmapsA", "com.mycompany.viewmapsB"};
>#P org.eclipse.gmf.codegen
>Index: src/org/eclipse/gmf/codegen/gmfgen/impl/GenEditorGeneratorImpl.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GenEditorGeneratorImpl.java,v
>retrieving revision 1.13
>diff -u -r1.13 GenEditorGeneratorImpl.java
>--- src/org/eclipse/gmf/codegen/gmfgen/impl/GenEditorGeneratorImpl.java	26 May 2006 14:16:24 -0000	1.13
>+++ src/org/eclipse/gmf/codegen/gmfgen/impl/GenEditorGeneratorImpl.java	29 May 2006 12:28:01 -0000
>@@ -609,10 +609,13 @@
> 		return modelID;
> 	}
> 
>+	/**
>+	 * @generated NOT
>+	 */
> 	public String getModelID() {
> 		String value = getModelIDGen();
> 		if (value == null || value.trim().length() == 0) {
>-			return getDomainGenModel() == null ? "Design" : getDomainGenModel().getModelName();
>+			value = getDomainGenModel() == null ? "Design" : getDomainGenModel().getModelName();
> 		}
> 		return value;
> 	}
>#P org.eclipse.gmf.bridge
>Index: src/org/eclipse/gmf/bridge/genmodel/DiagramGenModelTransformer.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.bridge/src/org/eclipse/gmf/bridge/genmodel/DiagramGenModelTransformer.java,v
>retrieving revision 1.88
>diff -u -r1.88 DiagramGenModelTransformer.java
>--- src/org/eclipse/gmf/bridge/genmodel/DiagramGenModelTransformer.java	26 May 2006 14:16:26 -0000	1.88
>+++ src/org/eclipse/gmf/bridge/genmodel/DiagramGenModelTransformer.java	29 May 2006 12:28:02 -0000
>@@ -209,9 +209,6 @@
> 		}
> 		GenPackage primaryPackage = findGenPackage(mapping.getDomainModel());
> 		getGenEssence().setDomainGenModel(primaryPackage == null ? null : primaryPackage.getGenModel());
>-		if (getGenEssence().getDomainGenModel() != null) {
>-			getGenEssence().setModelID(getGenEssence().getDomainGenModel().getModelName());
>-		}
> 		getGenDiagram().setDomainDiagramElement(findGenClass(mapping.getDomainMetaElement()));
> 		getGenDiagram().setDiagramRunTimeClass(findRunTimeClass(mapping));
> 		getGenDiagram().setVisualID(myVisualIDs.get(getGenDiagram()));
>#P org.eclipse.gmf.codegen.ui
>Index: src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.ui/src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java,v
>retrieving revision 1.8
>diff -u -r1.8 GMFGenConfig.java
>--- src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java	25 May 2006 10:46:06 -0000	1.8
>+++ src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java	29 May 2006 12:28:03 -0000
>@@ -35,6 +35,7 @@
> 		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_PackageNamePrefix());
> 		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_DiagramFileExtension());
> 		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_SameFileForDiagramAndModel());
>+		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_ModelID());
> 		
> 		setMatcher(GMFGEN.getGenPlugin(), ALWAYS_MATCH); //exactly one feature for ALWAYS_MATCH GenEditorGenerator
> 		preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_ID());

Actions: View | Diff

Attachments on bug 144203: 42856