Attachment #36070 for bug #131355




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import org.eclipse.emf.ecore.EClass;

public interface ReconcilerConfig {
	Matcher getMatcher(EClass eClass); 
	DecisionMaker[] getDecisionMakers(EClass eClass);
}

Added Link Here

(-)build.properties (+4 lines)
1	source.. = src/
2	output.. = bin/
3	bin.includes = META-INF/,\
4	.




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import java.util.regex.Pattern;

import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EcorePackage;

public class StringPatternDecisionMaker extends DecisionMaker {
	private Pattern myPattern;
	
	public StringPatternDecisionMaker(String valuePattern, EAttribute attribute){
		this(Pattern.compile(valuePattern), attribute);
	}
	
	public StringPatternDecisionMaker(Pattern valuePattern, EAttribute attribute){
		super(attribute);
		if (attribute.getEAttributeType() != EcorePackage.eINSTANCE.getEString()){
			throw new IllegalArgumentException("Expected string attribute");
		}
		if (attribute.getUpperBound() != 1){
			throw new IllegalArgumentException("Expected multiplicity [0..1] or [1]");
		}
		myPattern = valuePattern;
	}
	
	public Decision makeDecision(EObject current, EObject old) {
		String oldValue = (String)old.eGet(getFeature());
		if (oldValue != null && !myPattern.matcher(oldValue).matches()){
			return Decision.PRESERVE_OLD;
		} else {
			return Decision.ACCEPT_NEW;
		}
	}

}




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import java.text.MessageFormat;

import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;

public class AttributeMatcher implements Matcher {
	private final String myFeatureName;
	private EClass myCachedFeatureOwner;
	private EStructuralFeature myCachedFeature;

	public AttributeMatcher(String featureName){
		myFeatureName = featureName;
	}
	
	public AttributeMatcher(EStructuralFeature feature){
		this(feature.getName());
	}
	
	public boolean match(EObject current, EObject old) {
		assertCompatible(current, old);
		EStructuralFeature feature = findFeature(current.eClass());
		return safeEquals(current.eGet(feature), old.eGet(feature));
	}
	
	private void assertCompatible(EObject current, EObject old){
		if (!current.eClass().equals(old.eClass())){
			throw new IllegalStateException(MessageFormat.format("Objects not compatible: {0}, {1}", new Object[] {current, old}));
		}
	}
	
	private EStructuralFeature findFeature(EClass eClass){
		if (!eClass.equals(myCachedFeatureOwner)){
			EStructuralFeature result = eClass.getEStructuralFeature(myFeatureName);
			if (result == null){
				throw new IllegalStateException(MessageFormat.format("Unknown feature {0} in EClass {1}", new Object[] {myFeatureName, eClass}));
			}
			myCachedFeatureOwner = eClass;
			myCachedFeature = result;
		}
		return myCachedFeature;
	}
	
	private boolean safeEquals(Object first, Object second){
		return first == null ? second == null : first.equals(second);
	}

}




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import java.text.MessageFormat;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;

import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EReference;

public class ReconcilerConfigBase implements ReconcilerConfig {
	private static final EClassRecord EMPTY_RECORD = new EClassRecord();
	private final HashMap myEClass2Record;
	
	public ReconcilerConfigBase(){
		myEClass2Record = new HashMap();
	}
	
	public final Matcher getMatcher(EClass eClass) {
		return getRecord(eClass, false).getMatcher();
	}

	public final DecisionMaker[] getDecisionMakers(EClass eClass) {
		return getRecord(eClass, false).getDecisionMakers();
	}
	
	protected final void setMatcher(EClass eClass, Matcher matcher){
		getRecord(eClass, true).setMatcher(matcher);
	}
	
	protected final void addDecisionMaker(EClass eClass, DecisionMaker decisionMaker){
		getRecord(eClass, true).addDecisionMaker(decisionMaker);
	}
	
	protected final void setMatcher(EClass eClass, EAttribute attribute){  
		checkStructuralFeature(eClass, attribute);
		Matcher matcher = new AttributeMatcher(attribute);
		setMatcher(eClass, matcher);
	}
	
	protected final void setMatcher(EClass eClass, EReference reference){
		if (eClass.getEPackage().equals(reference.eClass().getEPackage())){
			//XXX: use lazyly resolved matcher??? 
			setMatcher(eClass, new AttributeMatcher(reference));
		} else {
			setMatcher(eClass, new AttributeMatcher(reference));
		}
	}

	private EClassRecord getRecord(EClass eClass, boolean force){
		EClassRecord result = (EClassRecord) myEClass2Record.get(eClass);
		if (result == null){
			if (force){
				result = new EClassRecord();
				myEClass2Record.put(eClass, result);
			} else {
				result = EMPTY_RECORD;
			}
		}
		return result;
	}
	
	private void checkStructuralFeature(EClass expectedClass, EAttribute feature) {
		if (expectedClass.getEStructuralFeature(feature.getFeatureID()) != feature){
			throw new IllegalArgumentException(MessageFormat.format("Alien feature {0} for EClass {1}", new Object[] {feature, expectedClass}));
		}
	}

	private static class EClassRecord {
		private Matcher myMatcher = Matcher.FALSE; 
		private final List myDecisionMakers = new LinkedList();
		private DecisionMaker[] myMakersArray;
		
		public void addDecisionMaker(DecisionMaker maker){
			myDecisionMakers.add(maker);
			makersSetChanged();
		}
		
		public DecisionMaker[] getDecisionMakers(){
			if (myMakersArray == null){
				myMakersArray = (DecisionMaker[]) myDecisionMakers.toArray(new DecisionMaker[myDecisionMakers.size()]);
			}
			return myMakersArray;
		}
		
		public void setMatcher(Matcher matcher) {
			myMatcher = matcher;
		}
		
		public Matcher getMatcher() {
			return myMatcher;
		}
		
		private void makersSetChanged(){
			myMakersArray = null;
		}
	}

}




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>org.eclipse.gmf.codegen.reconciler</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.pde.ManifestBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.pde.SchemaBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.pde.PluginNature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>

Added Link Here

(-)META-INF/MANIFEST.MF (+11 lines)
1	Manifest-Version: 1.0
2	Bundle-ManifestVersion: 2
3	Bundle-Name: %pluginName
4	Bundle-SymbolicName: org.eclipse.gmf.codegen.reconciler
5	Bundle-Version: 1.0.0.version
6	Bundle-Vendor: %providerName
7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.emf.ecore,
9	org.eclipse.gmf.codegen
10	Export-Package: org.eclipse.gmf.codegen.reconciler,
11	org.eclipse.gmf.internal.codegen.reconciler




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;

public class DefaultDecisionMaker extends DecisionMaker {
	public DefaultDecisionMaker(EStructuralFeature feature){
		super(feature);
	}
	
	public Decision makeDecision(EObject current, EObject old) {
		assert current.eClass().equals(old.eClass());
		return (!current.eIsSet(getFeature()) && old.eIsSet(getFeature())) ? Decision.PRESERVE_OLD : Decision.ACCEPT_NEW;
	}

}




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import java.util.Collection;

import org.eclipse.emf.ecore.EObject;

public interface Matcher {
	public boolean match(EObject current, EObject old);
	
	public static final Matcher FALSE = new Matcher() {
		public boolean match(EObject current, EObject old) {
			return false;
		}
	};

	public static class OR implements Matcher {
		private final Matcher[] myMatchers;

		public OR(Matcher[] matchers){
			myMatchers = matchers;
		}
		
		public OR(Collection matchers){
			this((Matcher[])matchers.toArray(new Matcher[matchers.size()]));
		}
		
		public boolean match(EObject current, EObject old) {
			boolean result = false;
			for (int i = 0; !result && i < myMatchers.length; i++){
				result = myMatchers[i].match(current, old);
			}
			return result;
		}
	}

	public static class AND implements Matcher {
		private final Matcher[] myMatchers;

		public AND(Matcher[] matchers){
			myMatchers = matchers;
		}
		
		public AND(Collection matchers){
			this((Matcher[])matchers.toArray(new Matcher[matchers.size()]));
		}
		
		public boolean match(EObject current, EObject old) {
			boolean result = true;
			for (int i = 0; result && i < myMatchers.length; i++){
				result = myMatchers[i].match(current, old);
			}
			return result;
		}
	}

}




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import java.util.Collection;
import java.util.Iterator;

import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;

public class Reconciler {
	private final ReconcilerConfig myConfig;

	public Reconciler(ReconcilerConfig config){
		myConfig = config;
	}
	
	protected void handleNotMatchedCurrent(EObject current){
		//FIXME ??? Is it user escape -- check history ???
		//FIXME How to handle not macthed old ???
	}
	
	public void reconcileResource(Resource current, Resource old){
		reconcileContents(current.getContents(), old.getContents());
	}
	
	public void reconcileTree(EObject currentRoot, EObject oldRoot){
		reconcileVertex(currentRoot, oldRoot);
		reconcileContents(currentRoot.eContents(), oldRoot.eContents());
	}
	
	private void reconcileVertex(EObject current, EObject old){
		assert current.eClass().equals(old.eClass());
		DecisionMaker[] decisionMakers = myConfig.getDecisionMakers(current.eClass());
		for (int i = 0; i < decisionMakers.length; i++){
			DecisionMaker next = decisionMakers[i];
			Decision decision = next.makeDecision(current, old);
			decision.apply(current, old, next.getFeature());
		}
	}
	
	private void reconcileContents(Collection allCurrents, Collection allOlds){
		for (Iterator currentContents = allCurrents.iterator(); currentContents.hasNext();){
			EObject nextCurrent = (EObject) currentContents.next();
			EObject nextOld = findMatched(nextCurrent, allOlds);
			if (nextOld == null){
				handleNotMatchedCurrent(nextCurrent);
			} else {
				reconcileTree(nextCurrent, nextOld);
			}
		}
	}
	
	private EObject findMatched(EObject current, Collection allOld){
		EClass eClass = current.eClass();
		Matcher matcher = myConfig.getMatcher(eClass);
		EObject result = null;
		if (matcher != Matcher.FALSE){
			for (Iterator all = allOld.iterator(); result == null && all.hasNext();){
				EObject next = (EObject)all.next();
				if (eClass.equals(eClass) && matcher.match(current, next)){
					result = next;
				}
			}
		}
		return result;
	}

}

Added Link Here

(-)plugin.properties (+20 lines)
1	# <copyright>
2	# </copyright>
3	#
4	# $Id$
5
6	# ====================================================================
7	# To code developer:
8	# Do NOT change the properties between this line and the
9	# "%%% END OF TRANSLATED PROPERTIES %%%" line.
10	# Make a new property name, append to the end of the file and change
11	# the code to use the new property.
12	# ====================================================================
13
14	# ====================================================================
15	# %%% END OF TRANSLATED PROPERTIES %%%
16	# ====================================================================
17
18	pluginName = GMFGen Reconciler Plugin
19	providerName = Eclipse.org
20




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;

public abstract class DecisionMaker {
	private final EStructuralFeature myFeature;

	public abstract Decision makeDecision(EObject current, EObject old);
	
	public DecisionMaker(EStructuralFeature feature){
		myFeature = feature;
	}
	
	public final EStructuralFeature getFeature(){
		return myFeature;
	}
	
	public static class ALWAYS_OLD extends DecisionMaker {
		public ALWAYS_OLD(EStructuralFeature feature){
			super(feature);
		}
		
		public Decision makeDecision(EObject current, EObject old) {
			return Decision.PRESERVE_OLD;
		}
	}
	
	public static class ALWAYS_NEW extends DecisionMaker {
		public ALWAYS_NEW(EStructuralFeature feature){
			super(feature);
		}
		
		public Decision makeDecision(EObject current, EObject old) {
			return Decision.ACCEPT_NEW;
		}
	}
	
}




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;

public interface Decision {
	public void apply(EObject current, EObject old, EStructuralFeature feature);
	
	public static final Decision PRESERVE_OLD = new Decision(){
		public void apply(EObject current, EObject old, EStructuralFeature feature) {
			Object oldValue = old.eGet(feature, true);
			current.eSet(feature, oldValue);
		}
	};
	
	public static final Decision ACCEPT_NEW = new Decision(){
		public void apply(EObject current, EObject old, EStructuralFeature feature) {
			//do nothing
		}
	};
}




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.internal.codegen.reconciler;

import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
import org.eclipse.gmf.codegen.reconciler.DefaultDecisionMaker;
import org.eclipse.gmf.codegen.reconciler.Matcher;
import org.eclipse.gmf.codegen.reconciler.ReconcilerConfigBase;

public class GMFGenConfig extends ReconcilerConfigBase {
	private static final GMFGenPackage GMFGEN = GMFGenPackage.eINSTANCE;
	
	public GMFGenConfig(){
		setMatcher(GMFGEN.getGenEditorGenerator(), ALWAYS_MATCH);
		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_CopyrightText());
		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_PackageNamePrefix());
		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_DiagramFileExtension());
		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_SameFileForDiagramAndModel());
		
		setMatcher(GMFGEN.getGenPlugin(), ALWAYS_MATCH); //exactly one feature for ALWAYS_MATCH GenEditorGenerator
		preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_Provider());
		preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_Version());
	}
	
	private void preserveIfSet(EClass eClass, EAttribute feature){
		//FIXME: only attributes for now, allow references
		addDecisionMaker(eClass, new DefaultDecisionMaker(feature));
	}
	
	private static final Matcher ALWAYS_MATCH = new Matcher(){
		public boolean match(EObject current, EObject old) {
			return current.eClass().equals(old.eClass());
		}
	};
	
}

Added Link Here

(-).classpath (+7 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>
7	</classpath>




import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.eclipse.core.resources.IFile;

import org.eclipse.gmf.bridge.genmodel.GenModelAccess;
import org.eclipse.gmf.bridge.genmodel.SpecificDiagramRunTimeModelHelper;
import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
import org.eclipse.gmf.codegen.reconciler.Reconciler;
import org.eclipse.gmf.internal.bridge.naming.gen.GenModelNamingMediatorImpl;
import org.eclipse.gmf.internal.codegen.CodeGenUIPlugin;
import org.eclipse.gmf.internal.codegen.reconciler.GMFGenConfig;
import org.eclipse.gmf.mappings.Mapping;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.ErrorDialog;

			}

			protected IStatus run(IProgressMonitor monitor) {
				monitor.beginTask(getName(), 4);
				try {
					GenEditorGenerator genEditor = transform(mapping);
					monitor.worked(1);
					if (monitor.isCanceled()) {
						return Status.CANCEL_STATUS;
					}
					
					reconcile(genEditor);
					monitor.worked(1);
					if (monitor.isCanceled()) {
						return Status.CANCEL_STATUS;
					}

					save(genEditor);
					monitor.worked(1);

				dgmmRes.getContents().add(genBurdern);				
				dgmmRes.save(getSaveOptions());
			}
			
			private void reconcile(GenEditorGenerator genBurdern) {
				GenEditorGenerator old = null;
				Resource resource = null;
				try {
					resource = resSet.getResource(getGenModelURI(), false);
					if (resource != null && !resource.isLoaded()){
						resource.load(null);
						List contents = resource.getContents();
						if (!contents.isEmpty() && contents.get(0) instanceof GenEditorGenerator){
							old = (GenEditorGenerator)contents.get(0);
						}
					}
				} catch (RuntimeException e){
					old = null;
				} catch (IOException e){
					old = null;
				} finally {
					if (resource != null){
						resource.unload();
					}
				}
				
				if (old != null){
					new Reconciler(new GMFGenConfig()).reconcileTree(genBurdern, old);
				}
			}
		}.schedule();
	}


Lines 9-15 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
9	org.eclipse.core.runtime,	9	org.eclipse.core.runtime,
10	org.eclipse.core.resources,	10	org.eclipse.core.resources,
11	org.eclipse.gmf.bridge,	11	org.eclipse.gmf.bridge,
12	org.eclipse.gmf.codegen.edit	12	org.eclipse.gmf.codegen.edit,
		13	org.eclipse.gmf.codegen.reconciler
13	Eclipse-LazyStart: true	14	Eclipse-LazyStart: true
14	Bundle-Vendor: %providerName	15	Bundle-Vendor: %providerName
15	Export-Package: org.eclipse.gmf.internal.codegen.popup.actions;x-friends:="org.eclipse.gmf.bridge.ui.dashboard"	16	Export-Package: org.eclipse.gmf.internal.codegen.popup.actions;x-friends:="org.eclipse.gmf.bridge.ui.dashboard"

Added Link Here

(-)build.properties (+4 lines)
1	source.. = src/
2	output.. = bin/
3	bin.includes = META-INF/,\
4	.

Added Link Here

(-).classpath (+7 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>
3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>
7	</classpath>




Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Reconciler Tests Plugin
Bundle-SymbolicName: org.eclipse.gmf.codegen.reconciler.test.taipan
Bundle-Version: 1.0.0.version
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Require-Bundle: org.eclipse.gmf.codegen,
 org.eclipse.gmf.codegen.reconciler,
 org.eclipse.gmf.examples.taipan,
 org.junit,
 org.eclipse.osgi,
 org.eclipse.core.runtime,
 org.eclipse.gmf.bridge




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler.test;

import java.io.IOException;

import junit.framework.TestCase;

import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
import org.eclipse.gmf.codegen.gmfgen.GenPlugin;
import org.eclipse.gmf.codegen.reconciler.Reconciler;
import org.eclipse.gmf.internal.codegen.reconciler.GMFGenConfig;

public class ReconcileTaipanTest extends TestCase {
	public void testLoadGMFGen() throws Exception {
		GenEditorGenerator original = loadTaipanGMFGen();
		assertNotNull(original);
		GenEditorGenerator copy = loadTaipanGMFGen();
		assertNotNull(copy);
		
		assertFalse(original == copy);
		assertFalse(original.equals(copy));
		
		assertEquals(original.getCopyrightText(), copy.getCopyrightText());
		assertEquals(original.isSameFileForDiagramAndModel(), copy.isSameFileForDiagramAndModel());
		assertEquals(original.getPackageNamePrefix(), copy.getPackageNamePrefix());
		
		final String NEW_VALUE = "New Value";
		copy.setCopyrightText(NEW_VALUE);
		assertEquals(copy.getCopyrightText(), NEW_VALUE);
		assertFalse(copy.getCopyrightText().equals(original.getCopyrightText()));
	}
	
	public void testReconcileDeepElementWithAlwaysMatcher() throws Exception {
		GenPlugin old = loadTaipanGMFGen().getPlugin();
		GenPlugin current = loadTaipanGMFGen().getPlugin();
		
		assertNotNull(old.getProvider());
		assertNotNull(old.getVersion());
		
		final String NEW_PROVIDER = "NewProviderValue";
		final String NEW_VERSION = "NewVersionValue";
		
		old.setProvider(NEW_PROVIDER);
		old.setVersion(NEW_VERSION);
		
		getReconciler().reconcileTree(current, old);
		
		assertEquals(NEW_PROVIDER, current.getProvider());
		assertEquals(NEW_VERSION, current.getVersion());
	}
	
	public void testReconcileGenEditorGenerator() throws Exception {
		GenEditorGenerator old = loadTaipanGMFGen();
		GenEditorGenerator current = loadTaipanGMFGen();
		
		old.setCopyrightText("AAA");
		old.setPackageNamePrefix("BBB");
		old.setDiagramFileExtension("CCC");
		
		boolean sameFile = !old.isSameFileForDiagramAndModel();
		old.setSameFileForDiagramAndModel(sameFile);
		
		//we do not reconcile this now
		old.setTemplateDirectory("DDD");
		assertEquals("DDD", old.getTemplateDirectory());
		
		getReconciler().reconcileTree(current, old);
		
		assertEquals("AAA", current.getCopyrightText());
		assertEquals("BBB", current.getPackageNamePrefix());
		assertEquals("CCC", current.getDiagramFileExtension());
		assertEquals(sameFile, current.isSameFileForDiagramAndModel());
		
		assertEquals("DDD", old.getTemplateDirectory());
		assertFalse("DDD".equals(current.getTemplateDirectory()));
	}
	
	private Reconciler getReconciler(){
		return new Reconciler(new GMFGenConfig());
	}
	
	private GenEditorGenerator loadTaipanGMFGen() throws IOException{
		return new TaipanSuite().createTaipanEditorGenerator();
	}
}




<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
	<name>org.eclipse.gmf.codegen.reconciler.test.taipan</name>
	<comment></comment>
	<projects>
	</projects>
	<buildSpec>
		<buildCommand>
			<name>org.eclipse.jdt.core.javabuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.pde.ManifestBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
		<buildCommand>
			<name>org.eclipse.pde.SchemaBuilder</name>
			<arguments>
			</arguments>
		</buildCommand>
	</buildSpec>
	<natures>
		<nature>org.eclipse.pde.PluginNature</nature>
		<nature>org.eclipse.jdt.core.javanature</nature>
	</natures>
</projectDescription>




/*
 * Copyright (c) 2006 Borland Software Corporation
 * 
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *    Michael Golubev (Borland) - initial API and implementation
 */

package org.eclipse.gmf.codegen.reconciler.test;

import java.io.IOException;
import java.net.URL;
import java.util.HashSet;
import java.util.Iterator;

import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.gmf.bridge.genmodel.BasicDiagramRunTimeModelHelper;
import org.eclipse.gmf.bridge.genmodel.BasicGenModelAccess;
import org.eclipse.gmf.bridge.genmodel.DiagramGenModelTransformer;
import org.eclipse.gmf.bridge.genmodel.DiagramRunTimeModelHelper;
import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
import org.eclipse.gmf.internal.bridge.naming.gen.GenModelNamingMediatorImpl;
import org.eclipse.gmf.mappings.Mapping;
import org.osgi.framework.Bundle;

public class TaipanSuite {
	private static final String TAIPAN = "org.eclipse.gmf.examples.taipan";
	
	private final Bundle myBundle;
	private final ResourceSet myResourceSet;
	
	public TaipanSuite(){
		myResourceSet = new ResourceSetImpl();
		myBundle = Platform.getBundle(TAIPAN);
		if (myBundle == null){
			throw new IllegalStateException();
		}
	}
	
	public GenEditorGenerator createTaipanEditorGenerator() throws IOException{
		Mapping mapping = (Mapping) loadResource("/models/taipan.gmfmap").getContents().get(0);
		BasicGenModelAccess gma = getGenModelAccess(mapping);
		gma.initDefault();
		gma.load(myResourceSet);
		GenModel domainGenModel = gma.model();
		DiagramRunTimeModelHelper drtHelper = new BasicDiagramRunTimeModelHelper();
		DiagramGenModelTransformer transformer = new DiagramGenModelTransformer(drtHelper, new GenModelNamingMediatorImpl());
		if (domainGenModel != null) {
			transformer.setEMFGenModel(domainGenModel);
		}
		transformer.transform(mapping);
		GenEditorGenerator result = transformer.getResult();
		return result;
	}
	
	public Resource loadResource(String relativePath) throws IOException{
		URL resolvedUrl = FileLocator.resolve(myBundle.getEntry(relativePath));
		URI uri = URI.createURI(resolvedUrl.toString()); 
		return myResourceSet.getResource(uri, true);
	}

	public BasicGenModelAccess getGenModelAccess(Mapping mapping) { 
		HashSet packages = new HashSet();
		for (Iterator it = EcoreUtil.ExternalCrossReferencer.find(mapping).keySet().iterator(); it.hasNext();) {
			Object next = it.next();
			if (next instanceof EClass) {
				packages.add(((EClass) next).getEPackage());
			}
		}
		for (Iterator it = packages.iterator(); it.hasNext();) {
			EPackage next = (EPackage) it.next();
			if (next.getESuperPackage() != null && EcoreUtil.isAncestor(packages, next.getESuperPackage())) {
				it.remove();
			}
		}
		if (packages.isEmpty()) {
			throw new IllegalStateException("Mapping without domain model");
		} 
		if (packages.size() != 1) {
			throw new IllegalStateException("Too many packages");
		}
		EPackage theOnly = (EPackage) packages.iterator().next();
		return new BasicGenModelAccess(theOnly);
	}
	
}

Return to bug 131355

Added Link Here

(-)src/org/eclipse/gmf/codegen/reconciler/ReconcilerConfig.java (+20 lines)
1	/*
2	* Copyright (c) 2006 Borland Software Corporation
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Michael Golubev (Borland) - initial API and implementation
11	*/
12
13	package org.eclipse.gmf.codegen.reconciler;
14
15	import org.eclipse.emf.ecore.EClass;
16
17	public interface ReconcilerConfig {
18	Matcher getMatcher(EClass eClass);
19	DecisionMaker[] getDecisionMakers(EClass eClass);
20	}

Added Link Here

(-).project (+28 lines)
1	<?xml version="1.0" encoding="UTF-8"?>
2	<projectDescription>
3	<name>org.eclipse.gmf.codegen.reconciler</name>
4	<comment></comment>
5	<projects>
6	</projects>
7	<buildSpec>
8	<buildCommand>
9	<name>org.eclipse.jdt.core.javabuilder</name>
10	<arguments>
11	</arguments>
12	</buildCommand>
13	<buildCommand>
14	<name>org.eclipse.pde.ManifestBuilder</name>
15	<arguments>
16	</arguments>
17	</buildCommand>
18	<buildCommand>
19	<name>org.eclipse.pde.SchemaBuilder</name>
20	<arguments>
21	</arguments>
22	</buildCommand>
23	</buildSpec>
24	<natures>
25	<nature>org.eclipse.pde.PluginNature</nature>
26	<nature>org.eclipse.jdt.core.javanature</nature>
27	</natures>
28	</projectDescription>

Added Link Here

(-)src/org/eclipse/gmf/internal/codegen/reconciler/GMFGenConfig.java (+49 lines)
1	/*
2	* Copyright (c) 2006 Borland Software Corporation
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Michael Golubev (Borland) - initial API and implementation
11	*/
12
13	package org.eclipse.gmf.internal.codegen.reconciler;
14
15	import org.eclipse.emf.ecore.EAttribute;
16	import org.eclipse.emf.ecore.EClass;
17	import org.eclipse.emf.ecore.EObject;
18	import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
19	import org.eclipse.gmf.codegen.reconciler.DefaultDecisionMaker;
20	import org.eclipse.gmf.codegen.reconciler.Matcher;
21	import org.eclipse.gmf.codegen.reconciler.ReconcilerConfigBase;
22
23	public class GMFGenConfig extends ReconcilerConfigBase {
24	private static final GMFGenPackage GMFGEN = GMFGenPackage.eINSTANCE;
25
26	public GMFGenConfig(){
27	setMatcher(GMFGEN.getGenEditorGenerator(), ALWAYS_MATCH);
28	preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_CopyrightText());
29	preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_PackageNamePrefix());
30	preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_DiagramFileExtension());
31	preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_SameFileForDiagramAndModel());
32
33	setMatcher(GMFGEN.getGenPlugin(), ALWAYS_MATCH); //exactly one feature for ALWAYS_MATCH GenEditorGenerator
34	preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_Provider());
35	preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_Version());
36	}
37
38	private void preserveIfSet(EClass eClass, EAttribute feature){
39	//FIXME: only attributes for now, allow references
40	addDecisionMaker(eClass, new DefaultDecisionMaker(feature));
41	}
42
43	private static final Matcher ALWAYS_MATCH = new Matcher(){
44	public boolean match(EObject current, EObject old) {
45	return current.eClass().equals(old.eClass());
46	}
47	};
48
49	}

Lines 15-20 Link Here

(-)src/org/eclipse/gmf/internal/codegen/popup/actions/TransformToGenModel.java (-1 / +37 lines)
15	import java.util.HashMap;	15	import java.util.HashMap;
16	import java.util.HashSet;	16	import java.util.HashSet;
17	import java.util.Iterator;	17	import java.util.Iterator;
		18	import java.util.List;
18	import java.util.Map;	19	import java.util.Map;
19		20
20	import org.eclipse.core.resources.IFile;	21	import org.eclipse.core.resources.IFile;
Lines 45-52 Link Here
45	import org.eclipse.gmf.bridge.genmodel.GenModelAccess;	46	import org.eclipse.gmf.bridge.genmodel.GenModelAccess;
46	import org.eclipse.gmf.bridge.genmodel.SpecificDiagramRunTimeModelHelper;	47	import org.eclipse.gmf.bridge.genmodel.SpecificDiagramRunTimeModelHelper;
47	import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;	48	import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
		49	import org.eclipse.gmf.codegen.reconciler.Reconciler;
48	import org.eclipse.gmf.internal.bridge.naming.gen.GenModelNamingMediatorImpl;	50	import org.eclipse.gmf.internal.bridge.naming.gen.GenModelNamingMediatorImpl;
49	import org.eclipse.gmf.internal.codegen.CodeGenUIPlugin;	51	import org.eclipse.gmf.internal.codegen.CodeGenUIPlugin;
		52	import org.eclipse.gmf.internal.codegen.reconciler.GMFGenConfig;
50	import org.eclipse.gmf.mappings.Mapping;	53	import org.eclipse.gmf.mappings.Mapping;
51	import org.eclipse.jface.action.IAction;	54	import org.eclipse.jface.action.IAction;
52	import org.eclipse.jface.dialogs.ErrorDialog;	55	import org.eclipse.jface.dialogs.ErrorDialog;
Lines 131-143 Link Here
131	}	134	}
132		135
133	protected IStatus run(IProgressMonitor monitor) {	136	protected IStatus run(IProgressMonitor monitor) {
134	monitor.beginTask(getName(), 3);	137	monitor.beginTask(getName(), 4);
135	try {	138	try {
136	GenEditorGenerator genEditor = transform(mapping);	139	GenEditorGenerator genEditor = transform(mapping);
137	monitor.worked(1);	140	monitor.worked(1);
138	if (monitor.isCanceled()) {	141	if (monitor.isCanceled()) {
139	return Status.CANCEL_STATUS;	142	return Status.CANCEL_STATUS;
140	}	143	}
		144
		145	reconcile(genEditor);
		146	monitor.worked(1);
		147	if (monitor.isCanceled()) {
		148	return Status.CANCEL_STATUS;
		149	}
141		150
142	save(genEditor);	151	save(genEditor);
143	monitor.worked(1);	152	monitor.worked(1);
Lines 172-177 Link Here
172	dgmmRes.getContents().add(genBurdern);	181	dgmmRes.getContents().add(genBurdern);
173	dgmmRes.save(getSaveOptions());	182	dgmmRes.save(getSaveOptions());
174	}	183	}
		184
		185	private void reconcile(GenEditorGenerator genBurdern) {
		186	GenEditorGenerator old = null;
		187	Resource resource = null;
		188	try {
		189	resource = resSet.getResource(getGenModelURI(), false);
		190	if (resource != null && !resource.isLoaded()){
		191	resource.load(null);
		192	List contents = resource.getContents();
		193	if (!contents.isEmpty() && contents.get(0) instanceof GenEditorGenerator){
		194	old = (GenEditorGenerator)contents.get(0);
		195	}
		196	}
		197	} catch (RuntimeException e){
		198	old = null;
		199	} catch (IOException e){
		200	old = null;
		201	} finally {
		202	if (resource != null){
		203	resource.unload();
		204	}
		205	}
		206
		207	if (old != null){
		208	new Reconciler(new GMFGenConfig()).reconcileTree(genBurdern, old);
		209	}
		210	}
175	}.schedule();	211	}.schedule();
176	}	212	}
177		213

Added Link Here

(-)META-INF/MANIFEST.MF (+14 lines)
1	Manifest-Version: 1.0
2	Bundle-ManifestVersion: 2
3	Bundle-Name: Reconciler Tests Plugin
4	Bundle-SymbolicName: org.eclipse.gmf.codegen.reconciler.test.taipan
5	Bundle-Version: 1.0.0.version
6	Bundle-Vendor: Eclipse.org
7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.gmf.codegen,
9	org.eclipse.gmf.codegen.reconciler,
10	org.eclipse.gmf.examples.taipan,
11	org.junit,
12	org.eclipse.osgi,
13	org.eclipse.core.runtime,
14	org.eclipse.gmf.bridge